Add config values for CSI images

canonical · Jun 20, 2024 · b751d80 · b751d80
1 parent d2eb727
commit b751d80
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/deploy/charts/rawfile-csi/Chart.yaml b/deploy/charts/rawfile-csi/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: rawfile-csi
 description: RawFile Driver Container Storage Interface
 type: application
-version: 0.8.0
+version: 1.0.0
 appVersion: 0.8.0
diff --git a/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-controller-plugin.yaml
@@ -69,7 +69,7 @@ spec:
           resources:
             {{- toYaml .Values.controller.resources | nindent 12 }}
         - name: external-resizer
-          image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
+          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiResizer.image }}:{{ .Values.csiImages.csiResizer.tag }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"

diff --git a/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml b/deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
@@ -91,7 +91,7 @@ spec:
           resources:
             {{- toYaml .Values.node.resources | nindent 12 }}
         - name: node-driver-registrar
-          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.10.0
+          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.nodeDriverRegistrar.image }}:{{ .Values.csiImages.nodeDriverRegistrar.tag }}
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -124,7 +124,7 @@ spec:
               cpu: 10m
               memory: 100Mi
         - name: external-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v3.4.1
+          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiProvisioner.image }}:{{ .Values.csiImages.csiProvisioner.tag }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -154,7 +154,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: external-snapshotter
-          image: k8s.gcr.io/sig-storage/csi-snapshotter:v6.2.1
+          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiSnapshotter.image }}:{{ .Values.csiImages.csiSnapshotter.tag }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"

diff --git a/deploy/charts/rawfile-csi/templates/02-storageclass.yaml b/deploy/charts/rawfile-csi/templates/02-storageclass.yaml
@@ -4,9 +4,9 @@ kind: StorageClass
 metadata:
   name: {{ .Values.storageClass.name }}
   annotations:
-    storageclass.kubernetes.io/is-default-class: {{ .Values.storageClass.isDefault }}
+    storageclass.kubernetes.io/is-default-class: {{ .Values.storageClass.isDefault | quote }}
 provisioner: rawfile.csi.openebs.io
 reclaimPolicy: {{ .Values.storageClass.reclaimPolicy }}
 volumeBindingMode: {{ .Values.storageClass.volumeBindingMode }}
 allowVolumeExpansion: true
-{{- end }}
+{{- end }}
diff --git a/deploy/charts/rawfile-csi/values.yaml b/deploy/charts/rawfile-csi/values.yaml
@@ -19,6 +19,21 @@ controller:
     - csi-driver
     - --disable-metrics
 
+csiImages:
+  repository: registry.k8s.io/sig-storage
+  csiProvisioner:
+    image: csi-provisioner
+    tag: v5.0.1
+  csiResizer:
+    image: csi-resizer
+    tag: v1.11.1
+  csiSnapshotter:
+    image: csi-snapshotter
+    tag: v8.0.1
+  nodeDriverRegistrar:
+    image: csi-node-driver-registrar
+    tag: v2.10.1
+
 node:
   <<: *defaults
   storage: