Skip to content

Commit a28e0b1

Browse files
atyeatye
authored
Merge branch 'release-v1.9.0' into pscale-driver-images-test
2 parents 73bd0ce + d2d5655 commit a28e0b1

File tree

21 files changed

+151
-331
lines changed

21 files changed

+151
-331
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ csi-vxflexos:
250250
version: v2.9.0
251251
images:
252252
driverRepository: dellemc
253-
powerflexSdc: dellemc/sdc:3.6.1
253+
powerflexSdc: dellemc/sdc:4.5
254254
certSecretCount: 0
255255
controller:
256256
replication:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ rules:
7272
verbs: ["get", "list", "watch", "update"]
7373
- apiGroups: ["snapshot.storage.k8s.io"]
7474
resources: ["volumesnapshots/status"]
75-
verbs: ["update"]
75+
verbs: ["update", "patch"]
7676
- apiGroups: ["snapshot.storage.k8s.io"]
7777
resources: ["volumesnapshotcontents/status"]
7878
verbs: ["update"]

‎charts/csi-powermax/charts/csireverseproxy/conf/config.yaml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,7 @@
1-
mode: {{ .Values.mode }}
1+
mode: "StandAlone"
22
port: {{ .Values.port }}
33
logLevel: {{ .Values.global.logLevel | default "debug" }}
44
logFormat: {{ .Values.global.logFormat | default "TEXT" }}
5-
{{- if eq .Values.mode "Linked" }}
6-
linkConfig:
7-
primary:
8-
{{- $primary := first .Values.global.managementServers }}
9-
url: {{ required "Must provide a primary Unisphere HTTPS endpoint." $primary.endpoint }}
10-
{{- if $primary.certSecret }}
11-
{{- $check := toString $primary.skipCertificateValidation }}
12-
skipCertificateValidation: {{ ternary $primary.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }}
13-
{{- else }}
14-
skipCertificateValidation: true
15-
{{- end }}
16-
certSecret: {{ $primary.certSecret | default "" }}
17-
{{- if $primary.limits }}
18-
{{- $limits := $primary.limits }}
19-
limits:
20-
maxActiveRead: {{ $limits.maxActiveRead | default 0 }}
21-
maxActiveWrite: {{ $limits.maxActiveWrite | default 0 }}
22-
maxOutStandingRead: {{ $limits.maxOutStandingRead | default 0 }}
23-
maxOutStandingWrite: {{ $limits.maxOutStandingWrite | default 0 }}
24-
{{- end }}
25-
{{- if first (rest .Values.global.managementServers) }}
26-
{{- $backup := first (rest .Values.global.managementServers) }}
27-
backup:
28-
url: {{ required "Must provide a primary Unisphere HTTPS endpoint." $backup.endpoint }}
29-
{{- if $backup.certSecret }}
30-
{{- $check := toString $backup.skipCertificateValidation }}
31-
skipCertificateValidation: {{ ternary $backup.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }}
32-
{{- else }}
33-
skipCertificateValidation: true
34-
{{- end }}
35-
certSecret: {{ $backup.certSecret | default "" }}
36-
{{- if $backup.limits }}
37-
{{- $limits := $backup.limits }}
38-
limits:
39-
maxActiveRead: {{ $limits.maxActiveRead | default 0 }}
40-
maxActiveWrite: {{ $limits.maxActiveWrite | default 0 }}
41-
maxOutStandingRead: {{ $limits.maxOutStandingRead | default 0 }}
42-
maxOutStandingWrite: {{ $limits.maxOutStandingWrite | default 0 }}
43-
{{- end }}
44-
{{- end }}
45-
{{- end }}
46-
{{- if eq .Values.mode "StandAlone" }}
475
standAloneConfig:
486
{{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret }}
497
storageArrays:
@@ -79,4 +37,3 @@ standAloneConfig:
7937
maxOutStandingWrite: {{ $value.limits.maxOutStandingWrite | default 0 }}
8038
{{- end }}
8139
{{- end }}
82-
{{- end }}

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

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,3 @@
1-
{{/*
2-
Return the appropriate sidecar images based on k8s version
3-
*/}}
4-
{{- define "csi-powermax.attacherImage" -}}
5-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
6-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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-powermax.provisionerImage" -}}
13-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
14-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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-powermax.snapshotterImage" -}}
21-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
22-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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-powermax.resizerImage" -}}
29-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
30-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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-powermax.registrarImage" -}}
37-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
38-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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-powermax.healthmonitorImage" -}}
45-
{{- if eq .Capabilities.KubeVersion.Major "1" }}
46-
{{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (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 -}}
511

522
{{- define "csi-powermax.isStorageCapacitySupported" -}}
533
{{- if eq .Values.storageCapacity.enabled true -}}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ spec:
168168
topologyKey: kubernetes.io/hostname
169169
containers:
170170
- name: attacher
171-
image: {{ required "Must provide the CSI attacher container image." ( include "csi-powermax.attacherImage" . ) }}
171+
image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
172172
imagePullPolicy: {{ .Values.imagePullPolicy }}
173173
args:
174174
- "--csi-address=$(ADDRESS)"
@@ -183,7 +183,7 @@ spec:
183183
- name: socket-dir
184184
mountPath: /var/run/csi
185185
- name: provisioner
186-
image: {{ required "Must provide the CSI provisioner container image." ( include "csi-powermax.provisionerImage" . ) }}
186+
image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
187187
imagePullPolicy: {{ .Values.imagePullPolicy }}
188188
args:
189189
- "--csi-address=$(ADDRESS)"
@@ -216,7 +216,7 @@ spec:
216216
{{- if hasKey .Values.controller "snapshot" }}
217217
{{- if eq .Values.controller.snapshot.enabled true }}
218218
- name: snapshotter
219-
image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-powermax.snapshotterImage" . ) }}
219+
image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }}
220220
imagePullPolicy: {{ .Values.imagePullPolicy }}
221221
args:
222222
- "--csi-address=$(ADDRESS)"
@@ -235,7 +235,7 @@ spec:
235235
{{- end }}
236236
{{- if eq .Values.replication.enabled true}}
237237
- name: dell-csi-replicator
238-
image: {{ required "Must provide the Dell CSI Replicator Resizer image." .Values.replication.image}}
238+
image: {{ required "Must provide the Dell CSI Replicator Resizer image." .Values.images.replication }}
239239
imagePullPolicy: {{ .Values.imagePullPolicy }}
240240
args:
241241
- "--csi-address=$(ADDRESS)"
@@ -261,7 +261,7 @@ spec:
261261
{{- end }}
262262
{{- if eq .Values.migration.enabled true}}
263263
- name: dell-csi-migrator
264-
image: {{ required "Must provide the Dell CSI Migrator Resizer image." .Values.migration.image}}
264+
image: {{ required "Must provide the Dell CSI Migrator Resizer image." .Values.images.migration }}
265265
imagePullPolicy: {{ .Values.imagePullPolicy }}
266266
args:
267267
- "--csi-address=$(ADDRESS)"
@@ -287,7 +287,7 @@ spec:
287287
{{- if hasKey .Values.controller "resizer" }}
288288
{{- if eq .Values.controller.resizer.enabled true }}
289289
- name: resizer
290-
image: {{ required "Must provide the CSI resizer container image." ( include "csi-powermax.resizerImage" . ) }}
290+
image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }}
291291
imagePullPolicy: {{ .Values.imagePullPolicy }}
292292
args:
293293
- "--csi-address=$(ADDRESS)"
@@ -306,7 +306,7 @@ spec:
306306
{{- if eq .Values.authorization.enabled true }}
307307
- name: karavi-authorization-proxy
308308
imagePullPolicy: {{ .Values.imagePullPolicy }}
309-
image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
309+
image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
310310
env:
311311
- name: PROXY_HOST
312312
value: "{{ .Values.authorization.proxyHost }}"
@@ -337,7 +337,7 @@ spec:
337337
{{- if eq .Values.controller.healthMonitor.enabled true }}
338338
- name: csi-external-health-monitor-controller
339339
imagePullPolicy: {{ .Values.imagePullPolicy }}
340-
image: {{ required "Must provide the CSI external health monitor controller image." ( include "csi-powermax.healthmonitorImage" . ) }}
340+
image: {{ required "Must provide the CSI external health monitor controller image." .Values.images.healthmonitor }}
341341
args:
342342
- "--v=5"
343343
- "--csi-address=$(ADDRESS)"
@@ -355,7 +355,7 @@ spec:
355355
{{- end }}
356356
{{- end }}
357357
- name: driver
358-
image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
358+
image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driver }}
359359
imagePullPolicy: {{ .Values.imagePullPolicy }}
360360
command: [ "/csi-powermax.sh" ]
361361
args:
@@ -459,7 +459,7 @@ spec:
459459
mountPath: /powermax-config-params
460460
{{- if eq .Values.csireverseproxy.deployAsSidecar true }}
461461
- name: reverseproxy
462-
image: {{ required "Must provided an image for reverseproxy container." .Values.csireverseproxy.image }}
462+
image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy }}
463463
imagePullPolicy: {{ .Values.imagePullPolicy }}
464464
env:
465465
- name: X_CSI_REVPROXY_CONFIG_DIR

‎charts/csi-powermax/templates/csidriver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
{{- if eq .Values.customDriverName.enabled true}}
55
name: {{ printf "%s-%s" .Release.Namespace .Values.customDriverName.value }}
66
{{- else }}
7-
name: csi-powermax
7+
name: csi-powermax.dellemc.com
88
{{- end }}
99
spec:
1010
podInfoOnMount: true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ spec:
106106
capabilities:
107107
add: ["SYS_ADMIN"]
108108
allowPrivilegeEscalation: true
109-
image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}
109+
image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driver }}
110110
imagePullPolicy: {{ .Values.imagePullPolicy }}
111111
command: [ "/csi-powermax.sh" ]
112112
env:
@@ -245,7 +245,7 @@ spec:
245245
{{- end }}
246246
{{- end }}
247247
- name: registrar
248-
image: {{ required "Must provide the CSI node registrar container image." ( include "csi-powermax.registrarImage" . ) }}
248+
image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
249249
args:
250250
- "--v=5"
251251
- "--csi-address=$(ADDRESS)"
@@ -275,7 +275,7 @@ spec:
275275
add: [ "SYS_ADMIN" ]
276276
allowPrivilegeEscalation: true
277277
imagePullPolicy: {{ .Values.imagePullPolicy }}
278-
image: {{ required "Must provide the node rescanner sidecar container image." .Values.migration.nodeRescanSidecarImage }}
278+
image: {{ required "Must provide the node rescanner sidecar container image." .Values.images.noderescan }}
279279
args:
280280
- "--csi-address=$(ADDRESS)"
281281
- "--retry-interval-start=1s"
@@ -313,7 +313,7 @@ spec:
313313
{{- if eq .Values.authorization.enabled true }}
314314
- name: karavi-authorization-proxy
315315
imagePullPolicy: {{ .Values.imagePullPolicy }}
316-
image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }}
316+
image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
317317
env:
318318
- name: PROXY_HOST
319319
value: "{{ .Values.authorization.proxyHost }}"

0 commit comments

Comments
 (0)