From eeb4dae12dee1aff768d620ac9ea987886838adb Mon Sep 17 00:00:00 2001 From: Jacques ROUSSEL Date: Tue, 24 Sep 2024 11:41:55 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A(ci)=20fix=20argocd=20job=20which?= =?UTF-8?q?=20handles=20sync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed by @rouja. ArgoCD should be more robust than ever, while syncing with our code. --- src/helm/meet/templates/backend_job.yaml | 3 ++- src/helm/meet/templates/backend_job_createsuperuser.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/helm/meet/templates/backend_job.yaml b/src/helm/meet/templates/backend_job.yaml index bd931541..a522da0c 100644 --- a/src/helm/meet/templates/backend_job.yaml +++ b/src/helm/meet/templates/backend_job.yaml @@ -6,8 +6,9 @@ kind: Job metadata: name: {{ $fullName }}-migrate namespace: {{ .Release.Namespace | quote }} - {{- with .Values.backend.migrateJobAnnotations }} annotations: + argocd.argoproj.io/sync-options: Replace=true,Force=true + {{- with .Values.backend.migrateJobAnnotations }} {{- toYaml . | nindent 4 }} {{- end }} labels: diff --git a/src/helm/meet/templates/backend_job_createsuperuser.yaml b/src/helm/meet/templates/backend_job_createsuperuser.yaml index e14620a4..b39f8417 100644 --- a/src/helm/meet/templates/backend_job_createsuperuser.yaml +++ b/src/helm/meet/templates/backend_job_createsuperuser.yaml @@ -6,8 +6,9 @@ kind: Job metadata: name: {{ $fullName }}-createsuperuser namespace: {{ .Release.Namespace | quote }} - {{- with .Values.backend.migrateJobAnnotations }} annotations: + argocd.argoproj.io/sync-options: Replace=true,Force=true + {{- with .Values.backend.migrateJobAnnotations }} {{- toYaml . | nindent 4 }} {{- end }} labels: