Update helm charts to handle rockcraft and a different storage.path (#2)

* Update helm charts to handle rockcraft and an alternate controller.storage.path * disable storageCapacity for now * Address review comments * Address review comments again
canonical · Feb 2, 2024 · e3ea721 · e3ea721
1 parent 32420d3
commit e3ea721
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/deploy/charts/rawfile-csi/templates/00-driver.yaml b/deploy/charts/rawfile-csi/templates/00-driver.yaml
@@ -6,6 +6,6 @@ spec:
   attachRequired: false
   podInfoOnMount: true
   fsGroupPolicy: File
-  storageCapacity: true
+  storageCapacity: false  # TODO: reenable once switch from using v1beta1 apis
   volumeLifecycleModes:
     - Persistent
diff --git a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
@@ -34,16 +34,21 @@ spec:
           operator: Equal
           value: "true"
           effect: NoSchedule
+        - key: "node-role.kubernetes.io/control-plane"
+          operator: Equal
+          value: "true"
+          effect: NoSchedule
       volumes:
         - name: socket-dir
           emptyDir: {}
       containers:
         - name: csi-driver
           image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
+          {{- if .Values.controller.csiDriverArgs }}
           args:
-            - csi-driver
-            - --disable-metrics
+          {{- .Values.controller.csiDriverArgs | toYaml | nindent 10 }}
+          {{- end }}
           env:
             - name: PROVISIONER_NAME
               value: "{{ .Values.provisionerName }}"

diff --git a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
@@ -51,7 +51,7 @@ spec:
             type: DirectoryOrCreate
         - name: data-dir
           hostPath:
-            path: /var/csi/rawfile
+            path: {{ .Values.node.storage.path | quote }}
             type: DirectoryOrCreate
       containers:
         - name: csi-driver

diff --git a/deploy/charts/rawfile-csi/values.yaml b/deploy/charts/rawfile-csi/values.yaml
@@ -15,9 +15,14 @@ defaults: &defaults
 
 controller:
   <<: *defaults
+  csiDriverArgs:
+    - csi-driver
+    - --disable-metrics
 
 node:
   <<: *defaults
+  storage:
+    path: /var/csi/rawfile
   metrics:
     enabled: false