From 59752b3b2e6675664547ffef9efe69af0391847b Mon Sep 17 00:00:00 2001
From: Noah Lancien <noah.lancien@ldc.fr>
Date: Wed, 31 Jul 2024 09:42:36 +0200
Subject: [PATCH] Updated manifest.yaml

---
 manifest.yaml | 56 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/manifest.yaml b/manifest.yaml
index 94d9ea7..bc68f89 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -8,7 +8,7 @@ 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.common-services"
   DB_DATABASE: "${APP_DB_DATABASE}"
@@ -78,7 +78,6 @@ spec:
           persistentVolumeClaim:
             claimName: ${CI_PROJECT_PATH_SLUG}-pvc-storage
 
-
 ---
 apiVersion: v1
 kind: Service
@@ -108,7 +107,6 @@ spec:
           port: 80
       middlewares:
         - name: redirect-no-www-to-www
-          namespace: common-services
   tls:
     secretName: ${CRT_TLS_NAME}
 
@@ -126,35 +124,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