Adjust image config values

canonical · Jun 21, 2024 · 570d7bc · 570d7bc
1 parent b751d80
commit 570d7bc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 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: 1.0.0
+version: 0.9.0
 appVersion: 0.8.0
diff --git a/deploy/charts/rawfile-csi/rawfile-csi-0.9.0.tgz b/deploy/charts/rawfile-csi/rawfile-csi-0.9.0.tgz
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: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiResizer.image }}:{{ .Values.csiImages.csiResizer.tag }}
+          image: {{ .Values.images.csiResizer }}
           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: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.nodeDriverRegistrar.image }}:{{ .Values.csiImages.nodeDriverRegistrar.tag }}
+          image: {{ .Values.images.nodeDriverRegistrar }}
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -124,7 +124,7 @@ spec:
               cpu: 10m
               memory: 100Mi
         - name: external-provisioner
-          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiProvisioner.image }}:{{ .Values.csiImages.csiProvisioner.tag }}
+          image: {{ .Values.images.csiProvisioner }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"
@@ -154,7 +154,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: external-snapshotter
-          image: {{ .Values.csiImages.repository }}/{{ .Values.csiImages.csiSnapshotter.image }}:{{ .Values.csiImages.csiSnapshotter.tag }}
+          image: {{ .Values.images.csiSnapshotter }}
           imagePullPolicy: IfNotPresent
           args:
             - "--csi-address=$(ADDRESS)"

diff --git a/deploy/charts/rawfile-csi/values.yaml b/deploy/charts/rawfile-csi/values.yaml
@@ -19,20 +19,11 @@ 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
+images:
+  csiNodeDriverRegistrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+  csiProvisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
+  csiResizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+  csiSnapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
 
 node:
   <<: *defaults