fix(deps): update dependency @socialgouv/kosko-charts to v9 (#585)

* fix(deps): update dependency @socialgouv/kosko-charts to v9 * build(k8s): migrate to @socialgouv/kosko-charts to v9 * chore(lock): update lock file Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Douglas DUTEIL <douglasduteil@gmail.com>
SocialGouv · Aug 23, 2021 · c59ce31 · c59ce31
1 parent 654ac95
commit c59ce31
Show file tree

Hide file tree

Showing 14 changed files with 423 additions and 498 deletions.
diff --git a/.k8s/__tests__/__snapshots__/generate-dev-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-dev-restore.ts.snap
@@ -5,14 +5,14 @@ exports[`kosko generate --dev jobs/restore 1`] = `
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-master-0123456
+  name: restore-container-master-dev42-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:
@@ -197,7 +197,7 @@ data:
     SELECT pg_terminate_backend(pid)
     FROM pg_stat_activity
     WHERE pid <> pg_backend_pid()
-    AND datname = 'autodevops_master';
+    AND datname = 'autodevops_master-dev42';
 
 
 metadata:
@@ -208,19 +208,19 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-db-master-0123456
+  name: restore-db-master-dev42-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:
@@ -276,15 +276,15 @@ spec:
               -a < /mnt/scripts/post-restore.sql
           env:
             - name: PGDATABASE
-              value: autodevops_master
+              value: autodevops_master-dev42
             - name: OWNER
-              value: user_master
+              value: user_master-dev42
             - name: FILE
               value: hasura_prod_db.psql.gz
           envFrom:
             - secretRef:
                 name: azure-pg-admin-user-dev
-          image: ghcr.io/socialgouv/docker/azure-db:6.32.2
+          image: ghcr.io/socialgouv/docker/azure-db:6.43.1
           imagePullPolicy: IfNotPresent
           name: restore-db
           resources:
@@ -313,15 +313,15 @@ spec:
             - name: PGHOST
               value: cdtnadmindevserver.postgres.database.azure.com
             - name: PGDATABASE
-              value: autodevops_master
+              value: autodevops_master-dev42
             - name: PGPASSWORD
-              value: password_master
+              value: password_master-dev42
             - name: PGUSER
-              value: user_master@cdtnadmindevserver.postgres.database.azure.com
+              value: user_master-dev42@cdtnadmindevserver.postgres.database.azure.com
             - name: PGSSLMODE
               value: require
           envFrom: []
-          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.32.2
+          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.43.1
           imagePullPolicy: Always
           name: wait-for-postgres
           resources:
@@ -346,7 +346,7 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
   namespace: cdtn-admin-secret
 spec:
   accessModes:
@@ -368,7 +368,7 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
   name: master-dev42-cdtn-admin-backup-restore
   annotations:
     app.gitlab.com/app: socialgouv-cdtn-admin
@@ -393,14 +393,14 @@ exports[`kosko generate --dev jobs/restore/container 1`] = `
 "apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-master-0123456
+  name: restore-container-master-dev42-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-master
+    component: restore-master-dev42
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:

diff --git a/.k8s/__tests__/__snapshots__/generate-dev.ts.snap b/.k8s/__tests__/__snapshots__/generate-dev.ts.snap
@@ -6,6 +6,8 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    socialgouv/creator: autodevops
+    janitor/ttl: 15d
     field.cattle.io/creatorId: gitlab
     field.cattle.io/projectId: c-bar:p-foo
     git/branch: master
@@ -233,7 +235,7 @@ spec:
             periodSeconds: 5
           envFrom:
             - secretRef:
-                name: azure-pg-user-master
+                name: azure-pg-user-master-dev42
             - secretRef:
                 name: hasura
             - configMapRef:
@@ -244,8 +246,8 @@ spec:
               value: '24'
           envFrom:
             - secretRef:
-                name: azure-pg-user-master
-          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.32.2
+                name: azure-pg-user-master-dev42
+          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.43.1
           imagePullPolicy: Always
           name: wait-for-postgres
           resources:
@@ -527,17 +529,17 @@ spec:
             - create-db-user
           env:
             - name: NEW_DB_NAME
-              value: autodevops_master
+              value: autodevops_master-dev42
             - name: NEW_USER
-              value: user_master
+              value: user_master-dev42
             - name: NEW_PASSWORD
-              value: password_master
+              value: password_master-dev42
             - name: NEW_DB_EXTENSIONS
               value: hstore pgcrypto citext uuid-ossp
           envFrom:
             - secretRef:
                 name: azure-pg-admin-user
-          image: ghcr.io/socialgouv/docker/azure-db:6.32.2
+          image: ghcr.io/socialgouv/docker/azure-db:6.43.1
           imagePullPolicy: IfNotPresent
           name: create-db-user
           resources:
@@ -569,25 +571,25 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-  name: create-db-job-master
+  name: create-db-job-0123456
   namespace: cdtn-admin-85-master-dev42
 ---
 apiVersion: v1
 kind: Secret
 stringData:
   DATABASE_URL: >-
-    postgresql://user_master%40cdtnadmindevserver.postgres.database.azure.com:password_master@cdtnadmindevserver.postgres.database.azure.com/autodevops_master?sslmode=require
+    postgresql://user_master-dev42%40cdtnadmindevserver.postgres.database.azure.com:password_master-dev42@cdtnadmindevserver.postgres.database.azure.com/autodevops_master-dev42?sslmode=require
   DB_URI: >-
-    postgresql://user_master%40cdtnadmindevserver.postgres.database.azure.com:password_master@cdtnadmindevserver.postgres.database.azure.com/autodevops_master?sslmode=require
+    postgresql://user_master-dev42%40cdtnadmindevserver.postgres.database.azure.com:password_master-dev42@cdtnadmindevserver.postgres.database.azure.com/autodevops_master-dev42?sslmode=require
   HASURA_GRAPHQL_DATABASE_URL: >-
-    postgresql://user_master%40cdtnadmindevserver.postgres.database.azure.com:password_master@cdtnadmindevserver.postgres.database.azure.com/autodevops_master?sslmode=require
-  PGDATABASE: autodevops_master
+    postgresql://user_master-dev42%40cdtnadmindevserver.postgres.database.azure.com:password_master-dev42@cdtnadmindevserver.postgres.database.azure.com/autodevops_master-dev42?sslmode=require
+  PGDATABASE: autodevops_master-dev42
   PGHOST: cdtnadmindevserver.postgres.database.azure.com
-  PGPASSWORD: password_master
+  PGPASSWORD: password_master-dev42
   PGRST_DB_URI: >-
-    postgresql://user_master%40cdtnadmindevserver.postgres.database.azure.com:password_master@cdtnadmindevserver.postgres.database.azure.com/autodevops_master?sslmode=require
+    postgresql://user_master-dev42%40cdtnadmindevserver.postgres.database.azure.com:password_master-dev42@cdtnadmindevserver.postgres.database.azure.com/autodevops_master-dev42?sslmode=require
   PGSSLMODE: require
-  PGUSER: user_master@cdtnadmindevserver.postgres.database.azure.com
+  PGUSER: user_master-dev42@cdtnadmindevserver.postgres.database.azure.com
 metadata:
   annotations:
     app.gitlab.com/app: socialgouv-cdtn-admin
@@ -598,7 +600,7 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-  name: azure-pg-user-master
+  name: azure-pg-user-master-dev42
   namespace: cdtn-admin-85-master-dev42
 ---
 apiVersion: apps/v1

diff --git a/.k8s/__tests__/__snapshots__/generate-preprod-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-preprod-restore.ts.snap
@@ -5,14 +5,14 @@ exports[`kosko generate --preprod jobs/restore 1`] = `
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-v1-2-3-0123456
+  name: restore-container-preprod-dev42-0123456
   namespace: cdtn-admin-secret
   labels:
     application: v1-2-3-cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-v1-2-3
+    component: restore-preprod-dev42
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:
@@ -197,7 +197,7 @@ data:
     SELECT pg_terminate_backend(pid)
     FROM pg_stat_activity
     WHERE pid <> pg_backend_pid()
-    AND datname = 'preprod';
+    AND datname = 'autodevops_preprod';
 
 
 metadata:
@@ -208,19 +208,19 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-v1-2-3
+    component: restore-preprod-dev42
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-db-v1-2-3-0123456
+  name: restore-db-preprod-dev42-0123456
   namespace: cdtn-admin-secret
   labels:
     application: v1-2-3-cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-v1-2-3
+    component: restore-preprod-dev42
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:
@@ -276,15 +276,15 @@ spec:
               -a < /mnt/scripts/post-restore.sql
           env:
             - name: PGDATABASE
-              value: preprod
+              value: autodevops_preprod
             - name: OWNER
-              value: preprod
+              value: user_preprod
             - name: FILE
               value: hasura_prod_db.psql.gz
           envFrom:
             - secretRef:
                 name: azure-pg-admin-user-dev
-          image: ghcr.io/socialgouv/docker/azure-db:6.32.2
+          image: ghcr.io/socialgouv/docker/azure-db:6.43.1
           imagePullPolicy: IfNotPresent
           name: restore-db
           resources:
@@ -310,12 +310,18 @@ spec:
           name: scripts
       initContainers:
         - env:
+            - name: PGHOST
+              value: cdtnadmindevserver.postgres.database.azure.com
             - name: PGDATABASE
-              value: preprod
-          envFrom:
-            - secretRef:
-                name: azure-pg-admin-user-dev
-          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.32.2
+              value: autodevops_preprod
+            - name: PGPASSWORD
+              value: password_preprod
+            - name: PGUSER
+              value: user_preprod@cdtnadmindevserver.postgres.database.azure.com
+            - name: PGSSLMODE
+              value: require
+          envFrom: []
+          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.43.1
           imagePullPolicy: Always
           name: wait-for-postgres
           resources:
@@ -340,7 +346,7 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-v1-2-3
+    component: restore-preprod-dev42
   namespace: cdtn-admin-secret
 spec:
   accessModes:
@@ -362,7 +368,7 @@ metadata:
     owner: cdtn-admin
     team: cdtn-admin
     cert: wildcard
-    component: restore-v1-2-3
+    component: restore-preprod-dev42
   name: preprod-dev42-cdtn-admin-backup-restore
   annotations:
     app.gitlab.com/app: socialgouv-cdtn-admin

diff --git a/.k8s/__tests__/__snapshots__/generate-preprod.ts.snap b/.k8s/__tests__/__snapshots__/generate-preprod.ts.snap
@@ -6,6 +6,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    socialgouv/creator: autodevops
     field.cattle.io/creatorId: gitlab
     field.cattle.io/projectId: c-bar:p-foo
     git/branch: v1.2.3
@@ -243,7 +244,7 @@ spec:
           envFrom:
             - secretRef:
                 name: azure-pg-user
-          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.32.2
+          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.43.1
           imagePullPolicy: Always
           name: wait-for-postgres
           resources:

diff --git a/.k8s/__tests__/__snapshots__/generate-prod-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-prod-restore.ts.snap
@@ -4,13 +4,13 @@ exports[`kosko generate --prod jobs/restore/container when TRIGGER is set to PRE
 "apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-v1-2-3-0123456
+  name: restore-container-prod-0123456
   namespace: cdtn-admin-secret
   labels:
     application: cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
-    component: restore-v1-2-3
+    component: restore-prod
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:
@@ -120,13 +120,13 @@ exports[`kosko generate --prod jobs/restore/container when TRIGGER is set to PRO
 "apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-v1-2-3-0123456
+  name: restore-container-prod-0123456
   namespace: cdtn-admin-secret
   labels:
     application: cdtn-admin
     owner: cdtn-admin
     team: cdtn-admin
-    component: restore-v1-2-3
+    component: restore-prod
   annotations:
     kapp.k14s.io/update-strategy: always-replace
 spec:

diff --git a/.k8s/__tests__/__snapshots__/generate-prod.ts.snap b/.k8s/__tests__/__snapshots__/generate-prod.ts.snap
@@ -218,7 +218,7 @@ spec:
           envFrom:
             - secretRef:
                 name: azure-pg-user
-          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.32.2
+          image: ghcr.io/socialgouv/docker/wait-for-postgres:6.43.1
           imagePullPolicy: Always
           name: wait-for-postgres
           resources: