SMH job

wandb · Jan 14, 2025 · a4d892e · a4d892e
1 parent 12fc44e
commit a4d892e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 35 deletions.
diff --git a/charts/operator-wandb/Chart.lock b/charts/operator-wandb/Chart.lock
@@ -62,5 +62,5 @@ dependencies:
 - name: wandb-base
   repository: file://../wandb-base
   version: 0.3.0
-digest: sha256:c0bbd695dffdd8b72a2453d6eb113bc048f7c89a31d2b929baa77cf5e77f6d63
-generated: "2025-01-13T12:35:58.707616-06:00"
+digest: sha256:3ee5e247e2de8e6911c512fc5c1ef58a463d545365f1c5d3c0f4be28e2ee29fd
+generated: "2025-01-13T18:23:28.474058-06:00"
diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
@@ -95,7 +95,7 @@ dependencies:
     repository: file://../wandb-base
     version: "*.*.*"
   - name: wandb-base
-    alias: settingsMigrationHook
-    condition: settingsMigrationHook.install
+    alias: settingsMigrationJob
+    condition: settingsMigrationJob.install
     repository: file://../wandb-base
     version: "*.*.*"
diff --git a/charts/operator-wandb/templates/settings-migration-hook.yaml b/charts/operator-wandb/templates/settings-migration-hook.yaml
@@ -1,17 +1,13 @@
-{{- if .Values.settingsMigrationHook.install }}
+{{- if .Values.settingsMigrationJob.install }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-smh-secret
   labels:
     {{- include "wandb.commonLabels" . | nindent 4 }}
-  {{- with .Values.global.settingsMigrationHook.helmHookAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 stringData:
-  SMH_DEBUG: {{ .Values.global.settingsMigrationHook.debug | quote }}
-  SMH_DRY_RUN: {{ .Values.global.settingsMigrationHook.dryRun | quote }}
+  SMH_DEBUG: {{ .Values.global.settingsMigrationJob.debug | quote }}
+  SMH_DRY_RUN: {{ .Values.global.settingsMigrationJob.dryRun | quote }}
   {{- with include "wandb.bucket" . | fromYaml }}
   AWS_REGION: "{{ .region }}"
   AWS_S3_KMS_ID: "{{ .kmsKey }}"

diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -781,7 +781,7 @@ api:
             path: redis_ca.pem
         optional: true
 
-settingsMigrationHook:
+settingsMigrationJob:
   install: false
   service:
     enabled: false
@@ -816,16 +816,9 @@ settingsMigrationHook:
     "{{ .Release.Name }}-bucket-configmap": "configMapRef"
     "{{ .Release.Name }}-bucket": "secretRef"
   kind: Job
-  helmHookAnnotations: &helmHookAnnotations
-    "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation
   jobs:
     smh:
       ttlSecondsAfterFinished: 3600
-      annotations:
-        <<: *helmHookAnnotations
-        # This ensures that the job is created last
-        "helm.sh/hook-weight": "10"
       containers:
         smh:
           image:

diff --git a/charts/wandb-base/templates/role.yaml b/charts/wandb-base/templates/role.yaml
@@ -5,10 +5,6 @@ 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,10 +5,6 @@ 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,15 +5,9 @@ metadata:
   name: {{ include "wandb-base.serviceAccountName" . }}
   labels:
     {{- include "wandb-base.labels" . | nindent 4 }}
-  {{- if or .Values.helmHookAnnotations .Values.serviceAccount.annotations }}
   annotations:
     {{- 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,8 +18,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-helmHookAnnotations: {}
-
 env: {}
 envFrom: {}