Merge pull request #401 from gliptak/helm1

Allow override for csi-provisioner image
kubernetes-sigs · Jan 9, 2020 · 9ca95ce · 9ca95ce
2 parents 86de776 + f9e6b91
commit 9ca95ce
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/aws-ebs-csi-driver/templates/manifest.yaml b/aws-ebs-csi-driver/templates/manifest.yaml
@@ -248,7 +248,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.3.0
+          image: "{{ .Values.sidecars.provisionerImage.repository }}:{{ .Values.sidecars.provisionerImage.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
@@ -264,7 +264,7 @@ spec:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.2.0
+          image: "{{ .Values.sidecars.attacherImage.repository }}:{{ .Values.sidecars.attacherImage.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
@@ -276,7 +276,7 @@ spec:
               mountPath: /var/lib/csi/sockets/pluginproxy/
         {{- if .Values.enableVolumeSnapshot }}
         - name: csi-snapshotter
-          image: quay.io/k8scsi/csi-snapshotter:v1.1.0
+          image: "{{ .Values.sidecars.snapshotterImage.repository }}:{{ .Values.sidecars.snapshotterImage.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --connection-timeout=15s
@@ -289,7 +289,7 @@ spec:
         {{- end }}
         {{- if .Values.enableVolumeResizing }}
         - name: csi-resizer
-          image: quay.io/k8scsi/csi-resizer:v0.2.0
+          image: "{{ .Values.sidecars.resizerImage.repository }}:{{ .Values.sidecars.resizerImage.tag }}"
           imagePullPolicy: Always
           args:
             - --csi-address=$(ADDRESS)
@@ -302,7 +302,7 @@ spec:
               mountPath: /var/lib/csi/sockets/pluginproxy/
         {{- end }}
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: "{{ .Values.sidecars.livenessProbeImage.repository }}:{{ .Values.sidecars.livenessProbeImage.tag }}"
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:
@@ -371,7 +371,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: "{{ .Values.sidecars.nodeDriverRegistrarImage.repository }}:{{ .Values.sidecars.nodeDriverRegistrarImage.tag }}"
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -391,7 +391,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: "{{ .Values.sidecars.livenessProbeImage.repository }}:{{ .Values.sidecars.livenessProbeImage.tag }}"
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:

diff --git a/aws-ebs-csi-driver/values.yaml b/aws-ebs-csi-driver/values.yaml
@@ -9,6 +9,26 @@ image:
   tag: "v0.4.0"
   pullPolicy: IfNotPresent
 
+sidecars:
+  provisionerImage:
+    repository: quay.io/k8scsi/csi-provisioner
+    tag: "v1.3.0"
+  attacherImage:
+    repository: quay.io/k8scsi/csi-attacher
+    tag: "v1.2.0"
+  snapshotterImage:
+    repository: quay.io/k8scsi/csi-snapshotter
+    tag: "v1.1.0"
+  livenessProbeImage:
+    repository: quay.io/k8scsi/livenessprobe
+    tag: "v1.1.0"
+  resizerImage:
+    repository: quay.io/k8scsi/csi-resizer
+    tag: "v0.2.0"
+  nodeDriverRegistrarImage:
+    repository: quay.io/k8scsi/csi-node-driver-registrar
+    tag: "v1.1.0"
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""