fix: kontinuous config

SocialGouv · Nov 28, 2024 · e1884cc · e1884cc
1 parent 22d3e23
commit e1884cc
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 41 deletions.
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -38,3 +38,42 @@ api:
           value: review
         - name: BRANCH_NAME
           value: "{{ .Values.global.branchSlug }}"
+
+deactivate:
+  jobs-deactivate:
+    runs:
+      cleanup-bucket:
+        image: bitnami/rclone:latest
+        run: |
+          rclone purge remote:${BUCKET_NAME}/{{ .Values.global.branchSlug }}
+        checkout: false
+        env:
+          - name: RCLONE_CONFIG_REMOTE_TYPE
+            value: s3
+          - name: RCLONE_CONFIG_REMOTE_PROVIDER
+            value: Other
+          - name: RCLONE_CONFIG_REMOTE_ACCESS_KEY_ID
+            valueFrom:
+              secretKeyRef:
+                name: ozensemble-dev-app-access-key
+                key: bucket_access_key
+          - name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
+            valueFrom:
+              secretKeyRef:
+                name: ozensemble-dev-app-access-key
+                key: bucket_secret_key
+          - name: RCLONE_CONFIG_REMOTE_REGION
+            valueFrom:
+              secretKeyRef:
+                name: ozensemble-dev-app-access-key
+                key: bucket_region
+          - name: RCLONE_CONFIG_REMOTE_ENDPOINT
+            valueFrom:
+              secretKeyRef:
+                name: ozensemble-dev-app-access-key
+                key: bucket_endpoint
+          - name: BUCKET_NAME
+            valueFrom:
+              secretKeyRef:
+                name: ozensemble-dev-app-access-key
+                key: bucket_name
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -6,3 +6,6 @@ api:
   volumeMounts:
     - mountPath: /app/public/uploads
       name: uploads
+  envFrom:
+    - secretRef:
+        name: ozensemble-dev-app-access-key
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -13,6 +13,9 @@ api:
     limits:
       cpu: "300m"
       memory: "1Gi"
+  envFrom:
+    - secretRef:
+        name: ozensemble-prod-app-access-key
 
 next-app:
   host: ozensemble.fabrique.social.gouv.fr

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -21,8 +21,7 @@ api:
         name: pg-app
     - secretRef:
         name: api
-    - secretRef:
-        name: ozensemble-dev-app-access-key
+
   vars:
     DATABASE_HOST: "$(PGHOST)"
     DATABASE_PORT: "$(PGPORT)"
@@ -54,42 +53,3 @@ jobs:
       with:
         imagePackage: api
         context: ./api
-
-deactivate:
-  jobs-deactivate:
-    runs:
-      cleanup-bucket:
-        image: bitnami/rclone:latest
-        run: |
-          rclone purge remote:${BUCKET_NAME}/{{ .Values.global.branchSlug }}
-        checkout: false
-        env:
-          - name: RCLONE_CONFIG_REMOTE_TYPE
-            value: s3
-          - name: RCLONE_CONFIG_REMOTE_PROVIDER
-            value: Other
-          - name: RCLONE_CONFIG_REMOTE_ACCESS_KEY_ID
-            valueFrom:
-              secretKeyRef:
-                name: ozensemble-dev-app-access-key
-                key: bucket_access_key
-          - name: RCLONE_CONFIG_REMOTE_SECRET_ACCESS_KEY
-            valueFrom:
-              secretKeyRef:
-                name: ozensemble-dev-app-access-key
-                key: bucket_secret_key
-          - name: RCLONE_CONFIG_REMOTE_REGION
-            valueFrom:
-              secretKeyRef:
-                name: ozensemble-dev-app-access-key
-                key: bucket_region
-          - name: RCLONE_CONFIG_REMOTE_ENDPOINT
-            valueFrom:
-              secretKeyRef:
-                name: ozensemble-dev-app-access-key
-                key: bucket_endpoint
-          - name: BUCKET_NAME
-            valueFrom:
-              secretKeyRef:
-                name: ozensemble-dev-app-access-key
-                key: bucket_name