From 7c488a98075284682ca719edc9cfb7c9ffc2397f Mon Sep 17 00:00:00 2001 From: Jacques ROUSSEL Date: Tue, 26 Mar 2024 17:15:56 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80(helm)=20transform=20migrate=20job?= =?UTF-8?q?=20to=20Presync=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply db migration before syncing all the pods. It avoids triggering errors when running the migrate job. --- src/helm/desk/templates/backend_job.yaml | 4 ++++ src/helm/desk/values.yaml | 3 +++ src/helm/env.d/staging/values.desk.yaml.gotmpl | 3 +++ 3 files changed, 10 insertions(+) diff --git a/src/helm/desk/templates/backend_job.yaml b/src/helm/desk/templates/backend_job.yaml index 253576d..32e32d5 100644 --- a/src/helm/desk/templates/backend_job.yaml +++ b/src/helm/desk/templates/backend_job.yaml @@ -5,6 +5,10 @@ apiVersion: batch/v1 kind: Job metadata: name: {{ $fullName }}-migrate + {{- with .Values.backend.migrateJobAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: {{- include "desk.common.labels" (list . $component) | nindent 4 }} spec: diff --git a/src/helm/desk/values.yaml b/src/helm/desk/values.yaml index ccf0346..ab76642 100644 --- a/src/helm/desk/values.yaml +++ b/src/helm/desk/values.yaml @@ -88,6 +88,9 @@ backend: ## @param backend.sidecars Add sidecars containers to backend deployment sidecars: [] + ## @param backend.migrateJobAnnotations Annotations for the migrate job + migrateJobAnnotations: {} + ## @param backend.securityContext Configure backend Pod security context securityContext: null diff --git a/src/helm/env.d/staging/values.desk.yaml.gotmpl b/src/helm/env.d/staging/values.desk.yaml.gotmpl index 3e72576..7ea65cd 100644 --- a/src/helm/env.d/staging/values.desk.yaml.gotmpl +++ b/src/helm/env.d/staging/values.desk.yaml.gotmpl @@ -4,6 +4,9 @@ image: tag: "main" backend: + migrateJobAnnotations: + argocd.argoproj.io/hook: PreSync + argocd.argoproj.io/hook-delete-policy: HookSucceeded envVars: DJANGO_CSRF_TRUSTED_ORIGINS: http://desk-staging.beta.numerique.gouv.fr,https://desk-staging.beta.numerique.gouv.fr DJANGO_CONFIGURATION: Production