Updated manifest.yaml

manifest.yaml

@@ -8,9 +8,9 @@ data:
   APP_ENV: "${APP_APP_ENV}"
   APP_KEY: "${APP_APP_KEY}"
   APP_DEBUG: "${APP_APP_DEBUG}"
-  APP_URL: "https://www.${APP_DOMAIN}"
+  APP_URL: "https://${REDIRECT}${APP_DOMAIN}"
   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}"
@@ -89,7 +89,6 @@ spec:
           persistentVolumeClaim:
             claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
 
-
 ---
 apiVersion: v1
 kind: Service
@@ -103,7 +102,7 @@ spec:
       targetPort: 443
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: ${CI_PROJECT_PATH_SLUG}-ingress-route
@@ -112,30 +111,15 @@ spec:
     - web
     - websecure
   routes:
-    - match: Host(`${APP_DOMAIN}`, `www.${APP_DOMAIN}`)
+    - match: Host(`${APP_DOMAIN}`) || Host(`www.${APP_DOMAIN}`)
       kind: Rule
       services:
         - name: ${CI_PROJECT_PATH_SLUG}-service
           port: 80
       middlewares:
         - 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
 
 ---
 apiVersion: batch/v1
@@ -151,35 +135,35 @@ spec:
           affinity:
             podAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
-              - labelSelector:
-                  matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                    - ${CI_PROJECT_PATH_SLUG}-app
-                topologyKey: "kubernetes.io/hostname"
-                namespaces: [$KUBE_NAMESPACE]
+                - labelSelector:
+                    matchExpressions:
+                      - key: app
+                        operator: In
+                        values:
+                          - ${CI_PROJECT_PATH_SLUG}-app
+                  topologyKey: "kubernetes.io/hostname"
+                  namespaces: [$KUBE_NAMESPACE]
           containers:
-          - name: ${CI_PROJECT_PATH_SLUG}-scheduled
-            image: $IMAGE_TAG
-            imagePullPolicy: IfNotPresent
-            command:
-            - "php"
-            args:
-            - "artisan"
-            - "schedule:run"
-            envFrom:
-            - configMapRef:
-                name: ${CI_PROJECT_PATH_SLUG}-config-map
-            volumeMounts:
-            - name: storage
-              mountPath: /app/srcs/storage
+            - name: ${CI_PROJECT_PATH_SLUG}-scheduled
+              image: $IMAGE_TAG
+              imagePullPolicy: IfNotPresent
+              command:
+                - "php"
+              args:
+                - "artisan"
+                - "schedule:run"
+              envFrom:
+                - configMapRef:
+                    name: ${CI_PROJECT_PATH_SLUG}-config-map
+              volumeMounts:
+                - name: storage
+                  mountPath: /app/srcs/storage
           imagePullSecrets:
-          - name: docker-registry-credentials
+            - name: docker-registry-credentials
           volumes:
-          - name: storage
-            persistentVolumeClaim:
-              claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
+            - name: storage
+              persistentVolumeClaim:
+                claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
           securityContext:
             runAsUser: 33
             runAsGroup: 33

production-resources.yaml

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