fix: Normalize the service account create logic for all wandb applica…

…tions (#178)
wandb · Jul 18, 2024 · 314ff0e · 314ff0e
1 parent e521ab8
commit 314ff0e
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 4 deletions.
diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: operator-wandb
 description: A Helm chart for deploying W&B to Kubernetes
 type: application
-version: 0.14.17
+version: 0.15.0
 appVersion: 1.0.0
 icon: https://wandb.ai/logo.svg
 

diff --git a/charts/operator-wandb/charts/app/templates/serviceaccount.yaml b/charts/operator-wandb/charts/app/templates/serviceaccount.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -14,3 +15,4 @@ metadata:
     {{- if .Values.serviceAccount.annotations -}}
     {{-   toYaml .Values.serviceAccount.annotations | nindent 4 }}
     {{- end }}
+  {{- end }}
diff --git a/charts/operator-wandb/charts/app/values.yaml b/charts/operator-wandb/charts/app/values.yaml
@@ -53,6 +53,7 @@ resources:
 
 serviceAccount:
   create: true
+  annotations: {}
 
 role: {}
 roleBinding: {}
diff --git a/charts/operator-wandb/charts/console/templates/deployment.yaml b/charts/operator-wandb/charts/console/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
         {{-   toYaml .Values.pod.annotations | nindent 4 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ include "console.fullname" . }}
+      serviceAccountName: {{ include "console.serviceAccountName" . }}
       {{- if .tolerations }}
       tolerations:
         {{- toYaml .tolerations | nindent 8 }}

diff --git a/charts/operator-wandb/charts/console/templates/serviceaccount.yaml b/charts/operator-wandb/charts/console/templates/serviceaccount.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -14,3 +15,4 @@ metadata:
     {{- if .Values.serviceAccount.annotations -}}
     {{-   toYaml .Values.serviceAccount.annotations | nindent 4 }}
     {{- end }}
+{{- end }}
diff --git a/charts/operator-wandb/charts/console/values.yaml b/charts/operator-wandb/charts/console/values.yaml
@@ -21,7 +21,9 @@ extraCors: []
 common:
   labels: {}
 deployment: {}
-serviceAccount: {}
+serviceAccount:
+  create: true
+  annotations: {}
 clusterRole: {}
 
 pod:

diff --git a/charts/operator-wandb/charts/flat-run-fields-updater/templates/serviceaccount.yaml b/charts/operator-wandb/charts/flat-run-fields-updater/templates/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "flat-run-fields-updater.serviceAccountName" . }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "wandb.commonLabels" . | nindent 4 }}
     {{- include "flat-run-fields-updater.commonLabels" . | nindent 4 }}

diff --git a/charts/operator-wandb/charts/parquet/templates/deployment.yaml b/charts/operator-wandb/charts/parquet/templates/deployment.yaml
@@ -140,6 +140,7 @@ spec:
 
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      serviceAccountName: {{ include "parquet.serviceAccountName" . }}
       volumes:
         {{- if ne (include "wandb.redis.caCert" .) "" }}
         - name: {{ include "parquet.fullname" . }}-redis-ca

diff --git a/charts/operator-wandb/charts/parquet/templates/serviceaccount.yaml b/charts/operator-wandb/charts/parquet/templates/serviceaccount.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "parquet.serviceAccountName" . }}
+  labels:
+    {{- include "wandb.commonLabels" . | nindent 4 }}
+    {{- include "parquet.commonLabels" . | nindent 4 }}
+    {{- include "parquet.labels" . | nindent 4 }}
+    {{- if .Values.serviceAccount.labels -}}
+    {{-   toYaml .Values.serviceAccount.labels | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.serviceAccount.annotations -}}
+    {{-   toYaml .Values.serviceAccount.annotations | nindent 4 }}
+    {{- end }}
+{{- end }}
diff --git a/charts/operator-wandb/charts/parquet/values.yaml b/charts/operator-wandb/charts/parquet/values.yaml
@@ -22,7 +22,9 @@ cronJob:
   exportHistoryToParquet:
     enabled: false
     schedule: "11 * * * *"
-serviceAccount: {}
+serviceAccount:
+  create: true
+  annotations: {}
 clusterRole: {}
 
 service: