fix: use kube-workflow

SocialGouv · Apr 5, 2022 · 071cdf2 · 071cdf2
1 parent 28cd8be
commit 071cdf2
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 41 deletions.
diff --git a/.kube-workflow/common/values.yaml b/.kube-workflow/common/values.yaml
@@ -0,0 +1,7 @@
+app:
+  enabled: true
+  envFrom:
+    - secretRef:
+        name: "{{ .Values.global.pgSecretName }}"
+    - secretRef:
+        name: app-sealed-secret
diff --git a/...v/environments/dev/app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml b/...v/environments/dev/app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml
@@ -2,16 +2,15 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   annotations:
-    sealedsecrets.bitnami.com/cluster-wide: 'true'
+    sealedsecrets.bitnami.com/cluster-wide: "true"
   name: app-sealed-secret
-  namespace: app
 spec:
   encryptedData:
     MAIL_AUTH_PASS: AgBXoippgPAY9XCDtuppex7e5C/bDqnjJnN+iTkk44+TxZxyscI/5dpUfbYzTqn+aaHvySmkXShX2KJi6dHfIi6MfnTVRP2TsSa3oxA7IWDNCbN9N0HnFFz6L3ITRHcUTO28TJBOwfPur3dN8Sw5x3WWmbvPFJEO0TF8ZrLqePD6a1/M6o95z8O/H7AWDx0QK6/61aXvUgHXj6L3RrKd+534Fns8Dn5TEPDzouUTUPNZXqih7J7k3Byq+zfBHMZD4tKc0hPTFg2TuiZUANXWkiGjHEQU5lw59chm2xpPE7SYSvTxsWGyZtupuYXP1AKvtL87ryd/mSa9SIik/ojVpRCZ6yp36u2/JaYtbBEEQmmbYugesj9BWv4t0TnwC+wrjcpkuD+MDhgIN94NMoP0Ug6Ga80NEppWqZMrjlwY3hT2dQvZTVctCEkM2TF+B9TziJLI2hh8RAI/4o8myDx0QjAvHKxOLiXO19sBL3DKBaXDPPmvr8frsplUux01LqpT+HCc+UsDte+DcxfSwrvT3PLpabQaB+x0V/FBDouTOpjUcdQ3EjkzefNevcPQAKiiDD63ycSFIvd/jnaAMRQ8R7izZd1ttWkCD+XZi0RG9fmBz3AnYcfEmeZJrzjUk9DqdIS3+c44KwKl57S09MT+WqFXwr6l/UfHv+6XMXy7q3Q9sxz1bkC1j8wyqSWy2FyTMtHuKgNnH2oSjuYasyAK9goRgo4Udl5gBG25i9ziBLDonQ==
     MAIL_AUTH_USER: AgDHN1LPlykEhWv0mvKhb3pDM68bymYCF65+gKiS3rV20WeNIIFZbid/nWOCqlXgKnMrAI5oXoGOVqaHH18X6WQNFbmGuAI3YR2P7OaRrUJsQN3/Q5pfoEF3H3NyMIBD2xfhDUKTVdGjcya+B3NGEJLqEly7BYadInCZVwCt6jVJrXa/bhwQmumhv/f5PucS/UzvMTKumQMkJHU5/UTiYiLDzO/gemufkfZTvVTREjXzXyeTtKPLtzTL0k5wZSU/x1/nlE4LuNT/BmxppKx4wnM+JrxCyb/bqjaqFrOzqtOy5LclnVTOe4CG8LP1HH77lolSbBPTWyiG0hn9TsoKwXY4LMOFou9WfU2AwKcgldA23wyOpIThBag30ruRIs4GlZoORiJR2Dmf4xQA2qSj/h/KyoBO/cxkGrTiXQOMcTEqTZcxeZtzcOD11IdLlHrH8y03uHGzk2VR0zBQf4EZbFG0oK3s2P4ZPW/gtSY3rNAyLh67UZdt3fihNz/iP0lnp3RqYHHzXzjGdGlyh67lE1wtPJwUgmkl5/ZGIX4Kl2qOQToaVmU789tMJ9ADaL5TP6LrJhgXolSM3Gb4K5R46Z0zxVpvCRhQa4nOKroMg1sg5LofyCSu7hs+rrE7+fJq7XYYSVA0Yy2xvnIg5bqD1fHQ9hrVifhUONBnZ0Npvlzx4DUjUYnlPZRisX7yIlPHf4TNUbyk8ZwrO2yNFuY2PgmZL0fq8lN3l1zr+F8GeYeUsA==
   template:
     metadata:
       annotations:
-        sealedsecrets.bitnami.com/cluster-wide: 'true'
+        sealedsecrets.bitnami.com/cluster-wide: "true"
     name: app-sealed-secret
     type: Opaque
diff --git a/.kube-workflow/env/dev/values.yaml b/.kube-workflow/env/dev/values.yaml
@@ -0,0 +1,10 @@
+app:
+  needs: [db]
+
+jobs:
+  enabled: true
+  runs:
+    - name: db
+      use: SocialGouv/kube-workflow/jobs/create-db@v1
+      with:
+        pgAdminSecretRefName: azure-pg-admin-user
diff --git a/...vironments/preprod/app.sealed-secret.yaml → .../preprod/templates/app.sealed-secret.yaml b/...vironments/preprod/app.sealed-secret.yaml → .../preprod/templates/app.sealed-secret.yaml
@@ -2,9 +2,8 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   annotations:
-    sealedsecrets.bitnami.com/cluster-wide: 'true'
+    sealedsecrets.bitnami.com/cluster-wide: "true"
   name: app-sealed-secret
-  namespace: app
 spec:
   encryptedData:
     DEMARCHES_SIMPLIFIEES_TOKEN: AgC/sf8Ur10ikiSKm272UoBs6ddxBpqJu8IgNXzUe2we3d3kTOew0IGv1OiRvRUcIUT5fx5FYGw+I11puAMkLVqjTHoyPhk2X4edXHhNBEaF41uFsVeNhhVe3xLETULr/iLWFtvaKyWn27mVAHIAakKutUZvIczwD1ZLA9YY4MeXS6I+LB5uBgTrruh1MghK/JF/K7IpB7syW6WdoPu+vl3UXF8P3IlKupS66u/IZIRYhjTQRLeDueMM9L/RppX38SgQSSvhbd6TZbSKKFiQasB3IbygaZAF/EZcb75PyDrYFqE1CP7uKFRY+xuace1q/YY2z/PpDxNx7kzPxJldqFRnsf3I9BznNm/ijybiNKoeT3+CdXBdxz4KNptHIMWS8blYU4FjbTarYeX/o7vmG4bu0LRq2YJcatnTg1jFPZNi2AGAzSanwhP+axBmsagI70slHRgNtd6v1FBaAiYCStHp/fvXdxE2zkgyNCYEEtsWN/CesZL67i+E9NaJArxfQxY0EBLYtvYX1EFCYv2RTYff8bpGO7j/5S8BP2OhB2UQhwccLo9xzniQOWGRzywRerjOd4qSPTO8ydsrc271PfQMHZPmwLu/LZQ4xFOv4FfyTiLMEqZEeoIGrqIUNDCr5Maz/HjYOIM1lg5KU/NJGgPuWPGvIgsiFlYkq6c+9QC3T5NCFVBo2676a5Egc0TqHh9435e6z2Hzyx6GkxqDA1UFrI6lz4US+xQ=
@@ -13,6 +12,6 @@ spec:
   template:
     metadata:
       annotations:
-        sealedsecrets.bitnami.com/cluster-wide: 'true'
+        sealedsecrets.bitnami.com/cluster-wide: "true"
     name: app-sealed-secret
     type: Opaque
diff --git a/...environments/preprod/yaml/importData.yaml → ...low/env/preprod/templates/importData.yaml b/...environments/preprod/yaml/importData.yaml → ...low/env/preprod/templates/importData.yaml
@@ -13,7 +13,7 @@ spec:
         spec:
           containers:
             - name: mon-psy
-              image: ghcr.io/socialgouv/mon-psy-sante/app:latest
+              image: ghcr.io/socialgouv/mon-psy-sante/app:{{ .Values.global.imageTag }}
               envFrom:
                 - secretRef:
                     name: app-sealed-secret

diff --git a/...nvironments/preprod/yaml/importState.yaml → ...ow/env/preprod/templates/importState.yaml b/...nvironments/preprod/yaml/importState.yaml → ...ow/env/preprod/templates/importState.yaml
@@ -13,7 +13,7 @@ spec:
         spec:
           containers:
             - name: mon-psy
-              image: ghcr.io/socialgouv/mon-psy-sante/app:latest
+              image: ghcr.io/socialgouv/mon-psy-sante/app:{{ .Values.global.imageTag }}
               envFrom:
                 - secretRef:
                     name: app-sealed-secret
@@ -25,3 +25,4 @@ spec:
                 - cron:launch
                 - importState
           restartPolicy: Never
+          concurrencyPolicy: Forbid
diff --git a/.../environments/prod/app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml b/.../environments/prod/app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml
@@ -1,7 +1,6 @@
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
-  annotations: { }
   name: app-sealed-secret
   namespace: mon-psy-sante
 spec:
@@ -11,6 +10,5 @@ spec:
     MAIL_AUTH_USER: AgCq28vVc0xCS94tOes8fEtxwq4jPzlYLNLXL5qCn1j172EGGfqITpDN7zr8dbuUpHRhTIbPmttLXD4hNnSdJwDM12fiK6D8bdzBEZFm/mc7zCJgS0ARyVUDKJZ01w7nB3MXcz5BTYjpsy3ul2Y2j3gTg5eONcHi2UZ2JMvVz8HHnMYcTHSGxb7lmOYftcO/sEZoerRSjfoGpI6MaKjLu5tSMYc7PSVYjiwNCoaxZmHJypOmEZSDZ3ggj5Oh77PI8OqWAih35gstbNXC8YOz4s7DhEZzdRo8dVyF2nWoMAh62uhQUK5LZqXP4A5dJubClQmpfzhZz8bjUQ8oVQlIvy4nqG4dD2GGyx713ObyuTBGXw+iiRKLhwDH5U+aYlUTFvFE9Ee81jJXKRq5//YI0lo8zUdJToylQcciwi/Qblw7/H0H/yGU8Hx9aFH2obNQHmdJeYzvmmV0jfMec5EoXYg9/bEF8a8HvZU2lHGNnUw4QPor9kpFE0OvUzmnB5VXarVAP/q7Ho82iRFIEZ7ynCB7MqTUOowtqLVGd9yebyiHIx2cUe2ytcPURNDJLwtF6nv3xvjQ4gMsXHuYUFU7PG1FAzL4XvCPspKcEK5xtr+JNAQx0usQB2deiaHqzYbMaeTugqXsif9J7E19lpMF4e0q6ghlvAMW9W04Mru+Lvi+ITts2zW/1Qiq5GifN+eiHkP2Lq5HP9xCj1OiX3gXLXl5tFqLKKr6wd62UQjqLK4/HA==
   template:
     metadata:
-      annotations: { }
       name: app-sealed-secret
     type: Opaque
diff --git a/...uv/environments/prod/yaml/importData.yaml → ...rkflow/env/prod/templates/importData.yaml b/...uv/environments/prod/yaml/importData.yaml → ...rkflow/env/prod/templates/importData.yaml
@@ -13,7 +13,7 @@ spec:
         spec:
           containers:
             - name: mon-psy
-              image: ghcr.io/socialgouv/mon-psy-sante/app:latest
+              image: ghcr.io/socialgouv/mon-psy-sante/app:{{ .Values.global.imageTag }}
               envFrom:
                 - secretRef:
                     name: app-sealed-secret

diff --git a/...v/environments/prod/yaml/importState.yaml → ...kflow/env/prod/templates/importState.yaml b/...v/environments/prod/yaml/importState.yaml → ...kflow/env/prod/templates/importState.yaml
@@ -13,7 +13,7 @@ spec:
         spec:
           containers:
             - name: mon-psy
-              image: ghcr.io/socialgouv/mon-psy-sante/app:latest
+              image: ghcr.io/socialgouv/mon-psy-sante/app:{{ .Values.global.imageTag }}
               envFrom:
                 - secretRef:
                     name: app-sealed-secret
@@ -25,3 +25,4 @@ spec:
                 - cron:launch
                 - importState
           restartPolicy: Never
+          concurrencyPolicy: Forbid
diff --git a/.kube-workflow/env/prod/values.yaml b/.kube-workflow/env/prod/values.yaml
@@ -0,0 +1,4 @@
+app:
+  host: monpsy.sante.gouv.fr
+  redirectFrom:
+    - www.monpsy.sante.gouv.fr
diff --git a/.socialgouv/config.json b/.socialgouv/config.json
diff --git a/.socialgouv/environments/prod/yaml/redirect.yml b/.socialgouv/environments/prod/yaml/redirect.yml