Skip to content

Commit ee2e94d

Browse files
authored
deploy: set plugin image tags from Chart AppVersion (#16)
* deploy: plugin image tags default to pull from Chart AppVersion * fix csi-node-driver-registrar version
1 parent 55f404b commit ee2e94d

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

deployments/helm/eosxd-csi/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: "latest"
2+
appVersion: "v1.4.0"
33
description: A Helm chart to deploy the eosxd-CSI Plugin
44
name: eosxd-csi
5-
version: "1.0.0"
5+
version: 1.4.0

deployments/helm/eosxd-csi/templates/controllerplugin-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccount: {{ include "eosxd-csi.serviceAccountName.controllerplugin" . }}
2222
containers:
2323
- name: provisioner
24-
image: {{ .Values.controllerplugin.provisioner.image.repository }}:{{ .Values.controllerplugin.provisioner.image.tag }}
24+
image: {{ .Values.controllerplugin.provisioner.image.repository }}:{{ .Values.controllerplugin.provisioner.image.tag | default .Chart.AppVersion }}
2525
imagePullPolicy: {{ .Values.controllerplugin.provisioner.image.pullPolicy }}
2626
args:
2727
- -v={{ .Values.logVerbosityLevel }}
@@ -37,7 +37,7 @@ spec:
3737
resources: {{ toYaml . | nindent 12 }}
3838
{{- end }}
3939
- name: controllerplugin
40-
image: {{ .Values.controllerplugin.plugin.image.repository }}:{{ .Values.controllerplugin.plugin.image.tag }}
40+
image: {{ .Values.controllerplugin.plugin.image.repository }}:{{ .Values.controllerplugin.plugin.image.tag | default .Chart.AppVersion }}
4141
imagePullPolicy: {{ .Values.controllerplugin.plugin.image.pullPolicy }}
4242
command: [/csi-driver]
4343
args:

deployments/helm/eosxd-csi/templates/nodeplugin-daemonset.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
resources: {{ toYaml . | nindent 12 }}
4646
{{- end }}
4747
- name: nodeplugin
48-
image: {{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}
48+
image: {{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag | default .Chart.AppVersion }}
4949
command: [/csi-driver]
5050
args:
5151
- -v={{ .Values.logVerbosityLevel }}
@@ -92,7 +92,7 @@ spec:
9292
resources: {{ toYaml . | nindent 12 }}
9393
{{- end }}
9494
- name: automount
95-
image: {{ .Values.nodeplugin.automount.image.repository }}:{{ .Values.nodeplugin.automount.image.tag }}
95+
image: {{ .Values.nodeplugin.automount.image.repository }}:{{ .Values.nodeplugin.automount.image.tag | default .Chart.AppVersion }}
9696
command: [/automount-runner]
9797
args:
9898
- -v={{ .Values.logVerbosityLevel }}
@@ -121,7 +121,7 @@ spec:
121121
resources: {{ toYaml . | nindent 12 }}
122122
{{- end }}
123123
- name: mountreconciler
124-
image: {{ .Values.nodeplugin.mountreconciler.image.repository }}:{{ .Values.nodeplugin.mountreconciler.image.tag }}
124+
image: {{ .Values.nodeplugin.mountreconciler.image.repository }}:{{ .Values.nodeplugin.mountreconciler.image.tag | default .Chart.AppVersion }}
125125
command: [/mount-reconciler]
126126
args:
127127
- -v={{ .Values.logVerbosityLevel }}

deployments/helm/eosxd-csi/values.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ nodeplugin:
192192
plugin:
193193
image:
194194
repository: registry.cern.ch/kubernetes/eosxd-csi
195-
tag: v1.1.1
195+
tag: "" # If no tag specified default to Chart AppVersion.
196196
pullPolicy: IfNotPresent
197197
resources: {}
198198
# Extra volume mounts to append to nodeplugin's
@@ -205,7 +205,7 @@ nodeplugin:
205205
automount:
206206
image:
207207
repository: registry.cern.ch/kubernetes/eosxd-csi
208-
tag: v1.1.1
208+
tag: "" # If no tag specified default to Chart AppVersion.
209209
pullPolicy: IfNotPresent
210210
resources: {}
211211
# Extra volume mounts to append to nodeplugin's
@@ -226,7 +226,7 @@ nodeplugin:
226226
mountreconciler:
227227
image:
228228
repository: registry.cern.ch/kubernetes/eosxd-csi
229-
tag: v1.1.1
229+
tag: "" # If no tag specified default to Chart AppVersion.
230230
pullPolicy: IfNotPresent
231231
resources: {}
232232
# Extra volume mounts to append to nodeplugin's
@@ -239,7 +239,7 @@ nodeplugin:
239239
registrar:
240240
image:
241241
repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
242-
tag: v2.5.1
242+
tag: v2.10.1
243243
pullPolicy: IfNotPresent
244244
resources: {}
245245

@@ -300,7 +300,7 @@ controllerplugin:
300300
plugin:
301301
image:
302302
repository: registry.cern.ch/kubernetes/eosxd-csi
303-
tag: v1.1.1
303+
tag: "" # If no tag specified default to Chart AppVersion.
304304
pullPolicy: IfNotPresent
305305
resources: {}
306306
extraVolumeMounts:
@@ -311,7 +311,7 @@ controllerplugin:
311311
provisioner:
312312
image:
313313
repository: k8s.gcr.io/sig-storage/csi-provisioner
314-
tag: v3.2.1
314+
tag: v4.0.1
315315
pullPolicy: IfNotPresent
316316
resources: {}
317317

0 commit comments

Comments
 (0)