Fix ArgoCD hooks annotation location

hashicorp · May 13, 2024 · 9dc87d1 · 9dc87d1
1 parent 69ba66c
commit 9dc87d1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.changelog/3989.txt b/.changelog/3989.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: Fix ArgoCD hooks related annotation on init Job, they must be added at Job definition and not tempalte level.
+```
diff --git a/charts/consul/templates/server-acl-init-job.yaml b/charts/consul/templates/server-acl-init-job.yaml
@@ -32,6 +32,11 @@ metadata:
     {{- if .Values.global.extraLabels }}
       {{- toYaml .Values.global.extraLabels | nindent 4 }}
     {{- end }}
+  {{- if .Values.global.argocd.enabled }}
+  annotations:
+    "argocd.argoproj.io/hook": "Sync"
+    "argocd.argoproj.io/hook-delete-policy": "HookSucceeded"
+  {{- end }}
 spec:
   template:
     metadata:
@@ -50,12 +55,7 @@ spec:
         {{- if .Values.global.acls.annotations }}
           {{- tpl .Values.global.acls.annotations . | nindent 8 }}
         {{- end }}
-        {{- if .Values.global.argocd.enabled }}
-        "argocd.argoproj.io/hook": "Sync"
-        "argocd.argoproj.io/hook-delete-policy": "HookSucceeded"
-        {{- end }}
         {{- if .Values.global.secretsBackend.vault.enabled }}
-
         {{- /* Run the Vault agent as both an init container and sidecar.
         The Vault agent sidecar is needed when server-acl-init bootstraps ACLs
         and writes the bootstrap token back to Vault.

diff --git a/charts/consul/test/unit/server-acl-init-job.bats b/charts/consul/test/unit/server-acl-init-job.bats
@@ -2383,14 +2383,14 @@ load _helpers
      --set 'global.acls.manageSystemACLs=true' \
      --set 'global.argocd.enabled=true' \
      . | tee /dev/stderr |
-     yq -r '.spec.template.metadata.annotations["argocd.argoproj.io/hook"]' | tee /dev/stderr)
+     yq -r '.metadata.annotations["argocd.argoproj.io/hook"]' | tee /dev/stderr)
   [ "${actual}" = "Sync" ]
   local actual=$(helm template \
      -s templates/server-acl-init-job.yaml \
      --set 'global.acls.manageSystemACLs=true' \
      --set 'global.argocd.enabled=true' \
      . | tee /dev/stderr |
-     yq -r '.spec.template.metadata.annotations["argocd.argoproj.io/hook-delete-policy"]' | tee /dev/stderr)
+     yq -r '.metadata.annotations["argocd.argoproj.io/hook-delete-policy"]' | tee /dev/stderr)
   [ "${actual}" = "HookSucceeded" ]
 }
 
@@ -2401,14 +2401,14 @@ load _helpers
      --set 'global.acls.manageSystemACLs=true' \
      --set 'global.argocd.enabled=false' \
      . | tee /dev/stderr |
-     yq -r '.spec.template.metadata.annotations["argocd.argoproj.io/hook"]' | tee /dev/stderr)
+     yq -r '.metadata.annotations["argocd.argoproj.io/hook"]' | tee /dev/stderr)
   [ "${actual}" = null ]
   local actual=$(helm template \
      -s templates/server-acl-init-job.yaml \
      --set 'global.acls.manageSystemACLs=true' \
      --set 'global.argocd.enabled=false' \
      . | tee /dev/stderr |
-     yq -r '.spec.template.metadata.annotations["argocd.argoproj.io/hook-delete-policy"]' | tee /dev/stderr)
+     yq -r '.metadata.annotations["argocd.argoproj.io/hook-delete-policy"]' | tee /dev/stderr)
   [ "${actual}" = null ]
 }