Merge branch 'master' into linked/feat/add-rupture-co

.github/workflows/deactivate.yaml

@@ -14,5 +14,5 @@ concurrency:
 
 jobs:
   kontinuous:
-    uses: socialgouv/workflows/.github/workflows/use-ks-gh-deactivate.yaml@v1
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-deactivate.yaml@v1
     secrets: inherit

.github/workflows/preproduction.yaml

@@ -13,5 +13,5 @@ concurrency:
 jobs:
   kontinuous:
     name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-gh-preproduction.yaml@v1
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-preproduction.yaml@v1
     secrets: inherit

.github/workflows/production.yaml

@@ -12,5 +12,5 @@ concurrency:
 jobs:
   kontinuous:
     name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-gh-production.yaml@v1
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-production.yaml@v1
     secrets: inherit

.github/workflows/review-auto.yaml

@@ -15,5 +15,5 @@ concurrency:
 jobs:
   kontinuous:
     name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-gh-review-auto.yaml@master
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-review-auto.yaml@master
     secrets: inherit

.github/workflows/review.yaml

@@ -12,5 +12,5 @@ concurrency:
 jobs:
   kontinuous:
     name: "Deploy on Kubernetes 🐳"
-    uses: socialgouv/workflows/.github/workflows/use-ks-gh-review.yaml@v1
+    uses: socialgouv/workflows/.github/workflows/use-ks-gh-with-env-review.yaml@v1
     secrets: inherit

.kontinuous/config.yaml

@@ -2,19 +2,4 @@ projectName: cdtn
 dependencies:
   fabrique:
     extends:
-      - name: buildkit-service
-    dependencies:
-      contrib:
-        preDeploy:
-          importSecrets:
-            options:
-              secrets:
-                cdtnadminprodserver-backup-credentials:
-                  env: [dev, preprod]
-                  required: true
-                cdtn-prod-backups-access-key:
-                  env: [prod]
-                  required: true
-                cdtn-dev-backups-access-key:
-                  env: [dev, preprod]
-                  required: true
+      - name: ovh

.kontinuous/env/dev/templates/export.configmap.yaml

@@ -4,7 +4,7 @@ metadata:
   name: export-elasticsearch
 data:
   HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
-  NLP_URL: "https://serving-ml-preprod.dev.fabrique.social.gouv.fr"
+  NLP_URL: "https://serving-ml-preprod.ovh.fabrique.social.gouv.fr"
   NODE_ENV: "production"
   LOG_LEVEL: "info"
   GLOSSARY_PREPROD_DISABLE: "true"

.kontinuous/env/dev/templates/tipimail.sealed-secret.yaml

@@ -0,0 +1,17 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  annotations:
+    sealedsecrets.bitnami.com/cluster-wide: "true"
+  name: tipimail
+spec:
+  encryptedData:
+    SMTP_EMAIL_USER: AgDAI12VG9QSMBgYRebNFGvU3jJfLVem//WVoCzL45k6opjndrzmXPmUxHqBByrQh7Rb/X4DJYSyNzTltsWBRq/hnPNlh9YGUobFLYcFhe5vOJEx0dRWuQvzK3Qhe6EF9eF47QvwEITYPtUDBy02Zjbpi8u+NZJTY42joQfdTgvlx5nnyqvu1N4npmq4tgMvJGxRMNbbxG+0CuxZpMIhq22fgM4U6HWEajPSGqcTQ5ytwh8ElDSL1vE0vvCb+tCdbSEEB76QRdfQyJflAkMcKjuzTZT26S2mrNrX/a8REhQh9/0EqYNL1eHn/RkWh1k1O/3kwXtVF+iRf+5h+9663qKoRjT2QS/40VSnNc3ibmIPkV3wEkOuaTHugvNZhg27RcJ5PrArWzhOItjERRcnjLaxTvck0BRWSIz0WERtVDRIn3+F6L8zn/V7s+Uz9WdOXS3mG55rvNhe1NGdz3E1CHm8OVZDKPf8jyNlzwTd58xwTwOjQxyBgVOe3XPV5/3MkOh2nu2Npgbkt2EB8IEEUmu0jJ/dUcHGpDViVYWSRhGIWy4qsda/v2gEJfjss22oRz53/m72BcEYCXNBwJiit3RQwOKvUtUGk97DjpFbnQQZkODL27joqbpmdNN7BFqxfJ2ZTr6F2OGnnvJIPhKODxkd5gIWnpqZwVwlL61qhUSQH5UxwKwT9K+9Y1uTgESch6ZbLBpmdy3B5og+7oqV5eI/6iAtezBcDlBQPdJ3Qpp81g==
+    SMTP_EMAIL_PASSWORD: AgCmvLsZC/67AUj3JuNqBEi5/gz8lpAL+g6jZyCO/TI9zb0uiAaM0qbqZ7zbt3R1sa4uVfsH2JBZPwtmevpl8WdGe06ynrHW4AGOjhU85P03WOjCnf4kQQfEzxDzzN2Yd4oaKY7kA+P8fNmsRbn5WQXbyCUwDFKstyHCrDLlYu3Tsh6g2NBTtoiTv9Wm9mUc49Dopk/kKsriCn9bbGtW1AB2E06YqgHBKJGU/6BrO+2km/8lFfamSx7SR9fjATYqBprKzJ26F6nJEeKBLK5WJeIxMPNW73XMqY7NtCYSQvELrc0JeMFohYGTW5XIkTDX+/3Uqz7g9xNOd/wqQmcgCju8EdEbf1EhiaBU5zlOlPW55hLJ2vd4+9uc3UNR9GWfD/nl2T+iKmHOGIbkxq6Zw55b9aPIFpjjp7PxXt1UFLU80anTphKb3dOZ+cdsjFXY24hctgdlNvzrbCl8+MCr96Tbot3QoUpN2RYf56liSFv68fe/rWE5+kK9QuL5CYW0XKZjOJP1PPsB5PynQFPcQQBNEQginvlq5UkIS7fOOrvP0HZklIcAhRM5H9qN/qgRpFxBv5oAfpOpxRZ8MbAzin73BJsBycXmvoV3NPS0o7yWfWpB9FVwwtBL0bomxTbEQ/VGkr+CYO88f9Psz4MEwaHMBZiNgmmJkra5/u9uSnnYkLWtcRTPRU46DuoFSIvfUmT3Ot6ZnAYVEqvt+LENe2koRrKr3+Hxt4tnrN0rxVhpaQ==
+    SMTP_URL: AgAncO7Mw9vbUcv0h0nrzRyhP2AolSJSx+W6M5CXEopETrvL2UiZvyHQ+N8OO0L6QPYDDgnJzDemXDgkUEUHacHAjFs/JSm4bhPCccw7g5tkQS8CYSMzKv/QpbeodN3ERcM6zQkbld5BLfnYTvnNc/v2iAAfrSFjBZfCge1kpKONdkMemv99PzEYXjwqd0DC01vroqt+maf4qYsf3sDgAQRuLyoCmmX1tSfDniwW0ZLhoTNRILpCiXw1Ejam6DZ1jXy77Bb1i1fsLXlrvMYIxnuhXktUphMSfE8o/5lK/YxBFejhxZoaCYrNidP0/ZH/DXNujTjuenGfXkQllasCFCs39HCF2isXLv5E26hmdlMo9qxBNrUE2PeL2V20wpIB3EgWo6eJjTtOix34z44fmRnf4f1TPGXVZayJQ3BDNbZ6QKiXiqkwDLzWUgDGZWASTUIbBosb1qG8G/NaRPs1tU3hUiWdHswjy3quknYOqyU3LtcofMBNkibLApdHmr6L20ILWI84TL+TWHSd3de9woeCLrVDBzbAxQ3tU3HIJ2dbtI69tuooAVoBb0Sr5dEVs+neHqpfXhonp2iNrcQWny3QX5UzsJDv+l1/7PcU50+vo/FXE5UbmJDMKFpv+z7nQT31TAwr8dft/1lg2nnn76ZGD2mS5XA1X/piUz8/KuxDDDsOttvyJQqd/wptKgHj+fkmvWfoUGrcmJTud/QkI/BbJw==
+  template:
+    metadata:
+      annotations:
+        sealedsecrets.bitnami.com/cluster-wide: "true"
+      name: tipimail
+    type: Opaque

.kontinuous/env/dev/templates/www.configmap.yaml

@@ -6,7 +6,6 @@ data:
   HASURA_GRAPHQL_ENDPOINT: "http://hasura/v1/graphql"
   MATOMO_URL: "https://matomo.fabrique.social.gouv.fr/"
   NODE_ENV: "production"
-  SMTP_URL: "smtp.tipimail.com"
   URL_EXPORT: "http://export"
   BUCKET_PUBLIC_ENDPOINT: "https://cdtn-dev-public.s3.gra.io.cloud.ovh.net"
   BUCKET_DEFAULT_FOLDER: "default"

.kontinuous/env/dev/templates/www.sealed-secret.yaml

@@ -1,23 +1,17 @@
----
-apiVersion: "bitnami.com/v1alpha1"
-kind: "SealedSecret"
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
 metadata:
-  annotations: &a1
+  annotations:
     sealedsecrets.bitnami.com/cluster-wide: "true"
   name: www
-  namespace: null
 spec:
   encryptedData:
-    ELASTICSEARCH_URL: AgDWMfg5QLe5H8WK5qlEqXNRE1etDhonIg9uqPJGV6/tusJD647Kvw1oULkZKPdjrLqI1sSwKCQxCF7dwQTAiAHajmCmNwE6u6juCOGOwo7toSAMfZuN/+34l97vb5sbajgBXwuFKs+0+kqJHbZkL7zHqyEyscENeHa1BzYdG46DiEIU3EXdkBXd+oNH/GDm4CHbWAyYblddFhYl2Or5hyEPOW+PniKld6e07xtUVz20iG7cr+pyfbtOvaqyH6eOgYJj4p0x6Mh+0IRrPlaxdRk88iD5Nt5GFTFud5D85PMexbtvDIdsrBY1LLz2Fvh7ji+5DWsm43fShQP/2aOWB9SO7uFIlNusv2K5G9qsCVNE4mwhPK12OHzjDUylSuxQ3Dih7bf6WLE3SA6EBtitUDUe/Rkhkd4oL2VvPTnyoCzvHG4nVHbGbWAPfAE3GsE/8agVbF9QUutsgnLuLetXH4ulhhv06daZNQI8Wy9Fk16lofSqDWJ2AIgfUOuOIH+b/6HPhFyDj5ej0Sk/oKB0/sjKQbdtMmxaQ7lCkZ3M/8NwuiLftw5UFoQSJdOgDA1CVOWxPrlBEHe//3DKsuW+MiMjG3gfrVYleeOf/FHCFcOe+e6qSz7b38fQGpajmGwKwVXkH92+9q133qqbldiWPSl5sY1Hu0HPnoMIGzIQZqwCdMtlIcatmUEiZWbEuH2xdVjrOQjDB8mXDvxbk41FdGlUlTmFdOVEG01NrcVtqVgEwxeB5Leo9a2eBxFyhTZXoOzzq+N5HNVGylMeUau1EkBtUW2S
-    ELASTICSEARCH_TOKEN_UPDATE: AgBCLJLo76K4cpd5DdepRBYawQFDAD6SBeYxB1w5ybR6ODXxLsCw34BxI5nDIA9LMroTWh1kLrcgIx0udUN9hVvOBOVAKHK2XtGsMblfYQlq8rr9DR6Wt/157u+EZ8RDGFCnRQVto++tBOtNxXF94jlm99QixVYFs3DoR325wahZN+r6yTN/o5kOfuHZ49BY+Rb2AkJLnutzc99BgOSkVU8lmVnzaQWt+0+QiHKWlsxbK7A3mYQPcuiqMzgm9074KoMeNlwBBoBuaEDnqxogl7DeFgEg0JsCvVbQgBADaoy2kf3XhxIVvddK5EnMA63K8b09iMGCFSjWp+B8jD0XmvJJwqRlUTSGYFUeK5b28JlFbH1/TPGwqoa6UTC6WaeDsBkPUFqaAN9lshTJEEYS1lxbBNYJtVcFA+yybrDnGNMEyzj5n0qPnKSVXc/GOATYu/AElT/wy9U68WMRAvBCsXSrpNaTvTizNXYO3QnUfj7kbe+peCO+aLcXWjUJnf9qSUMcTq9Y0cdDNIfpA3ZI9n1MkKKupLncPTDC6DJWpvYNGSY0i7dW2Icktw1B/ZS9ZPlNA7JTA8tnz3IA/vaVE1UuumrDa63e6w/2yT4IDVze8T1R73rCYiVGbduo3gT3i3lyJpBjkSfs/omzU/TIZGHodIlUbmNrFBSWCZVfa2OQ0ne/HlMiUYSy3reFJw9XIetcf7LcSQ9/cmAi7QpHDYHJS+cMoD98wMJedj/kSM3PaeDvO6sXstCf/KxdxlW6A50aXZ8YTDONq6tq72Q=
-    HASURA_GRAPHQL_ADMIN_SECRET: AgC4DoTx/Burraa4LQnxWJ8pa4gK7mSHWd4fFFUHWeVrTmcoxLRyVVqH8ajgXFBZ1uksTujs8LM0eDtxeO/d6e88y7lF8epCutVm/9Lr39E8eMA4zwMU6QNrCX4j34YRonf4vbOnlUfm88XKek7DTOsUsbTp5BbO/IrESzabBJ9ntLBAdCVK+j6eGZyCC44VcfszHoiQINwi0Iax66KuA4oUvpQuTdTbB20wr9vzZarMatDDQRYtjugtYFzQQAv45+BZscb1Q+cMz+MXGOeJTDpFrhhV0OeDp5llEDhmx3nhyeRGyeWZdvONrDl4lDvftO6b8CTV1jBaoCX1r8pKcdp69WbkX2V+62lqamr5bmgJiuBWeOTHT1qQrv9uuInhrBBrkcHrXXMKlTY+p9auY/IQLw9CyBn41sK+RDteQfoZFRHSo2UOipbfgB5j9mCVnyJLDYLfyH4TEdGM6lkCATnKHr7Jz16IeR+GwmLfHrHkv3TW6zPijBBZRVcC5Z6LQNVv/6BzrKlzOkgZCKsX5pgaQWQBDSJSe8QGkx3Ccik6XpC/jgdHPEuP8zqDhE4VzWM6FrsxLAvso5WWNgdmS3i01RFa+pnFK7wLp7oLtDjKo7GyG2mXGt2B2+uvUffAmrE4jTCIbjUQtgrHHDBpq0hhxrG0njbh3SL29fNz1FeaXOFdubRfs0Zg2aNXtwDFHDrM8jCt/Yj4mY21uKup82mQZG6FCENCx+Hl7GGtuhs=
-    HASURA_GRAPHQL_JWT_SECRET: AgDSW4ceV9HFoxBNqg/hGa6uunl76cjtKBRSYf5LEPKzNHtXixd73LoFGa2y6/cQ/yGevNU6k7w62pkbWnz5rNAznsBE8QtBt1eRKQqjyJJ21m4sWI/MK6UI3gUS/Ad+LeCMxSoKG3XEzFSAwSndSXsgmwAP4KPpBF83DvdpVVpZtAjvPbNYNE6Ocjhtmt/TLqWjsV4Z+hkS8CKGk+PsYDEuR74Mj5TJys0MALJA9TB2dTIqMHOVZofD8T9hKH42yJWCDruH+gNNPKcleG/R0Pt7LJSamZtsqtXdxeE02tB+I9/VaEMrBL2WCJKhGHTjlDxexl4V/fswFYgXc/T4+hmPVB76xWVi6yFfggD/tLcAvgw3Ivdmbk/1c4CayKjU0+B+57EVrRqCGbJieBfbv6L3EWjU0uQj/uJEaZxIF4st3/r+iSGnrtPveBqnUgkJeqOmhf4sWJwE3xsPJM2kNYDPelWpYdxpoPaq3PNcLs7WpxMtRvwvvz2LMsWhEuUyHpe5yLOvi5swhcGqX1ALxGxfxzV+O229WfuTmV/kGUmcHhdf/VXdJRa+PYS83YK39wC1ZsoXJvPjAvEMgoTaRE8NHPWVD2ookNwdiRQIoLrSrGMP6F+Team2KtCic9ONYnM2wwUj2JCQRkFX2LZXwm9g9uR/Leuyd/IL5+tczwfF+PHfs6TQv+uKVz2qoZQZk4myQ/0JwHluOSXHTwEWkvuwGYO8QMTDOTTdp4Dor3kN7hQZyvWf41V/EHmOoLeFsdpQkWexo1FWHRZYtgG7ZVrgs07bY65gY6c1tZOKFaWhacTuneiLosz79vxn5omsFpjOOiWdSQOPZU8GkGxqJVq16H3VJg==
-    PUBLICATION_SECRET: AgAtDPOTr9khd47wV5WPXJaLSj+6Kmh5N/Wt9SJUTmRgn9jp8trclhS5DvZxmfVv/rYRRiDTuPATDR4yMbfvtrO9ABAhmRZFvmU5VbxdtCDrc9qtv5ZJ4dsYIVxyXIad7+CumHkunXYSwgmCqr2bvv5oeWRmTx2x4uwaNzhEKQ4hUzYCyWp9laJHt5mYT/c/IWZu0PaDXJQVWQuep3fJvjtxQw9EZVy+ehGAqyClL7bkqT1KVrVBDfvpPeO97O2e2de49RcdZSCtBTmGDHKg7fwUziBJSSI8ObtUMzWm56223XZXKqrxdChAlWJE05tHsvowa18NadFDjJwVt3RtPp+HguVj+I7PiTJMTjyZpsmHlr767teLYrXAoAVc9MRrGeznvYw4i0DhNFZXfyYghSKnKPW4yfYzNKwX50huCyQethn1TqU6MAYGrWiyx9XsaHy3bNgAO4ru9o8WV7bfyeRRsABMoiubyq9RCxfOXRU3cbWYaiS8aiPxALZRKjhSeQhJ5ufdL700rJWV2nuoxXG8jjR3yw3bpCL6imIrLRIAP1+Wki5I8Qo98dfBBF/nahEWeXdCqCjpImfSLUioKMes2IrH8ragfja+85x06S8717b67qyBqtGeGAfX2JYLDWILoA0k9RdzyIwuakAZkChGoWTUy8aRjC7GJIKCQ5IKZ5FQr0IuVVjj1xoGBh6O/sFsOLF7/sA3hRcvirzcCFvCIwsmHs/q4K1iU7nDR0WE1AUV/uccbP3yzAzv6gqElztn1f/LOpA01b2Wn9YAzi6S65wUXUWx7UAx6YaiiofmnySnseSNfE+8
-    ACTIONS_SECRET: AgCrnvsRqo0y0d2B5jJOSfdsu7zPJ+DmjbS7GVXRYEHOMIi2tLwuuNvZdRk7iBc/DtbCrIA4Wg55gKTUD1XYtzIYcdysovYTDEBl1IcR1/9mSzbYB7XXWrBfsyP36UbNIEah/caigryy0THA4Rulde6yZ71lSIX3nmpXObEdoO3AHfGQtQE948CCwQdA/9SI90bvvCp9aYJ+oGbB4xqipguchUQIFH8UpRxsWywFQo7I6ao/lB6KfxIxdLxfEFOwisFEHWdranEE/ai2QJrzE0Eeo5y0jcp8FMJ2WvWmIVNrg+4mfDK4dzmSozbP06X03FDWLtRmkU3F5M42/aqBRSCw1kU2yuTNjP3DzyIdwOEYRIShzU5A2RaGWzLclkeqjQQFXSXs0Ju3mcaD6C8WWde+A7tFm9pSrx8yp8PkG+7E5DfNsC8jMQnIFDLIqgcFMPF6vnOyb6HS1fW/Aa0O7xD2Oq6Gpx6wyw0GzZ6ZB8IkUp1PMc+bNNR0bY6Rh0PjdjPXuyPFVuZ1zHc9Kpd9pYhNr06ldiOe6ZrtI/GEAUJe2DEtkZYDjVu6A5IdEFIn1mTW/+H5EduxQv6NuVzYudNg2n6/wC2S8637EkyPrgklHS+lCxMr7N9uHPRHJm+tAB5bwds/jZjivHrePv52rVtZxSaPc1AchoORsGqbJks2L3u0Bu7o2sdDtNAj2vyxp39FHpgeMqNbBF21nyohjhXvR7gPWvzBGl1+0au6CJfqEkOzgovbI4hPmUWzXbf0jW6pMcAERiQ04h07ZjqyHYRAXw4J9Gm1GDooxNDdVi7yOu1dI4iKoLwD
-    SMTP_EMAIL_USER: AgA3OzfISPZpiKp5P3PhpgzY5avfiU54p9oMn60Jn0ebNnj4+GSrXQ52v9OTIrL/WthPZhD9HdjjconiWsWnxXeaHTRkXup3XxLy3yV3L9HLnVbG0vMTsVvfPo2GezqACHu9JLWoq+noa3uzQc/d/lM1s8oxbNtVqWCD4sFPTdJxgPkY1TukvdmjfwA5J8S5iELdfGKT01z/4JyhU2R4zFPSR8w5PSl0Eelob+wP2FxMH+/TLwpbiNfVEY04jAMG3W4dOD7FZC6RCH9LfKSOvjce/E0aGqx5dTycjpKmwtwg5YYhWeA3k5Chwk5EfYE/y0KTEZm+cKo2NdyHFUemepTKVcj+Cvz2gE1KQfOiuvxQ8WyPCmeMiwQ5+ehVeEQeXaqtLQyJt4bOGCmatnXdtbIFfAWEEExMilWcvobIwZt2hQjp+IRKfK5zfo/vTSSdazNApSiEPKgwwfyS/kNE9KVqam/2KaG3pexRn74V9b4CqDByeU84QWdF3RdVP9Itkn8GjXlhOV7Y7mTFNAUJjuHmgUjvOYBk/yg4ZDc7B3ky3hiYAPQuvh5+7+EiOcn4S4/2Ro3oJzy7TSmvgG/iGyakKF1HbpAbMeqlmaqTZ3x0lglZ7gbHLMP5MLdwetJq//vSueI4YaXLfC4ewbvCbUE8z7lxbhu8tnprodL5+aXHzBiInmAc+VizrLltyYAkb7qmaQxNNqBJEx9WgmTJGUipfo5OtQ7ByUiHzPI8/wBuUg==
-    SMTP_EMAIL_PASSWORD: AgCtNDmA/H1w1O9yj8J9ykjNe8ap6iO5Rd+zjbzWF/IXkqFrK3TUcTaLD9IXltnA3Oeru0rSVTJcPfQwzV9brriIjmrSHjuJK2c5vzQ113x8w9DTpiBk0S5wRHOigwexGxouj1G1MbDrgcB4a6cNMDMJAMxP98uJyzncX2uigDzTTWLh0xVGO1ipNYmgOF9MyNYpkJLYEpSeIQEtNjfUUEcSIrBkrAVLCC6fJUu8trbKXNPGShobw15pmY9rbv25lzz3o3js/biGLgmb5QG3oRcWc5OySN/z59rlD8yrw35ZIdEIDU946XONjtUSoLx4sH3T0fZxNUr3UOm25n6j5ltq4tO+xKx+K3/K91svOpRwv6nM094rQNFghjLajwiWF2VSInWmh1PsNZxIs3S8mFQmiC9x1fcmqG0EsAQoWzwuDDUInCM/S7vIAg8eLUBts+Rkg5/QM7Tjk8qmT+3581+hiP+PJSF+jWHDUfxt+/xisRmMjIM8HN/iTAfLy0XLi39kmOiXPROtd5yvTKmLU7hIDSMu25i9yQEJNV1tMiJIIBpqqGVcFVNk0qMN/Gh7i1tKhJjGS9k/YlUa0jAi1pe1MCW9o6wXyur9PAv75+7qvpzl9rqICDQtGFEbkdZAX6YcXV4JpGoitmmPHm7xsrG66yvsRXRyqX51IN67g9ZFWrelER0jmYYf/SpahpbJ5kMuQ1rd0Wk90JnmXiCNyBxbGE7PjHQUmwu9i0GS5ksgAw==
+    ELASTICSEARCH_URL: AgCc9hf+VdcDI57o1P/TWmp7HWSwaFZ8hwO5VqRP9WJaMmcWQgMQNlUQg6oZAIAfxT7M2rHccMRD6Mkyu+YWCwQo+P26LWV50aH38bMYnQM5WTieDwEJpjffURZHFLVC44dyExz6S6FlvMGJcHtUK0fBrJLKXcS2mZdEh1MScqhtYIqXjXEEOgqTtxwvio7o31XJi0Op0LEY9WQZJmMP65Pt7zueFTe9/6yPFC5V8c/5eGT+axPFIaa71MKJrM+GZI3T7XiA3Pj8YmHvNF5CvrYnS94NOOZsSujiRkP2pB5XHWb3xGPBaNYiN5CuV+C1An/2MfJLvJjkjikTUEv+XMXChf39AcF4jdZZIzhpS0pnjqhncuergg2+vxq+QEwUk6GZiJ7hT0/yOfHA3gnohFESUbU2yce6/FxG3f6xMxpbyfqU9K/Ju7hWQ65BVXaxtYLNSj1l1YGQ5s+N5o9ISWiXa/oZihZjw0L+MEvH1TUGgiTbs94zG3fTl51OBRpzeTqRv9G83ASI/8baAWeKPA4v0CbT6x2eDf7EdiMY11zPwHzMf/zGJqgxr18dtCqC88ETCNc0c9jTVN0n6hriJ5FS0gJwIrWH8O34KYBaDOibEhUGdDAHBs1NStWoYu68LJ77h/ju5t2EIqzrgzfHXzkzWaNU0mrnLHD6Lpj1IREvTnAKbX8JzwELUXpnMmq3gYrbD94/FvyLxpjZvHJtsVunnyGzdGgEgwBbdzkhRo18BPEFtMJRravjZmmCpIZKMHyCbpQEEV4RK0UiwmfSDUX3TkQL
+    ELASTICSEARCH_TOKEN_UPDATE: AgCJrfs9bxEtOYDMO19x47ZXT0vsn8FcJ0vYwc/Cm0kLGw7g9nFUbPHgeIP3ObH3hT3kITqm1Od7ZvBqYFFGrnMvBcNPami/9LAu29hNbp6qMnEuq1VvtPbQDGC4OvUbTbeTmPVA2IUIrOcaKj7FEqV8Mie5L+Fio95Kt8D1sTso7J0tLasJ30hmHClnU2/AdGrjHTa0PRMF73xhLpkJoP7WxwoXWG+ShLD6hUZsVuaMNCBqd+1ZG5yX2j8WADwKgj2Oqr5VzQW8vRsNnSj5EiaVeR0ZcckqgHNPawJFocNTwca6jJNKwvDkYMe/OPb6lk4pu2OIwXGulVIf2UmIU3sX5hGV04Cfu6/mPD1uW8Z1yoP5EwFtr0Us5KDNiseEfpWvOR/EIvBiDRDhqcDgjNLjKIrXcbJ3wq9MNNOL0txIsTW8sdIvIY6UUMvaNlU63AyU8YpZQRthcKHt1u4HG9NKxYgYhvZMuHlujCiuSW4EdgEXSDc7Tf9llomo+078E5FaY4/Nunnp3/hsirwwkE9VkzpDxaFRuy6Hwe88MshtAZM+xQcdkZNZB693lG+08CnfJeEWm3UwoLeZZrYFGokRcz53WTmEr3Yinhvckr/YuwiAZ3lHXFq6CNcmg1dZLX00cr4S18gnOkUgIyYiUiKOY5SHmTLbVPxb7D3Rl6BhBhV/GiALar7sF6a6bD4681UhjR7q2So8s1LyksT5V0GPIv+r4NwoB0W1vmimzQTqNiAw0wnte1530xiR24HxF0d+7Yr8y6WRTOjAht0=
+    NEXTAUTH_SECRET: AgAObcZKrO3zRrVCfoXEAntOXyZlHFJdxUep4iWbQdITqzDw32DhJzynwXmLTlOcJrAf0acuDOK3xMoOH2QZO4EaDOmpL8vJwmvQWIccdO/Gll2cxwCr/Cbu/9RmMixaXtrscoPz7m2geO5u/0dRCFE5IVUGZfaOBY+zHIFaxPFxWu9edjHWS9JJfRqcIoEyCLudmM1N20UGa2fq1tuIbD5ZS9f392l3669wqRB4tNnKxOKIJEQ4GA5PkqYYLoFsGGtAR5Hw9/eweXP0KXZfQjRJUfowdzFsx3wutjd2PVz7t0K5WZc2X4+RsodhEEYZJD013vXSQBHm8u/0VHQwAWotNt2uVoAbvVzup3DvqxUBN5LJIRanmFHTw2JNh+s4eUvd+86PBiTpoPXIg9QpGWy4rhG7gJ614HOD70cLL6jik48Ezbi4OfOBQGKbs0rrkPiAg60jCW4wXgQqpdH+6TEj/z7+/ZU0um5pKTUA6DS8EN5xU1xQdHLMo7WVXQHI26lbWRtLMQA8JYmvq/kXfhcH6kYVERDWYK1QiajGSdDbEGkjxDh0Uk8KRHAtBw2xXgT8lV6wpVIuGrrc1B6CbJOGgEBUwdjbD9v7n4mqAEp7N8d6Gsc0Nbsc2rrAl4rVB7/ihoUXEtQthrXA8UFj8p7f/O7AMKXCU8gt29FeTFNEwydXhXw1EPlfUzr4/Gp3uNXiLSpjK9/3F4jQMAOHz64XOipFPMxncZSXounxVGJT8yBhxYEvpUq/9nufFA==
   template:
     metadata:
-      annotations: *a1
+      annotations:
+        sealedsecrets.bitnami.com/cluster-wide: "true"
       name: www
-    type: "Opaque"
+    type: Opaque

.kontinuous/env/dev/values.yaml

@@ -1,6 +1,6 @@
 hasura:
   imagePackage: hasura
-  ~needs: [post-restore, build-hasura]
+  ~needs: [build-hasura]
   ~preDeploy.cleaner:
     match:
       kind: Deployment
@@ -58,7 +58,7 @@ pg:
       ~tpl~owner: "{{ .Values.global.pgUser }}"
       secretName: "pg-db"
       barmanObjectStore:
-        ~tpl~destinationPath: "s3://cdtn-prod-backups/cdtn-admin"
+        ~tpl~destinationPath: "s3://cdtn-prod-backups/cdtn-admin-2024-03-26-12-33"
         s3Credentials:
           accessKeyId:
             ~tpl~name: "cdtn-prod-backups-access-key"
@@ -73,7 +73,7 @@ pg:
 jobs:
   runs:
     post-restore:
-      ~needs: [pg]
+      ~needs: [pg, hasura]
       use: psql
       with:
         sqlFile: .kontinuous/sql/post-restore.sql