[charts/bigdata-notebook-service] Fix volumes in notebook-service whe…

…n telemetry is enabled
spotinst · Apr 11, 2024 · 3800b69 · 3800b69
1 parent d1ef66e
commit 3800b69
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-notebook-service
 description: A Helm chart for the Spot Big Data Notebook Service
 type: application
-version: 0.2.5
+version: 0.2.6
 appVersion: 0.1.16
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png

diff --git a/charts/bigdata-notebook-service/templates/deployment.yaml b/charts/bigdata-notebook-service/templates/deployment.yaml
@@ -32,6 +32,23 @@ spec:
       - name: session-storage
         persistentVolumeClaim:
           claimName: {{ .Values.sessionStoragePvcName }}
+      {{- if .Values.telemetry.enabled }}
+      - name: telementry-global-config
+        configMap:
+          name: bigdata-common-telemetry-fluentbit-cm
+      - name: telementry-custom-config
+        configMap:
+          name: {{ include "bigdata-notebook-service.fullname" . }}-telemetry-cm
+      - name: varlog
+        hostPath:
+          path: /var/log/
+      - name: varlibdockercontainers
+        hostPath:
+          path: /var/lib/docker/containers
+      - name: telemetry-aws-credentials
+        secret:
+          secretName: spot-bigdata-telemetry-creds
+      {{- end }}
       # This initContainers section should not be needed if the
       # securityContext.fsGroup entry above wasn't ignored, but unfortunately
       # it is ignored for NFS volumes:
@@ -185,22 +202,6 @@ spec:
               mountPath: /var/lib/docker/containers
             - name: telemetry-aws-credentials
               mountPath: /root/.aws
-      volumes:
-        - name: telementry-global-config
-          configMap:
-            name: bigdata-common-telemetry-fluentbit-cm
-        - name: telementry-custom-config
-          configMap:
-            name: {{ include "bigdata-notebook-service.fullname" . }}-telemetry-cm
-        - name: varlog
-          hostPath:
-            path: /var/log/
-        - name: varlibdockercontainers
-          hostPath:
-            path: /var/lib/docker/containers
-        - name: telemetry-aws-credentials
-          secret:
-            secretName: spot-bigdata-telemetry-creds
     {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector: