Merge 28d2f5e into a349502

wandb · Jan 29, 2025 · 05c3369 · 05c3369
2 parents a349502 + 28d2f5e
commit 05c3369
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 1 deletion.
diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml
@@ -49,6 +49,7 @@ spec:
       initContainers:
         - name: init-db
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           env:
             - name: MYSQL_PORT
               value: "{{ include "wandb.mysql.port" . }}"
@@ -67,6 +68,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}

diff --git a/charts/operator-wandb/charts/bufstream/templates/deployment.yaml b/charts/operator-wandb/charts/bufstream/templates/deployment.yaml
@@ -47,6 +47,7 @@ spec:
         - name: bufstream
           image: "{{ .Values.bufstream.image.repository }}:{{ .Values.bufstream.image.tag }}"
           imagePullPolicy: {{ .Values.bufstream.image.pullPolicy }}
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- with .Values.bufstream.deployment.command }}
           command: {{ . }}
           {{- end }}

diff --git a/charts/operator-wandb/charts/console/templates/deployment.yaml b/charts/operator-wandb/charts/console/templates/deployment.yaml
@@ -48,6 +48,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           ports:
             - name: http

diff --git a/charts/operator-wandb/charts/executor/templates/deployment.yaml b/charts/operator-wandb/charts/executor/templates/deployment.yaml
@@ -52,6 +52,7 @@ spec:
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}
             - name: {{ include "executor.fullname" . }}-redis-ca

diff --git a/charts/operator-wandb/charts/filestream/templates/deployment.yaml b/charts/operator-wandb/charts/filestream/templates/deployment.yaml
@@ -52,6 +52,7 @@ spec:
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}
             - name: {{ include "filestream.fullname" . }}-redis-ca

diff --git a/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml b/charts/operator-wandb/charts/flat-run-fields-updater/templates/deployment.yaml
@@ -52,6 +52,7 @@ spec:
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}
             - name: {{ include "flat-run-fields-updater.fullname" . }}-redis-ca

diff --git a/charts/operator-wandb/charts/mysql/templates/statefulset.yaml b/charts/operator-wandb/charts/mysql/templates/statefulset.yaml
@@ -32,6 +32,7 @@ spec:
       containers:
         - name: mysql
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.podSecurityContext" .Values.container.securityContext | nindent 10 }}
           ports:
           - name: mysql
@@ -89,4 +90,4 @@ spec:
         - name: data
           persistentVolumeClaim:
             claimName: {{ include "mysql.fullname" . }}-data
-{{- end }}
+{{- end }}
diff --git a/charts/operator-wandb/charts/nginx/templates/deployment.yaml b/charts/operator-wandb/charts/nginx/templates/deployment.yaml
@@ -38,6 +38,7 @@ spec:
       {{- include "nginx.podSecurityContext" .Values.pod.securityContext | nindent 6 }}
       containers:
       - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
         name: {{ .Chart.Name }}
         resources:
           {{- toYaml .Values.resources | nindent 12 }} 

diff --git a/charts/operator-wandb/charts/otel/charts/agent/templates/deployment.yaml b/charts/operator-wandb/charts/otel/charts/agent/templates/deployment.yaml
@@ -46,6 +46,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           command:
             - /otelcol-contrib
             - --config=/conf/config.yaml

diff --git a/charts/operator-wandb/charts/parquet/templates/deployment.yaml b/charts/operator-wandb/charts/parquet/templates/deployment.yaml
@@ -57,6 +57,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}

diff --git a/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/deployment.yaml b/charts/operator-wandb/charts/prometheus/charts/mysql-exporter/templates/deployment.yaml
@@ -44,6 +44,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           args:
             - --mysqld.address=$(MYSQL_HOST):$(MYSQL_PORT)
             - --mysqld.username=$(MYSQL_USER)

diff --git a/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/deployment.yaml b/charts/operator-wandb/charts/prometheus/charts/redis-exporter/templates/deployment.yaml
@@ -44,6 +44,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           volumeMounts:
             {{- if ne (include "wandb.redis.caCert" .) "" }}
             - name: {{ include "app.fullname" . }}-redis-ca

diff --git a/charts/operator-wandb/charts/stackdriver/templates/deployment.yaml b/charts/operator-wandb/charts/stackdriver/templates/deployment.yaml
@@ -39,6 +39,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image:  "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           command: ["stackdriver_exporter"]
           volumeMounts:

diff --git a/charts/operator-wandb/charts/weave-trace/templates/deployment.yaml b/charts/operator-wandb/charts/weave-trace/templates/deployment.yaml
@@ -44,6 +44,7 @@ spec:
       initContainers:
         - name: {{ include "weaveTraceMigrate.fullname" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           command:
             - "python"
             - "migrator.py"
@@ -67,6 +68,7 @@ spec:
       containers:
         - name: {{ include "weaveTrace.fullname" .  }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           ports:
             - name: http

diff --git a/charts/operator-wandb/charts/weave/templates/deployment.yaml b/charts/operator-wandb/charts/weave/templates/deployment.yaml
@@ -46,6 +46,7 @@ spec:
       containers:
         - name: {{ include "weave.fullname" .  }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           ports:
             - name: http
@@ -91,6 +92,7 @@ spec:
 
         - name: {{ include "weave.fullname" . }}-cache-clear
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           command: ["python", "-m", "weave.clear_cache"]
           env:

diff --git a/charts/operator-wandb/charts/yace/templates/deployment.yaml b/charts/operator-wandb/charts/yace/templates/deployment.yaml
@@ -45,6 +45,7 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullSecrets: {{- include "wandb.imagePullSecrets" . }}
           {{- include "wandb.containerSecurityContext" .Values.container.securityContext | nindent 10 }}
           command:
             - yace

diff --git a/charts/operator-wandb/templates/_helpers.tpl b/charts/operator-wandb/templates/_helpers.tpl
@@ -60,3 +60,12 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the imagePullSecret to use
+*/}}
+{{- define "wandb.imagePullSecrets" -}}
+{{- if .Values.global.imagePullSecrets }}
+{{- toYaml .Values.global.imagePullSecrets | nindent 6 }}
+{{- end }}
+{{- end }}
diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml
@@ -18,6 +18,8 @@ global:
     name: ""
     key: ""
 
+  imgaePullSecrets: []
+
   cloudProvider: ""
 
   storageClass: ""

diff --git a/charts/operator/templates/deployment.yaml b/charts/operator/templates/deployment.yaml
@@ -33,6 +33,9 @@ spec:
         {{- if .Values.image.pullPolicy }}
         imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
         {{- end }}
+        {{- if .Values.image.pullSecrets }}
+        imagePullSecrets: {{- toYaml .Values.image.pullSecrets | nindent 8 }}
+        {{- end }}
         env:
         {{- if .Values.extraEnv }}
         {{- toYaml .Values.extraEnv | nindent 8 }}