Merge branch 'develop' into 'trunk'

Develop

See merge request ldc-web/projets/qrcollector/qrcollector-back!13
This commit is contained in:
Thibault Raquet 2024-06-27 10:09:25 +00:00
commit f412bebed5
2 changed files with 15 additions and 16 deletions

View file

@ -10,7 +10,7 @@ data:
APP_URL: "https://${APP_DOMAIN}"
APP_URL_FRONT: "${APP_APP_URL_FRONT}"
LOG_CHANNEL: "k8s"
DB_HOST: "mariadb-service.common-services"
DB_HOST: "mariadb.common-services"
DB_DATABASE: "${APP_DB_DATABASE}"
DB_USERNAME: "${APP_DB_USERNAME}"
DB_PASSWORD: "${APP_DB_PASSWORD}"
@ -88,7 +88,7 @@ spec:
targetPort: 443
---
apiVersion: traefik.containo.us/v1alpha1
apiVersion: traefik.io/v1alpha1
kind: IngressRoute
metadata:
name: ${CI_PROJECT_PATH_SLUG}-ingress-route
@ -103,20 +103,7 @@ spec:
- name: ${CI_PROJECT_PATH_SLUG}-service
port: 80
tls:
secretName: $APP_DOMAIN
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: $APP_DOMAIN
spec:
dnsNames:
- $APP_DOMAIN
secretName: $APP_DOMAIN
issuerRef:
name: $APP_CERT_ISSUER
kind: ClusterIssuer
secretName: ${CRT_TLS_NAME}
---
apiVersion: batch/v1

12
production-resources.yaml Normal file
View file

@ -0,0 +1,12 @@
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: $APP_DOMAIN
spec:
dnsNames:
- $APP_DOMAIN
secretName: $APP_DOMAIN
issuerRef:
name: $APP_CERT_ISSUER
kind: ClusterIssuer