fix: use cnpg

SocialGouv · Oct 31, 2023 · 939d39d · 939d39d
1 parent 57bd783
commit 939d39d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 38 deletions.
diff --git a/.kontinuous/config.yaml b/.kontinuous/config.yaml
@@ -3,12 +3,3 @@ projectName: les1000jours
 dependencies:
   fabrique:
     import: SocialGouv/kontinuous/plugins/fabrique
-    dependencies:
-      contrib:
-        preDeploy:
-          importSecrets:
-            options:
-              secrets:
-                les1000joursprodserver-backup-credentials:
-                  env: dev
-                  required: true
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -2,21 +2,28 @@ app-strapi:
   ~needs: [restore]
   ~preDeploy.cleaner:
     match:
-      kind: Deployment  
+      kind: Deployment
     value: true
   volumes:
     - name: uploads
       emptyDir: {}
   volumeMounts:
     - mountPath: /app/public/uploads
       name: uploads
+  envFrom:
+    - secretRef:
+        name: strapi
+    - configMapRef:
+        name: strapi-configmap
+    - secretRef:
+        name: azure-les1000jours-volume
+    - secretRef:
+        name: "pg-app"
 
 jobs:
   runs:
-    create-db:
-      use: create-db
     restore:
-      ~needs: [create-db]
+      ~needs: [pg]
       use: pg-restore
       checkout: false
       with:
@@ -33,4 +40,4 @@ jobs:
             readOnly: true
             volumeAttributes:
               secretName: les1000joursprodserver-backup-credentials
-              shareName: les1000jprodsrv2-backup-restore
+              shareName: les1000jprodsrv2-backup-restore
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -13,4 +13,4 @@ app-strapi:
     - secretRef:
         name: azure-les1000jours-volume
     - secretRef:
-        name: "{{ .Values.global.pgSecretName }}"
+        name: "pg-app"
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -2,6 +2,9 @@ global:
   registry: ghcr.io
   imageProject: socialgouv
 
+pg:
+  ~chart: pg
+
 app-strapi:
   ~chart: app
   host: "backoffice-{{ .Values.global.host }}"
@@ -43,29 +46,6 @@ app-strapi:
       value: "true"
     - name: TZ
       value: "Europe/Paris"
-#app-cache:
-# ~chart: app
-#  image: "nginx:1.19.6"
-#  needs: ["app-strapi"]
-#  host: "backoffice-{{ .Values.global.host }}"
-#  containerPort: 8080
-#  volumes:
-#    - name: strapi-cache
-#      emptyDir: {}
-#    - name: "config"
-#      configMap:
-#        name: nginx-configmap
-#  volumeMounts:
-#    - name: strapi-cache
-#      mountPath: /var/cache/nginx
-#    - name: config
-#      mountPath: /etc/nginx/nginx.conf
-#      subPath: nginx.conf
-#  ingress:
-#    annotations:
-#      "nginx.ingress.kubernetes.io/proxy-body-size": "1g"
-#      "nginx.ingress.kubernetes.io/limit-rps": "20"
-#      "nginx.ingress.kubernetes.io/limit-rpm": "300"
 
 deactivate:
   jobs-deactivate: