Merge branch 'develop' into 'trunk'

Develop

See merge request ldc-web/projets/sbv!10

manifest.yaml

@@ -7,7 +7,7 @@ data:
   DB_NAME: "${APP_DB_NAME}"
   DB_USER: "${APP_DB_USER}"
   DB_PASSWORD: "${APP_DB_PASSWORD}"
-  DB_HOST: "mariadb-service.common-services"
+  DB_HOST: "mariadb.common-services"
   DB_PREFIX: "ldc_"
   WP_ENV: "${APP_WP_ENV}"
   WP_HOME: "https://www.${APP_DOMAIN}"
@@ -101,7 +101,7 @@ spec:
       targetPort: 443
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: ${CI_PROJECT_PATH_SLUG}-ingress-route
@@ -119,18 +119,4 @@ spec:
         - name: redirect-no-www-to-www
           namespace: common-services
   tls:
-    secretName: $APP_DOMAIN
-
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: $APP_DOMAIN
-spec:
-  dnsNames:
-    - $APP_DOMAIN
-    - www.${APP_DOMAIN}
-  secretName: $APP_DOMAIN
-  issuerRef:
-    name: $APP_CERT_ISSUER
-    kind: ClusterIssuer
+    secretName: ${CRT_TLS_NAME}

production-resources.yaml

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