fix(ci): use unique job names for restore jobs (#578)

SocialGouv · Aug 13, 2021 · a9fbe96 · a9fbe96
1 parent 529d1bc
commit a9fbe96
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.k8s/__tests__/__snapshots__/generate-dev-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-dev-restore.ts.snap
@@ -5,7 +5,7 @@ exports[`kosko generate --dev jobs/restore 1`] = `
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-master
+  name: restore-container-master-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin
@@ -213,7 +213,7 @@ metadata:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-db-master
+  name: restore-db-master-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin
@@ -393,7 +393,7 @@ exports[`kosko generate --dev jobs/restore/container 1`] = `
 "apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-master
+  name: restore-container-master-0123456
   namespace: cdtn-admin-secret
   labels:
     application: master-dev42-cdtn-admin

diff --git a/.k8s/__tests__/__snapshots__/generate-preprod-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-preprod-restore.ts.snap
@@ -5,7 +5,7 @@ exports[`kosko generate --preprod jobs/restore 1`] = `
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-container-v1-2-3
+  name: restore-container-v1-2-3-0123456
   namespace: cdtn-admin-secret
   labels:
     application: v1-2-3-cdtn-admin
@@ -213,7 +213,7 @@ metadata:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: restore-db-v1-2-3
+  name: restore-db-v1-2-3-0123456
   namespace: cdtn-admin-secret
   labels:
     application: v1-2-3-cdtn-admin

diff --git a/.k8s/__tests__/__snapshots__/generate-prod-restore.ts.snap b/.k8s/__tests__/__snapshots__/generate-prod-restore.ts.snap
@@ -4,7 +4,7 @@ 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
+  name: restore-container-v1-2-3-0123456
   namespace: cdtn-admin-secret
   labels:
     application: cdtn-admin
@@ -120,7 +120,7 @@ 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
+  name: restore-container-v1-2-3-0123456
   namespace: cdtn-admin-secret
   labels:
     application: cdtn-admin

diff --git a/.k8s/components/jobs/restore/container.ts b/.k8s/components/jobs/restore/container.ts
@@ -23,7 +23,7 @@ const job = restoreContainerJob({
   project: "cdtn-admin",
   to: params.server,
 });
-job.metadata!.name = `restore-container-${GITLAB_LIKE_ENVIRONMENT_SLUG}`;
+job.metadata!.name = `restore-container-${GITLAB_LIKE_ENVIRONMENT_SLUG}-${process.env.CI_COMMIT_SHORT_SHA}`;
 job.metadata!.labels = envParams.metadata.labels || {};
 job.metadata!.labels.component =
   process.env.COMPONENT || `restore-${process.env.CI_COMMIT_REF_SLUG}`;

diff --git a/.k8s/components/jobs/restore/db.ts b/.k8s/components/jobs/restore/db.ts
@@ -63,7 +63,7 @@ const manifests = restoreDbJob({
 // override initContainer PGDATABASE/PGPASSWORD because this project pipeline use the legacy `db_SHA` convention instead of `autodevops_SHA`
 const job = manifests.find<Job>((m): m is Job => m.kind === "Job");
 ok(job?.metadata, "Missing job metadata");
-job.metadata.name = `restore-db-${GITLAB_LIKE_ENVIRONMENT_SLUG}`;
+job.metadata.name = `restore-db-${GITLAB_LIKE_ENVIRONMENT_SLUG}-${process.env.CI_COMMIT_SHORT_SHA}`;
 job.metadata!.annotations = {
   "kapp.k14s.io/update-strategy": "always-replace",
 };