diff --git a/charts/operator-wandb/Chart.yaml b/charts/operator-wandb/Chart.yaml index 7dd6958c..95c3a8aa 100644 --- 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.15.5 +version: 0.15.6 appVersion: 1.0.0 icon: https://wandb.ai/logo.svg diff --git a/charts/operator-wandb/charts/app/templates/configmap.yaml b/charts/operator-wandb/charts/app/templates/configmap.yaml new file mode 100644 index 00000000..5c90c705 --- /dev/null +++ b/charts/operator-wandb/charts/app/templates/configmap.yaml @@ -0,0 +1,15 @@ +{{- if .Values.global.customCACerts }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "wandb.fullname" . }}-ca-certs + labels: + {{- include "wandb.labels" . | nindent 4 }} +data: + {{- range $index, $pem := .Values.global.customCACerts }} + customCA{{$index}}.crt: |- + {{- range splitList "\n" $pem }} + {{ . }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/operator-wandb/charts/app/templates/deployment.yaml b/charts/operator-wandb/charts/app/templates/deployment.yaml index 5daf17a6..72e4ce19 100644 --- a/charts/operator-wandb/charts/app/templates/deployment.yaml +++ b/charts/operator-wandb/charts/app/templates/deployment.yaml @@ -73,6 +73,11 @@ spec: mountPath: /etc/ssl/certs/redis_ca.pem subPath: redis_ca.pem {{- end }} + {{- range $index, $v := .Values.customCACerts }} + - name: wandb-ca-certs + mountPath: /usr/local/share/ca-certificates/customCA{{$index}}.crt + subPath: customCA{{$index}}.crt + {{- end }} ports: - name: http containerPort: 8080 @@ -281,4 +286,9 @@ spec: - key: REDIS_CA_CERT path: redis_ca.pem {{- end }} + {{- if .Values.customCACerts }} + - name: wandb-ca-certs + configMap: + name: {{ include "wandb.fullname" . }}-ca-certs + {{- end }} {{- end }} diff --git a/charts/operator-wandb/values.yaml b/charts/operator-wandb/values.yaml index 9b9a54a2..a10a8af1 100644 --- a/charts/operator-wandb/values.yaml +++ b/charts/operator-wandb/values.yaml @@ -115,6 +115,8 @@ global: # If the topic already exists then changing the number of partitions is not possible. runUpdatesShadowNumPartitions: 1 + customCACerts: [] + weave-trace: enabled: false