Merge branch 'develop' into trunk

manifest.yaml

@@ -4,23 +4,23 @@ kind: ConfigMap
 metadata:
   name: ${CI_PROJECT_PATH_SLUG}-config-map
 data:
-  APP_NAME: "${APP_1_LRVL_APP_NAME}"
-  APP_ENV: "${APP_1_LRVL_APP_ENV}"
-  APP_KEY: "${APP_1_LRVL_APP_KEY}"
-  APP_DEBUG: "${APP_1_LRVL_APP_DEBUG}"
-  APP_URL: "https://${APP_1_LRVL_DOMAIN}"
+  APP_NAME: "${APP_APP_NAME}"
+  APP_ENV: "${APP_APP_ENV}"
+  APP_KEY: "${APP_APP_KEY}"
+  APP_DEBUG: "${APP_APP_DEBUG}"
+  APP_URL: "https://${APP_DOMAIN}"
   LOG_CHANNEL: "k8s"
   DB_HOST: "mariadb-service.common-services"
-  DB_DATABASE: "${APP_1_LRVL_DB_DATABASE}"
-  DB_USERNAME: "${APP_1_LRVL_DB_USERNAME}"
-  DB_PASSWORD: "${APP_1_LRVL_DB_PASSWORD}"
-  MAIL_HOST: "${APP_1_LRVL_MAIL_HOST}"
-  MAIL_PORT: "${APP_1_LRVL_MAIL_PORT}"
-  MAIL_USERNAME: "${APP_1_LRVL_MAIL_USERNAME}"
-  MAIL_PASSWORD: "${APP_1_LRVL_MAIL_PASSWORD}"
-  MAIL_ENCRYPTION: "${APP_1_LRVL_MAIL_ENCRYPTION}"
-  MAIL_FROM_ADDRESS: "${APP_1_LRVL_MAIL_FROM_ADDRESS}"
-  MAIL_FROM_NAME: "${APP_1_LRVLAPP_NAME}"
+  DB_DATABASE: "${APP_DB_DATABASE}"
+  DB_USERNAME: "${APP_DB_USERNAME}"
+  DB_PASSWORD: "${APP_DB_PASSWORD}"
+  MAIL_HOST: "${APP_MAIL_HOST}"
+  MAIL_PORT: "${APP_MAIL_PORT}"
+  MAIL_USERNAME: "${APP_MAIL_USERNAME}"
+  MAIL_PASSWORD: "${APP_MAIL_PASSWORD}"
+  MAIL_ENCRYPTION: "${APP_MAIL_ENCRYPTION}"
+  MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}"
+  MAIL_FROM_NAME: "${APP_APP_NAME}"
   LDC_WEB_API_KEY: "${APP_LDC_WEB_API_KEY}"
   SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}"
   CRM_ENDPOINT: "${APP_CRM_ENDPOINT}"
@@ -93,7 +93,7 @@ spec:
       targetPort: 443
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: ${CI_PROJECT_PATH_SLUG}-ingress-route
@@ -102,26 +102,13 @@ spec:
     - web
     - websecure
   routes:
-    - match: Host(`${APP_1_LRVL_DOMAIN}`)
+    - match: Host(`${APP_DOMAIN}`)
       kind: Rule
       services:
         - name: ${CI_PROJECT_PATH_SLUG}-service
           port: 80
   tls:
-    secretName: $APP_1_LRVL_DOMAIN
-
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: $APP_1_LRVL_DOMAIN
-spec:
-  dnsNames:
-    - $APP_1_LRVL_DOMAIN
-  secretName: $APP_1_LRVL_DOMAIN
-  issuerRef:
-    name: $APP_1_LRVL_CERT_ISSUER
-    kind: ClusterIssuer
+    secretName: ${CRT_TLS_NAME}
 
 ---
 apiVersion: batch/v1

production-resources.yaml

@@ -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