Skip to content

Commit 8621a19

Browse files
atyeKshitijaKakdecoulofalankar-vermasuryagupta4
authored
[charts/csi-unity] Centralize all images to one place (#312)
* PowerFlex v2.8.0 release (#250) * Centralized images * Adding CSI Powerstore driver’s effective pod security profile for supporting ephemeral volumes as part of Openshift 4.13 support (#261) Co-authored-by: Surya Gupta <109594002+suryagupta4@users.noreply.github.com> * removed externalAccess from powerflex manifests. (#283) * Revert "Adding CSI Powerstore driver’s effective pod security profile for supporting ephemeral volumes as part of Openshift 4.13 support (#261)" (#284) This reverts commit c1dd93b. * Bump sidecars versions * Bump up observability version for CSM 1.9 (#314) * Bump-up observability version for CSM 1.9 * add patch verb to powerscale * Add codeowners * update attacher sidecar for powerflex and powerstore. (#315) * [charts/csi-powerstore] Centralize all images to one place (#310) * One place to configure all images * Use latest versions of CSI official sidecars * Set Default container to the driver and avoid podmon logs by default * Fix annotation and remove driverVersion * [charts/csi-powerflex] Centralize all images to one place #263 (#311) * Centralize all images to one place * Use latest CSI sidecars and default container to driver * Add default annotation * Use bleeding edge helm validation action to workaround cosign issue * [charts/csi-powermax] Container images in one place (#309) * One place to configure all images * Fix the csi provisioner to use the full name * Use latest versions of CSI official sidecars * remove duplicate podmon image --------- Co-authored-by: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Co-authored-by: coulof <florian.coulombel@dell.com> Co-authored-by: alankar-verma <125348121+alankar-verma@users.noreply.github.com> Co-authored-by: Surya Gupta <109594002+suryagupta4@users.noreply.github.com> Co-authored-by: VamsiSiddu-7 <103578883+VamsiSiddu-7@users.noreply.github.com> Co-authored-by: coulof <49235405+coulof@users.noreply.github.com> Co-authored-by: panigs7 <92028646+panigs7@users.noreply.github.com>
1 parent 0bc8c31 commit 8621a19

File tree

4 files changed

+24
-66
lines changed

4 files changed

+24
-66
lines changed

‎charts/csi-unity/templates/_helpers.tpl

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,3 @@
1-
{{/*
2-
Return the appropriate sidecar images based on k8s version
3-
*/}}
4-
{{- define "csi-unity.attacherImage" -}}
5-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
6-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
7-
{{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}}
8-
{{- end -}}
9-
{{- end -}}
10-
{{- end -}}
11-
12-
{{- define "csi-unity.provisionerImage" -}}
13-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
14-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
15-
{{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}}
16-
{{- end -}}
17-
{{- end -}}
18-
{{- end -}}
19-
20-
{{- define "csi-unity.snapshotterImage" -}}
21-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
22-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
23-
{{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}}
24-
{{- end -}}
25-
{{- end -}}
26-
{{- end -}}
27-
28-
{{- define "csi-unity.resizerImage" -}}
29-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
30-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
31-
{{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}}
32-
{{- end -}}
33-
{{- end -}}
34-
{{- end -}}
35-
36-
{{- define "csi-unity.registrarImage" -}}
37-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
38-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
39-
{{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}}
40-
{{- end -}}
41-
{{- end -}}
42-
{{- end -}}
43-
44-
{{- define "csi-unity.healthmonitorImage" -}}
45-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
46-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}}
47-
{{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}}
48-
{{- end -}}
49-
{{- end -}}
50-
{{- end -}}
51-
521
{{/*
532
Return true if storage capacity tracking is enabled and is supported based on k8s version
543
*/}}

‎charts/csi-unity/templates/controller.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ spec:
152152
{{- if .Values.podmon.enabled }}
153153
- name: podmon
154154
imagePullPolicy: {{ .Values.imagePullPolicy }}
155-
image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
155+
image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
156156
args:
157157
{{- toYaml .Values.podmon.controller.args | nindent 12 }}
158158
env:
@@ -175,7 +175,7 @@ spec:
175175
mountPath: /unity-config
176176
{{- end }}
177177
- name: attacher
178-
image: {{ required "Must provide the CSI attacher container image." ( include "csi-unity.attacherImage" . ) }}
178+
image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
179179
args:
180180
- "--csi-address=$(ADDRESS)"
181181
- "--v=5"
@@ -187,7 +187,7 @@ spec:
187187
- name: socket-dir
188188
mountPath: /var/run/csi
189189
- name: provisioner
190-
image: {{ required "Must provide the CSI provisioner container image." ( include "csi-unity.provisionerImage" . ) }}
190+
image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
191191
args:
192192
- "--csi-address=$(ADDRESS)"
193193
- "--volume-name-prefix={{ required "Must provide a Volume Name Prefix." .Values.controller.volumeNamePrefix }}"
@@ -220,7 +220,7 @@ spec:
220220
{{- if hasKey .Values.controller "snapshot" }}
221221
{{- if eq .Values.controller.snapshot.enabled true }}
222222
- name: snapshotter
223-
image: {{ required "Must provide the CSI snapshotter container image. " ( include "csi-unity.snapshotterImage" . ) }}
223+
image: {{ required "Must provide the CSI snapshotter container image. " .Values.images.snapshotter }}
224224
args:
225225
- "--csi-address=$(ADDRESS)"
226226
- "--snapshot-name-prefix={{ required "Must privided a Snapshot Name Prefix" .Values.controller.snapshot.snapNamePrefix }}"
@@ -239,7 +239,7 @@ spec:
239239
{{- if hasKey .Values.controller "resizer" }}
240240
{{- if eq .Values.controller.resizer.enabled true }}
241241
- name: resizer
242-
image: {{ required "Must provide the CSI resizer container image." ( include "csi-unity.resizerImage" . ) }}
242+
image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
243243
args:
244244
- "--csi-address=$(ADDRESS)"
245245
- "--v=5"
@@ -255,7 +255,7 @@ spec:
255255
{{- if hasKey .Values.controller "healthMonitor" }}
256256
{{- if eq .Values.controller.healthMonitor.enabled true }}
257257
- name: csi-external-health-monitor-controller
258-
image: {{ required "Must provide the CSI external health monitor image." ( include "csi-unity.healthmonitorImage" . ) }}
258+
image: {{ required "Must provide the CSI external health monitor image." .Values.images.healthmonitor }}
259259
imagePullPolicy: {{ .Values.imagePullPolicy }}
260260
args:
261261
- "--v=5"
@@ -274,7 +274,7 @@ spec:
274274
{{- end }}
275275
{{- end }}
276276
- name: driver
277-
image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}"
277+
image: "{{ required "Must provide the driver image repository." .Values.images.driver }}"
278278
args:
279279
- "--driver-name=csi-unity.dellemc.com"
280280
- "--driver-config=/unity-config/driver-config-params.yaml"

‎charts/csi-unity/templates/node.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ spec:
9797
add: ["SYS_ADMIN"]
9898
allowPrivilegeEscalation: true
9999
imagePullPolicy: {{ .Values.imagePullPolicy }}
100-
image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
100+
image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
101101
args:
102102
{{- toYaml .Values.podmon.node.args | nindent 12 }}
103103
env:
@@ -145,7 +145,7 @@ spec:
145145
capabilities:
146146
add: ["SYS_ADMIN"]
147147
allowPrivilegeEscalation: true
148-
image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}"
148+
image: "{{ required "Must provide the driver image repository." .Values.images.driver }}"
149149
args:
150150
- "--driver-name=csi-unity.dellemc.com"
151151
- "--driver-config=/unity-config/driver-config-params.yaml"
@@ -204,7 +204,7 @@ spec:
204204
- name: unity-secret
205205
mountPath: /unity-secret
206206
- name: registrar
207-
image: {{ required "Must provide the CSI registrar container image." ( include "csi-unity.registrarImage" . ) }}
207+
image: {{ required "Must provide the CSI registrar container image." .Values.images.registrar }}
208208
args:
209209
- "--v=5"
210210
- "--csi-address=$(ADDRESS)"

‎charts/csi-unity/values.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66
# Examples : "v2.8.0" , "nightly"
77
version: "v2.8.0"
88

9+
images:
10+
# "driver" defines the container image, used for the driver container.
11+
driver: dellemc/csi-unity:v2.8.0
12+
# CSI sidecars
13+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
14+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
15+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
16+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
17+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
18+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
19+
20+
# CSM sidecars
21+
podmon: dellemc/podmon:v1.7.0
22+
923
# LogLevel is used to set the logging level of the driver.
1024
# Allowed values: "error", "warn"/"warning", "info", "debug"
1125
# Default value: "info"
@@ -194,7 +208,6 @@ podmon:
194208
# allowed values - string
195209
# default value : None
196210
# Example : "podman:latest", "pod:latest"
197-
image: dellemc/podmon:v1.7.0
198211
controller:
199212
args:
200213
- "--csisock=unix:/var/run/csi/csi.sock"
@@ -255,7 +268,3 @@ storageCapacity:
255268
# Allowed values: 1m,2m,3m,...,10m,...,60m etc
256269
# Default value: 5m
257270
pollInterval: 5m
258-
259-
images:
260-
# "driver" defines the container image, used for the driver container.
261-
driverRepository: dellemc

0 commit comments

Comments
 (0)