chore: remove sync waves

p2p-org · Dec 16, 2024 · 28a11d4 · 28a11d4
1 parent bca823c
commit 28a11d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/charts/namada-indexer/templates/dependencies-job.yaml b/charts/namada-indexer/templates/dependencies-job.yaml
@@ -4,13 +4,9 @@ kind: Job
 metadata:
   name: {{ include "namada-indexer.fullname" . }}-wait-dependencies
   annotations:
-    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook": "post-install,post-upgrade"
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
-    {{- if .Values.argocd.deployment }}
-    "argocd.argoproj.io/hook": "PreSync"
-    "argocd.argoproj.io/sync-wave": "-1"
-    {{- end }}
   labels:
     {{- include "namada-indexer.labels" . | nindent 4 }}
 spec:

diff --git a/charts/namada-indexer/templates/rbac.yaml b/charts/namada-indexer/templates/rbac.yaml
@@ -4,11 +4,9 @@ metadata:
   name: {{ include "namada-indexer.fullname" . }}
   labels:
     {{- include "namada-indexer.labels" . | nindent 4 }}
-  {{- if .Values.argocd.deployment }}
   annotations:
-    "argocd.argoproj.io/hook": "PreSync"
-    "argocd.argoproj.io/sync-wave": "-4"
-  {{- end }}
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-9"
 rules:
   # For deployment scaling and management
   - apiGroups: ["apps"]
@@ -43,11 +41,9 @@ metadata:
   name: {{ include "namada-indexer.fullname" . }}
   labels:
     {{- include "namada-indexer.labels" . | nindent 4 }}
-  {{- if .Values.argocd.deployment }}
   annotations:
-    "argocd.argoproj.io/hook": "PreSync"
-    "argocd.argoproj.io/sync-wave": "-4"
-  {{- end }}
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-9"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/charts/namada-indexer/templates/service-account.yaml b/charts/namada-indexer/templates/service-account.yaml
@@ -7,10 +7,8 @@ metadata:
   labels:
     {{- include "namada-indexer.labels" . | nindent 4 }}
   annotations:
-    {{- if .Values.argocd.deployment }}
-    "argocd.argoproj.io/hook": "PreSync"
-    "argocd.argoproj.io/sync-wave": "-3"
-    {{- end }}
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-weight": "-10"
     {{- with .Values.serviceAccount.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}