Skip to content

Commit 7e9abd6

Browse files
atyeKshitijaKakdecoulofkhareRajshreesuryagupta4
authored and
tdawe
committed
[charts/powerscale] Powerscale driver images in one place (#313)
* PowerFlex v2.8.0 release (#250) * PowerFlex SDC updated (#251) * Centralized images * minor typo fixed (#258) * powerstore v2.8.0 & k8s 1.28 support (#262) * update auth to 1.8 (#271) * update auth to 1.8 Signed-off-by: arnchiequ-dell <arnchie.qu@dell.com> * Updating podmon to 1.7 Signed-off-by: arnchiequ-dell <arnchie.qu@dell.com> * Update Observability values file for Authorization sidecar image version --------- Signed-off-by: arnchiequ-dell <arnchie.qu@dell.com> Co-authored-by: Alik Saring <alik.saring@dell.com> * 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. * NFS ACL parameter removed (#289) * fix values --------- Signed-off-by: arnchiequ-dell <arnchie.qu@dell.com> Co-authored-by: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Co-authored-by: coulof <florian.coulombel@dell.com> Co-authored-by: Rajshree Khare <69839943+khareRajshree@users.noreply.github.com> Co-authored-by: Surya Gupta <109594002+suryagupta4@users.noreply.github.com> Co-authored-by: aqu-dell <108017114+arnchiequ-dell@users.noreply.github.com> Co-authored-by: Alik Saring <alik.saring@dell.com> Co-authored-by: alankar-verma <125348121+alankar-verma@users.noreply.github.com> Co-authored-by: VamsiSiddu-7 <103578883+VamsiSiddu-7@users.noreply.github.com>
1 parent dc8d7f9 commit 7e9abd6

File tree

4 files changed

+57
-101
lines changed

4 files changed

+57
-101
lines changed

‎charts/csi-isilon/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-isilon.attacherImage" -}}
5-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
6-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon.provisionerImage" -}}
13-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
14-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon.snapshotterImage" -}}
21-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
22-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon.resizerImage" -}}
29-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
30-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon.registrarImage" -}}
37-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
38-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon.healthmonitorImage" -}}
45-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
46-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (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-isilon/templates/controller.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ spec:
194194
{{- if hasKey .Values "podmon" }}
195195
{{- if eq .Values.podmon.enabled true }}
196196
- name: podmon
197-
image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
197+
image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
198198
imagePullPolicy: {{ .Values.imagePullPolicy }}
199199
args:
200200
{{- toYaml .Values.podmon.controller.args | nindent 12 }}
@@ -221,7 +221,7 @@ spec:
221221
{{- if hasKey .Values.controller "replication" }}
222222
{{- if eq .Values.controller.replication.enabled true}}
223223
- name: dell-csi-replicator
224-
image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image}}
224+
image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }}
225225
imagePullPolicy: {{ .Values.imagePullPolicy }}
226226
args:
227227
- "--csi-address={{ $driverSockPath }}"
@@ -248,7 +248,7 @@ spec:
248248
{{- if hasKey .Values.controller "resizer" }}
249249
{{- if eq .Values.controller.resizer.enabled true }}
250250
- name: resizer{{ $csiSidecarSuffix }}
251-
image: {{ required "Must provide the CSI resizer container image." ( include "csi-isilon.resizerImage" . ) }}
251+
image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
252252
imagePullPolicy: {{ .Values.imagePullPolicy }}
253253
args:
254254
- "--csi-address={{ $driverSockPath }}"
@@ -272,7 +272,7 @@ spec:
272272
{{ end }}
273273
{{ end }}
274274
- name: csi-metadata-retriever {{ $csiSidecarSuffix }}
275-
image: {{ required "Must provide the CSI metadata retriever container image." .Values.controller.metadataretriever.image }}
275+
image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
276276
imagePullPolicy: {{ .Values.imagePullPolicy }}
277277
args:
278278
- "--csi-address={{ $driverSockPath }}"
@@ -298,7 +298,7 @@ spec:
298298
- name: socket-dir
299299
mountPath: /var/run/csi
300300
- name: attacher{{ $csiSidecarSuffix }}
301-
image: {{ required "Must provide the CSI attacher container image." ( include "csi-isilon.attacherImage" . ) }}
301+
image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
302302
imagePullPolicy: {{ .Values.imagePullPolicy }}
303303
args:
304304
- "--csi-address={{ $driverSockPath }}"
@@ -323,7 +323,7 @@ spec:
323323
{{- if hasKey .Values.controller "healthMonitor" }}
324324
{{- if eq .Values.controller.healthMonitor.enabled true }}
325325
- name: external-health-monitor-controller
326-
image: {{ required "Must provide the CSI external-health-monitor-controller container image." ( include "csi-isilon.healthmonitorImage" . ) }}
326+
image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor }}
327327
imagePullPolicy: {{ .Values.imagePullPolicy }}
328328
args:
329329
- "--csi-address={{ $driverSockPath }}"
@@ -351,7 +351,7 @@ spec:
351351
{{end}}
352352
{{- end }}
353353
- name: provisioner{{ $csiSidecarSuffix }}
354-
image: {{ required "Must provide the CSI provisioner container image." ( include "csi-isilon.provisionerImage" . ) }}
354+
image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
355355
imagePullPolicy: {{ .Values.imagePullPolicy }}
356356
args:
357357
- "--csi-address={{ $driverSockPath }}"
@@ -393,7 +393,7 @@ spec:
393393
{{- if eq .Values.controller.snapshot.enabled true }}
394394
- name: snapshotter{{ $csiSidecarSuffix }}
395395
#image: quay.io/k8scsi/csi-snapshotter:v1.0.0
396-
image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-isilon.snapshotterImage" . ) }}
396+
image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }}
397397
imagePullPolicy: {{ .Values.imagePullPolicy }}
398398
args:
399399
- "--csi-address={{ $driverSockPath }}"
@@ -419,7 +419,7 @@ spec:
419419
{{end}}
420420
{{- if not $encrypted }}
421421
- name: driver
422-
image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
422+
image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
423423
imagePullPolicy: {{ .Values.imagePullPolicy }}
424424
command: [ "/csi-isilon" ]
425425
args:
@@ -519,7 +519,7 @@ spec:
519519
{{- if eq .Values.authorization.enabled true }}
520520
- name: karavi-authorization-proxy
521521
imagePullPolicy: {{ .Values.imagePullPolicy }}
522-
image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
522+
image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
523523
env:
524524
- name: PROXY_HOST
525525
value: "{{ .Values.authorization.proxyHost }}"
@@ -549,7 +549,7 @@ spec:
549549
{{- end }}
550550
{{- if $encrypted }}
551551
- name: driver-sec
552-
image: {{ .Values.encryption.image }}
552+
image: {{ .Values.images.encryption }}
553553
imagePullPolicy: {{ .Values.imagePullPolicy }}
554554
args:
555555
- --name={{ .Values.encryption.pluginName }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ spec:
113113
capabilities:
114114
add: ["SYS_ADMIN"]
115115
allowPrivilegeEscalation: true
116-
image: {{ required "Must provide the podmon container image." .Values.podmon.image }}
116+
image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
117117
imagePullPolicy: {{ .Values.imagePullPolicy }}
118118
args:
119119
{{- toYaml .Values.podmon.node.args | nindent 12 }}
@@ -167,7 +167,7 @@ spec:
167167
capabilities:
168168
add: ["SYS_ADMIN"]
169169
allowPrivilegeEscalation: true
170-
image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
170+
image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
171171
imagePullPolicy: {{ .Values.imagePullPolicy }}
172172
env:
173173
- name: CSI_ENDPOINT
@@ -251,7 +251,7 @@ spec:
251251
mountPath: /csi-isilon-config-params
252252
{{- end }}
253253
- name: registrar{{ $csiSidecarSuffix }}
254-
image: {{ required "Must provide the CSI node registrar container image." ( include "csi-isilon.registrarImage" . ) }}
254+
image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
255255
imagePullPolicy: {{ .Values.imagePullPolicy }}
256256
args:
257257
- "--v=5"
@@ -273,7 +273,7 @@ spec:
273273
{{- if eq .Values.authorization.enabled true }}
274274
- name: karavi-authorization-proxy
275275
imagePullPolicy: {{ .Values.imagePullPolicy }}
276-
image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
276+
image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
277277
env:
278278
- name: PROXY_HOST
279279
value: "{{ .Values.authorization.proxyHost }}"
@@ -303,7 +303,7 @@ spec:
303303
{{- end }}
304304
{{- if $encrypted }}
305305
- name: driver-sec
306-
image: {{ .Values.encryption.image }}
306+
image: {{ .Values.images.encryption }}
307307
imagePullPolicy: {{ .Values.imagePullPolicy }}
308308
securityContext:
309309
privileged: true

‎charts/csi-isilon/values.yaml

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,24 @@
44
# Note: Do not change this value
55
version: "v2.8.0"
66

7+
images:
8+
# "driver" defines the container image, used for the driver container.
9+
driver: dellemc/csi-isilon:v2.8.0
10+
# CSI sidecars
11+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.3.0
12+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
13+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2
14+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.8.0
15+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0
16+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0
17+
18+
# CSM sidecars
19+
replication: dellemc/dell-csi-replicator:v1.5.0
20+
podmon: dellemc/podmon:v1.6.0
21+
authorization: dellemc/csm-authorization-sidecar:v1.7.0
22+
metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
23+
encryption: dellemc/csm-encryption:v0.3.0
24+
725
# CSI driver log level
826
# Allowed values: "error", "warn"/"warning", "info", "debug"
927
# Default value: "debug"
@@ -110,10 +128,6 @@ controller:
110128
# Default value: 5s
111129
leaderElectionRetryPeriod: 5s
112130

113-
# Image for csi-metadata-retriever
114-
metadataretriever:
115-
image: dellemc/csi-metadata-retriever:v1.4.0
116-
117131
# replication: allows to configure replication
118132
# Replication CRDs must be installed before installing driver
119133
replication:
@@ -389,30 +403,29 @@ storageCapacity:
389403
# Enable this feature only after contact support for additional information
390404
podmon:
391405
enabled: false
392-
image: dellemc/podmon:v1.7.0
393-
#controller:
394-
# args:
395-
# - "--csisock=unix:/var/run/csi/csi.sock"
396-
# - "--labelvalue=csi-isilon"
397-
# - "--arrayConnectivityPollRate=60"
398-
# - "--driverPath=csi-isilon.dellemc.com"
399-
# - "--mode=controller"
400-
# - "--skipArrayConnectionValidation=false"
401-
# - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
402-
# - "--driverPodLabelValue=dell-storage"
403-
# - "--ignoreVolumelessPods=false"
404-
405-
#node:
406-
# args:
407-
# - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
408-
# - "--labelvalue=csi-isilon"
409-
# - "--arrayConnectivityPollRate=60"
410-
# - "--driverPath=csi-isilon.dellemc.com"
411-
# - "--mode=node"
412-
# - "--leaderelection=false"
413-
# - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
414-
# - "--driverPodLabelValue=dell-storage"
415-
# - "--ignoreVolumelessPods=false"
406+
controller:
407+
args:
408+
- "--csisock=unix:/var/run/csi/csi.sock"
409+
- "--labelvalue=csi-isilon"
410+
- "--arrayConnectivityPollRate=60"
411+
- "--driverPath=csi-isilon.dellemc.com"
412+
- "--mode=controller"
413+
- "--skipArrayConnectionValidation=false"
414+
- "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
415+
- "--driverPodLabelValue=dell-storage"
416+
- "--ignoreVolumelessPods=false"
417+
418+
node:
419+
args:
420+
- "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
421+
- "--labelvalue=csi-isilon"
422+
- "--arrayConnectivityPollRate=60"
423+
- "--driverPath=csi-isilon.dellemc.com"
424+
- "--mode=node"
425+
- "--leaderelection=false"
426+
- "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
427+
- "--driverPodLabelValue=dell-storage"
428+
- "--ignoreVolumelessPods=false"
416429

417430
encryption:
418431
# enabled: Enable/disable volume encryption feature.
@@ -421,9 +434,6 @@ encryption:
421434
# pluginName: The name of the provisioner to use for encrypted volumes.
422435
pluginName: "sec-isilon.dellemc.com"
423436

424-
# image: Encryption driver image name.
425-
image: "dellemc/csm-encryption:v0.3.0"
426-
427437
# apiPort: TCP port number used by the REST API server.
428438
apiPort: 3838
429439

@@ -450,6 +460,3 @@ encryption:
450460
# See the gocryptfs documentation for more details.
451461
extraArgs: []
452462

453-
images:
454-
# "driver" defines the container image, used for the driver container.
455-
driverRepository: dellemc

0 commit comments

Comments
 (0)