fix: Enable airgapped and customCACerts to be configured at the same …

…time (#216)
wandb · Sep 12, 2024 · 69d5b27 · 69d5b27
1 parent 4ddb6ce
commit 69d5b27
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/charts/operator/Chart.yaml b/charts/operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: operator
 description: A Helm chart for Weights & Biases operator
 type: application
-version: 1.3.2
+version: 1.3.3
 appVersion: "1.0.0"
 maintainers:
   - name: wandb

diff --git a/charts/operator/templates/deployment.yaml b/charts/operator/templates/deployment.yaml
@@ -64,31 +64,33 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         resources: {{- toYaml .Values.resources | nindent 10 }}
-        {{- if .Values.airgapped }}
-        volumeMounts:
-        - name: {{ include "name" . }}-charts
-          mountPath: /charts
-        {{- end }}
-        {{- if .Values.customCACerts }}
-        {{- range $index, $v := .Values.customCACerts }}
+        {{- if or .Values.airgapped .Values.customCACerts }}
         volumeMounts:
+          {{- if or .Values.airgapped }}
+          - name: {{ include "name" . }}-charts
+            mountPath: /charts
+          {{- end }}
+          {{- if .Values.customCACerts }}
+            {{- range $index, $v := .Values.customCACerts }}
           - name: wandb-ca-certs
             mountPath: /certs/customCA{{$index}}.crt
             subPath: customCA{{$index}}.crt
+            {{- end }}
+          {{- end }}
         {{- end }}
-        {{- end }}
-      {{- if .Values.airgapped }}
+      {{- if or .Values.airgapped .Values.customCACerts }}
       volumes:
-      - name: {{ include "name" . }}-charts
-        configMap:
-          name: {{ include "name" . }}-charts
-          optional: true
-      {{- end }}
-      {{- if .Values.customCACerts }}
-      volumes:
-      - name: wandb-ca-certs
-        configMap:
-          name: {{ include "operator.fullname" . }}-ca-certs
+        {{- if .Values.airgapped }}
+        - name: {{ include "name" . }}-charts
+          configMap:
+            name: {{ include "name" . }}-charts
+            optional: true
+        {{- end }}
+        {{- if .Values.customCACerts }}
+        - name: wandb-ca-certs
+          configMap:
+            name: {{ include "operator.fullname" . }}-ca-certs
+        {{- end }}
       {{- end }}
       serviceAccountName: {{ include "manager.serviceAccount.name" . }}
       terminationGracePeriodSeconds: 10