Skip to content

Commit 28f1b9d

Browse files
Merging branch release-v1.9.0
2 parents 3713a74 + a90d17e commit 28f1b9d

File tree

31 files changed

+323
-507
lines changed

31 files changed

+323
-507
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
# Alik Saring (alikdell)
1414
# Aaron Tye (atye)
1515
# Chaganti Rajitha (chaganti-rajitha)
16+
# Chiman Jain (chimanjain)
1617
# Florian Coulombel (coulof)
18+
# Harish H (HarishH-DELL)
1719
# Meghana G M (meggm)
1820
# Niranjan N (niranjan-n1)
1921
# Shayna Finocchiaro (shaynafinocchiaro)
@@ -25,6 +27,10 @@
2527
# Yiming Bao (baoy1)
2628
# Yian Zong (YianZong)
2729
# Forrest Xia (forrestxia)
30+
# Nitesh Rewatkar (nitesh3108)
31+
# Rajendra Indukuri (rajendraindukuri)
32+
# Shefali Malhotra (shefali-malhotra)
33+
# Spandita Panigrahi (panigs7)
2834

2935
# for all files:
30-
* @gallacher @tdawe @alikdell @atye @hoppea2 @chaganti-rajitha @coulof @meggm @niranjan-n1 @shaynafinocchiaro @sharmilarama @tssushma @taohe1012 @P-Cao @shanmydell @baoy1 @YianZong @forrestxia
36+
* @gallacher @tdawe @alikdell @atye @hoppea2 @chaganti-rajitha @coulof @meggm @niranjan-n1 @shaynafinocchiaro @sharmilarama @tssushma @taohe1012 @P-Cao @shanmydell @baoy1 @YianZong @forrestxia @nitesh3108 @rajendraindukuri @shefali-malhotra @panigs7 @chimanjain @HarishH-DELL

.github/workflows/helm-validations.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
# Lint and version increment checks on updated charts
4242
- name: Run lint/version increment checks
4343
id: versionIncrement
44-
uses: helm/chart-testing-action@v2.4.0
44+
# Bump to proper version after this issue is fixed : https://github.com/helm/chart-testing-action/issues/132
45+
uses: helm/chart-testing-action@cb49023b9227b1097e5eddd8824f48bdea11b1aa
4546
with:
4647
command: lint
4748
config: lintConfig.yaml
@@ -62,7 +63,7 @@ jobs:
6263
# Run a check on karavi-observability chart for updated dependency versions
6364
- name: Run dependency version checks
6465
id: lint
65-
uses: helm/chart-testing-action@v2.4.0
66+
uses: helm/chart-testing-action@cb49023b9227b1097e5eddd8824f48bdea11b1aa
6667
with:
6768
command: lint
6869
config: dependencyConfig.yaml

charts/container-storage-modules/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ appVersion: "1.1.0"
4040

4141
dependencies:
4242
- name: csi-powerstore
43-
version: 2.8.0
43+
version: 2.9.0
4444
repository: https://dell.github.io/helm-charts
4545
condition: csi-powerstore.enabled
4646

@@ -55,12 +55,12 @@ dependencies:
5555
condition: csi-isilon.enabled
5656

5757
- name: csi-vxflexos
58-
version: 2.8.0
58+
version: 2.9.0
5959
repository: https://dell.github.io/helm-charts
6060
condition: csi-vxflexos.enabled
6161

6262
- name: csi-unity
63-
version: 2.8.0
63+
version: 2.9.0
6464
repository: https://dell.github.io/helm-charts
6565
condition: csi-unity.enabled
6666

@@ -70,7 +70,7 @@ dependencies:
7070
condition: csm-replication.enabled
7171

7272
- name: karavi-observability
73-
version: 1.6.0
73+
version: 1.7.0
7474
repository: https://dell.github.io/helm-charts
7575
condition: karavi-observability.enabled
7676

charts/container-storage-modules/values.yaml

Lines changed: 75 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,23 @@
2020
########################
2121
csi-powerstore:
2222
enabled: false
23-
version: "v2.8.0"
23+
version: "v2.9.0"
2424
images:
25-
driverRepository: dellemc
25+
# "driver" defines the container image, used for the driver container.
26+
driver: dellemc/csi-powerstore:v2.9.0
27+
# CSI sidecars
28+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
29+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
30+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
31+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
32+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
33+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
34+
35+
# CSM sidecars
36+
replication: dellemc/dell-csi-replicator:v1.6.0
37+
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.3.0
38+
podmon: dellemc/podmon:v1.7.0
39+
metadataretriever: dellemc/csi-metadata-retriever:v1.6.0
2640
## Controller ATTRIBUTES
2741
controller:
2842
controllerCount: 2
@@ -31,11 +45,8 @@ csi-powerstore:
3145
nodeSelector:
3246
replication:
3347
enabled: false
34-
image: dellemc/dell-csi-replicator:v1.6.0
3548
vgsnapshot:
3649
enabled: false
37-
image: dellemc/csi-volumegroup-snapshotter:v1.3.0
38-
metadataretriever: dellemc/csi-metadata-retriever:v1.5.0
3950
snapshot:
4051
enabled: true
4152
resizer:
@@ -121,7 +132,21 @@ csi-powermax:
121132
# - endpoint: https://backup-2.unisphe.re:8443
122133
version: "v2.8.0"
123134
images:
124-
driverRepository: "dellemc"
135+
# "driver" defines the container image, used for the driver container.
136+
driver: dellemc/csi-powermax:v2.8.0
137+
csireverseproxy: dellemc/csipowermax-reverseproxy:v2.7.0
138+
# CSI sidecars
139+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
140+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
141+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
142+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
143+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
144+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
145+
# CSM sidecars
146+
replication: dellemc/dell-csi-replicator:v1.6.0
147+
authorization: dellemc/csm-authorization-sidecar:v1.8.0
148+
migration: dellemc/dell-csi-migrator:v1.2.0
149+
noderescan: dellemc/dell-csi-node-rescanner:v1.1.0
125150
clusterPrefix: ABC
126151
portGroups: PortGroup1, PortGroup2, PortGroup3
127152
controller:
@@ -138,15 +163,11 @@ csi-powermax:
138163
enabled: false
139164
nodeSelector:
140165
csireverseproxy:
141-
image: dellemc/csipowermax-reverseproxy:v2.7.0
142166
deployAsSidecar: true
143167
replication:
144168
enabled: false
145-
image: dellemc/dell-csi-replicator:v1.6.0
146169
migration:
147170
enabled: false
148-
image: dellemc/dell-csi-migrator:v1.2.0
149-
nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.1.0
150171
authorization:
151172
enabled: false
152173
sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.9.0
@@ -168,7 +189,21 @@ csi-isilon:
168189
enabled: false
169190
version: "v2.8.0"
170191
images:
171-
driverRepository: dellemc
192+
# "driver" defines the container image, used for the driver container.
193+
driver: dellemc/csi-isilon:v2.8.0
194+
# CSI sidecars
195+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
196+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
197+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
198+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
199+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
200+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
201+
# CSM sidecars
202+
replication: dellemc/dell-csi-replicator:v1.6.0
203+
podmon: dellemc/podmon:v1.7.0
204+
authorization: dellemc/csm-authorization-sidecar:v1.8.0
205+
metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
206+
encryption: dellemc/csm-encryption:v0.3.0
172207
## Controller ATTRIBUTES
173208
controller:
174209
controllerCount: 2
@@ -177,7 +212,6 @@ csi-isilon:
177212
nodeSelector:
178213
replication:
179214
enabled: false
180-
image: dellemc/dell-csi-replicator:v1.6.0
181215
snapshot:
182216
enabled: true
183217
resizer:
@@ -224,7 +258,6 @@ csi-isilon:
224258
- "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
225259
- "--driverPodLabelValue=dell-storage"
226260
- "--ignoreVolumelessPods=false"
227-
228261
node:
229262
args:
230263
- "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock"
@@ -247,15 +280,28 @@ csi-isilon:
247280
########################
248281
csi-vxflexos:
249282
enabled: false
250-
version: v2.8.0
283+
version: v2.9.0
251284
images:
252-
driverRepository: dellemc
285+
# "driver" defines the container image, used for the driver container.
286+
driver: dellemc/csi-vxflexos:v2.9.0
287+
# "powerflexSdc" defines the SDC image for init container.
253288
powerflexSdc: dellemc/sdc:3.6.1
289+
# CSI sidecars
290+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2
291+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2
292+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2
293+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2
294+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1
295+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
296+
# CSM sidecars
297+
replication: dellemc/dell-csi-replicator:v1.6.0
298+
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.3.0
299+
podmon: dellemc/podmon:v1.7.0
300+
authorization: dellemc/csm-authorization-sidecar:v1.8.0
254301
certSecretCount: 0
255302
controller:
256303
replication:
257304
enabled: false
258-
image: dellemc/dell-csi-replicator:v1.6.0
259305
healthMonitor:
260306
enabled: false
261307
controllerCount: 2
@@ -300,7 +346,6 @@ csi-vxflexos:
300346
enabled: false
301347
vgsnapshotter:
302348
enabled: false
303-
image: dellemc/csi-volumegroup-snapshotter:v1.3.0
304349
# maxVxflexosVolumesPerNode - Maximum number of volumes that controller can publish to the node.
305350
maxVxflexosVolumesPerNode: 0
306351

@@ -334,8 +379,19 @@ csi-vxflexos:
334379
########################
335380
csi-unity:
336381
enabled: false
337-
version: "v2.8.0"
338-
382+
version: "v2.9.0"
383+
images:
384+
# "driver" defines the container image, used for the driver container.
385+
driver: dellemc/csi-unity:v2.9.0
386+
# CSI sidecars
387+
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
388+
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
389+
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
390+
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
391+
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
392+
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0
393+
# CSM sidecars
394+
podmon: dellemc/podmon:v1.7.0
339395
# certSecretCount: Represents number of certificate secrets, which user is going to create for
340396
# ssl authentication. (unity-cert-0..unity-cert-n)
341397
# Allowed values: n, where n > 0
@@ -458,9 +514,6 @@ csi-unity:
458514
storageCapacity:
459515
enabled: true
460516

461-
images:
462-
driverRepository: dellemc
463-
464517
## K8S/Module ATTRIBUTES
465518
##########################################
466519

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
*/}}

0 commit comments

Comments
 (0)