Skip to content

Commit 5d1fe44

Browse files
committed
deprecate managementServers, storageArrays, and defaultCredentialsSecret.
- add logic to dynamically create envs for defaultCredentialsSecret for backward compat only. - remove final reference to X_CSI_POWERMAX_ENDPOINT.
1 parent ad45ead commit 5d1fe44

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

charts/csi-powermax/templates/controller.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@ spec:
414414
value: /var/run/csi/csi.sock
415415
- name: X_CSI_MODE
416416
value: controller
417+
{{- if empty .Values.csireverseproxy.secretName }}
417418
- name: X_CSI_POWERMAX_USER
418419
valueFrom:
419420
secretKeyRef:
@@ -424,6 +425,7 @@ spec:
424425
secretKeyRef:
425426
name: {{ .Values.global.defaultCredentialsSecret }}
426427
key: password
428+
{{- end }}
427429
- name: X_CSI_POWERMAX_CONFIG_PATH
428430
value: /powermax-config-params/driver-config-params.yaml
429431
- name: X_CSI_POWERMAX_ARRAY_CONFIG_PATH

charts/csi-powermax/templates/node.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,13 @@ spec:
153153
value: "{{ .Values.maxPowerMaxVolumesPerNode }}"
154154
- name: X_CSI_PRIVATE_MOUNT_DIR
155155
value: "{{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com/disks"
156-
{{- $managementServer := first .Values.global.managementServers }}
157-
- name: X_CSI_POWERMAX_ENDPOINT
158-
value: {{ required "Must provide a Unisphere HTTPS endpoint." $managementServer.endpoint }}
159156
- name: X_CSI_POWERMAX_DEBUG
160157
value: {{ .Values.powerMaxDebug | default "false" | lower | quote }}
161158
- name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION
162159
value: {{ .Values.skipCertificateValidation | default "true" | lower | quote }}
163160
- name: X_CSI_K8S_CLUSTER_PREFIX
164161
value: {{ required "Must provide a Cluster Prefix." .Values.clusterPrefix }}
162+
{{- if empty .Values.csireverseproxy.secretName }}
165163
- name: X_CSI_POWERMAX_USER
166164
valueFrom:
167165
secretKeyRef:
@@ -172,6 +170,7 @@ spec:
172170
secretKeyRef:
173171
name: {{ .Values.global.defaultCredentialsSecret }}
174172
key: password
173+
{{- end }}
175174
- name: X_CSI_POWERMAX_NODENAME
176175
valueFrom:
177176
fieldRef:

charts/csi-powermax/values.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ global:
1919
# Default value: None
2020
# Examples: "000000000001", "000000000002"
2121
managedArrays: "000000000001,000000000002"
22+
2223
# defaultCredentialsSecret
24+
# DEPRECATION NOTICE: The defaultCredentials parameter has been deprecated and will be
25+
# removed in a future release. It remains for backward compatibility only.
26+
# Please see use the parameter .csireverseproxy.secretName below and refer to the official
27+
# documentation website for further details.
2328
defaultCredentialsSecret: powermax-creds
2429
# portGroups: Define the set of existing port groups that the driver will use.
2530
# It is a comma separated list of portgroup names.
@@ -37,13 +42,23 @@ global:
3742
# "" - Automatic selection of transport protocol
3843
# Default value: "" <empty>
3944
transportProtocol: ""
45+
46+
# DEPRECATION NOTICE: The storageArrays parameter has been deprecated in this helm chart
47+
# and will be removed in a future release. It remains for backward compatibility only.
48+
# storageArrays have been migrated to the 'secret' format. Please refer to the official
49+
# documentation website for further details.
4050
storageArrays:
4151
- storageArrayId: "000000000001"
4252
endpoint: https://primary-1.unisphe.re:8443
4353
backupEndpoint: https://backup-1.unisphe.re:8443
4454
# - storageArrayId: "000000000002"
4555
# endpoint: https://primary-2.unisphe.re:8443
4656
# backupEndpoint: https://backup-2.unisphe.re:8443
57+
58+
# DEPRECATION NOTICE: The managementServers parameter has been deprecated in this helm chart
59+
# and will be removed in a future release. It remains for backward compatibility only.
60+
# managementServers have been migrated to the 'secret' format. Please refer to the official
61+
# documentation website for further details.
4762
managementServers:
4863
- endpoint: https://primary-1.unisphe.re:8443
4964
credentialsSecret: primary-1-secret

0 commit comments

Comments
 (0)