fix the annotations

wandb · Jan 11, 2025 · 2bc93f2 · 2bc93f2
1 parent 5d73431
commit 2bc93f2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -798,6 +798,9 @@ settingsMigrationHook:
     "{{ .Release.Name }}-bucket-configmap": "configMapRef"
     "{{ .Release.Name }}-bucket": "secretRef"
   kind: Job
+  helmHookAnnotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation
   jobs:
     smh:
       ttlSecondsAfterFinished: 3600

diff --git a/charts/wandb-base/templates/role.yaml b/charts/wandb-base/templates/role.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ include "wandb-base.fullname" .}}
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
+  {{- with .Values.helmHookAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 rules:
     {{- with .Values.role.rules }}
       {{- toYaml . | nindent 4 }}

diff --git a/charts/wandb-base/templates/rolebinding.yaml b/charts/wandb-base/templates/rolebinding.yaml
@@ -5,6 +5,10 @@ metadata:
   name: {{ include "wandb-base.fullname" . }}
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
+  {{- with .Values.helmHookAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 subjects:
   - kind: ServiceAccount
     name: {{ include "wandb-base.serviceAccountName" . }}

diff --git a/charts/wandb-base/templates/serviceaccount.yaml b/charts/wandb-base/templates/serviceaccount.yaml
@@ -5,9 +5,15 @@ metadata:
   name: {{ include "wandb-base.serviceAccountName" . }}
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
+  {{- if or .Values.helmHookAnnotations .Values.serviceAccount.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- with .Values.serviceAccount.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+    {{- with .Values.helmHookAnnotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
+
 automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
 {{- end }}
diff --git a/charts/wandb-base/values.yaml b/charts/wandb-base/values.yaml
@@ -18,6 +18,8 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+helmHookAnnotations: {}
+
 env: {}
 envFrom: {}