diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 62dc61ae..e89989ee 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,7 +13,9 @@ # Alik Saring (alikdell) # Aaron Tye (atye) # Chaganti Rajitha (chaganti-rajitha) +# Chiman Jain (chimanjain) # Florian Coulombel (coulof) +# Harish H (HarishH-DELL) # Meghana G M (meggm) # Niranjan N (niranjan-n1) # Shayna Finocchiaro (shaynafinocchiaro) @@ -25,6 +27,10 @@ # Yiming Bao (baoy1) # Yian Zong (YianZong) # Forrest Xia (forrestxia) +# Nitesh Rewatkar (nitesh3108) +# Rajendra Indukuri (rajendraindukuri) +# Shefali Malhotra (shefali-malhotra) +# Spandita Panigrahi (panigs7) # for all files: -* @gallacher @tdawe @alikdell @atye @hoppea2 @chaganti-rajitha @coulof @meggm @niranjan-n1 @shaynafinocchiaro @sharmilarama @tssushma @taohe1012 @P-Cao @shanmydell @baoy1 @YianZong @forrestxia +* @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 diff --git a/.github/workflows/helm-validations.yml b/.github/workflows/helm-validations.yml index 2993841f..1e91c2d6 100644 --- a/.github/workflows/helm-validations.yml +++ b/.github/workflows/helm-validations.yml @@ -41,7 +41,8 @@ jobs: # Lint and version increment checks on updated charts - name: Run lint/version increment checks id: versionIncrement - uses: helm/chart-testing-action@v2.4.0 + # Bump to proper version after this issue is fixed : https://github.com/helm/chart-testing-action/issues/132 + uses: helm/chart-testing-action@cb49023b9227b1097e5eddd8824f48bdea11b1aa with: command: lint config: lintConfig.yaml @@ -62,7 +63,7 @@ jobs: # Run a check on karavi-observability chart for updated dependency versions - name: Run dependency version checks id: lint - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@cb49023b9227b1097e5eddd8824f48bdea11b1aa with: command: lint config: dependencyConfig.yaml diff --git a/charts/container-storage-modules/Chart.yaml b/charts/container-storage-modules/Chart.yaml index c2305900..0db13511 100644 --- a/charts/container-storage-modules/Chart.yaml +++ b/charts/container-storage-modules/Chart.yaml @@ -77,4 +77,4 @@ dependencies: - name: cert-manager version: 1.10.0 repository: https://charts.jetstack.io - condition: cert-manager.enabled + condition: cert-manager.enabled \ No newline at end of file diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml index 55b61010..908772b9 100644 --- a/charts/container-storage-modules/values.yaml +++ b/charts/container-storage-modules/values.yaml @@ -487,4 +487,4 @@ karavi-observability: ## K8S/Cert-manager ATTRIBUTES ######################## cert-manager: - enabled: false + enabled: false \ No newline at end of file diff --git a/charts/csi-isilon/Chart.yaml b/charts/csi-isilon/Chart.yaml index 870eaa52..3e63f3dc 100644 --- a/charts/csi-isilon/Chart.yaml +++ b/charts/csi-isilon/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: csi-isilon -version: 2.8.0 -appVersion: "2.8.0" +version: 2.9.0 +appVersion: "2.9.0" kubeVersion: ">= 1.21.0 < 1.29.0" #If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead #WARNING: this version of the check will allow the use of alpha and beta versions, which is NOT SUPPORTED diff --git a/charts/csi-isilon/templates/_helpers.tpl b/charts/csi-isilon/templates/_helpers.tpl index 0bf04fae..ecfe630d 100644 --- a/charts/csi-isilon/templates/_helpers.tpl +++ b/charts/csi-isilon/templates/_helpers.tpl @@ -1,54 +1,3 @@ -{{/* -Return the appropriate sidecar images based on k8s version -*/}} -{{- define "csi-isilon.attacherImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-isilon.provisionerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-isilon.snapshotterImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-isilon.resizerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-isilon.registrarImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-isilon.healthmonitorImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - {{/* Return true if storage capacity tracking is enabled and is supported based on k8s version */}} diff --git a/charts/csi-isilon/templates/controller.yaml b/charts/csi-isilon/templates/controller.yaml index 26479f3b..3c279baa 100644 --- a/charts/csi-isilon/templates/controller.yaml +++ b/charts/csi-isilon/templates/controller.yaml @@ -72,7 +72,7 @@ rules: verbs: ["get", "list", "watch", "update"] - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshots/status"] - verbs: ["update"] + verbs: ["update", "patch"] - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshotcontents/status"] verbs: ["update"] @@ -194,7 +194,7 @@ spec: {{- if hasKey .Values "podmon" }} {{- if eq .Values.podmon.enabled true }} - name: podmon - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.controller.args | nindent 12 }} @@ -221,7 +221,7 @@ spec: {{- if hasKey .Values.controller "replication" }} {{- if eq .Values.controller.replication.enabled true}} - name: dell-csi-replicator - image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image}} + image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -248,7 +248,7 @@ spec: {{- if hasKey .Values.controller "resizer" }} {{- if eq .Values.controller.resizer.enabled true }} - name: resizer{{ $csiSidecarSuffix }} - image: {{ required "Must provide the CSI resizer container image." ( include "csi-isilon.resizerImage" . ) }} + image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -272,7 +272,7 @@ spec: {{ end }} {{ end }} - name: csi-metadata-retriever {{ $csiSidecarSuffix }} - image: {{ required "Must provide the CSI metadata retriever container image." .Values.controller.metadataretriever.image }} + image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -298,7 +298,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher{{ $csiSidecarSuffix }} - image: {{ required "Must provide the CSI attacher container image." ( include "csi-isilon.attacherImage" . ) }} + image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -323,7 +323,7 @@ spec: {{- if hasKey .Values.controller "healthMonitor" }} {{- if eq .Values.controller.healthMonitor.enabled true }} - name: external-health-monitor-controller - image: {{ required "Must provide the CSI external-health-monitor-controller container image." ( include "csi-isilon.healthmonitorImage" . ) }} + image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -351,7 +351,7 @@ spec: {{end}} {{- end }} - name: provisioner{{ $csiSidecarSuffix }} - image: {{ required "Must provide the CSI provisioner container image." ( include "csi-isilon.provisionerImage" . ) }} + image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -393,7 +393,7 @@ spec: {{- if eq .Values.controller.snapshot.enabled true }} - name: snapshotter{{ $csiSidecarSuffix }} #image: quay.io/k8scsi/csi-snapshotter:v1.0.0 - image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-isilon.snapshotterImage" . ) }} + image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address={{ $driverSockPath }}" @@ -419,7 +419,7 @@ spec: {{end}} {{- if not $encrypted }} - name: driver - image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-isilon" ] args: @@ -519,7 +519,7 @@ spec: {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} env: - name: PROXY_HOST value: "{{ .Values.authorization.proxyHost }}" @@ -549,7 +549,7 @@ spec: {{- end }} {{- if $encrypted }} - name: driver-sec - image: {{ .Values.encryption.image }} + image: {{ .Values.images.encryption }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - --name={{ .Values.encryption.pluginName }} diff --git a/charts/csi-isilon/templates/node.yaml b/charts/csi-isilon/templates/node.yaml index c08c2f92..d84a505a 100644 --- a/charts/csi-isilon/templates/node.yaml +++ b/charts/csi-isilon/templates/node.yaml @@ -113,7 +113,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.node.args | nindent 12 }} @@ -167,7 +167,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the Isilon driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: CSI_ENDPOINT @@ -251,7 +251,7 @@ spec: mountPath: /csi-isilon-config-params {{- end }} - name: registrar{{ $csiSidecarSuffix }} - image: {{ required "Must provide the CSI node registrar container image." ( include "csi-isilon.registrarImage" . ) }} + image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--v=5" @@ -273,7 +273,7 @@ spec: {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} env: - name: PROXY_HOST value: "{{ .Values.authorization.proxyHost }}" @@ -303,7 +303,7 @@ spec: {{- end }} {{- if $encrypted }} - name: driver-sec - image: {{ .Values.encryption.image }} + image: {{ .Values.images.encryption }} imagePullPolicy: {{ .Values.imagePullPolicy }} securityContext: privileged: true diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml index 59414b3c..15b20476 100644 --- a/charts/csi-isilon/values.yaml +++ b/charts/csi-isilon/values.yaml @@ -2,7 +2,25 @@ ######################## # version: version of this values file # Note: Do not change this value -version: "v2.8.0" +version: "v2.9.0" + +images: + # "driver" defines the container image, used for the driver container. + driver: dellemc/csi-isilon:v2.9.0 + # CSI sidecars + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0 + + # CSM sidecars + replication: dellemc/dell-csi-replicator:v1.7.0 + podmon: dellemc/podmon:v1.8.0 + authorization: dellemc/csm-authorization-sidecar:v1.9.0 + metadataretriever: dellemc/csi-metadata-retriever:v1.4.0 + encryption: dellemc/csm-encryption:v0.3.0 # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" @@ -110,10 +128,6 @@ controller: # Default value: 5s leaderElectionRetryPeriod: 5s - # Image for csi-metadata-retriever - metadataretriever: - image: dellemc/csi-metadata-retriever:v1.4.0 - # replication: allows to configure replication # Replication CRDs must be installed before installing driver replication: @@ -124,11 +138,6 @@ controller: # Default value: false enabled: false - # image: Image to use for dell-csi-replicator. This shouldn't be changed - # Allowed values: string - # Default value: None - image: dellemc/dell-csi-replicator:v1.6.0 - # replicationContextPrefix: prefix to use for naming of resources created by replication feature # Allowed values: string # Default value: powerscale @@ -359,9 +368,6 @@ autoProbe: true authorization: enabled: false - # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -389,30 +395,29 @@ storageCapacity: # Enable this feature only after contact support for additional information podmon: enabled: false - image: dellemc/podmon:v1.7.0 - #controller: - # args: - # - "--csisock=unix:/var/run/csi/csi.sock" - # - "--labelvalue=csi-isilon" - # - "--arrayConnectivityPollRate=60" - # - "--driverPath=csi-isilon.dellemc.com" - # - "--mode=controller" - # - "--skipArrayConnectionValidation=false" - # - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" - # - "--driverPodLabelValue=dell-storage" - # - "--ignoreVolumelessPods=false" - - #node: - # args: - # - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock" - # - "--labelvalue=csi-isilon" - # - "--arrayConnectivityPollRate=60" - # - "--driverPath=csi-isilon.dellemc.com" - # - "--mode=node" - # - "--leaderelection=false" - # - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" - # - "--driverPodLabelValue=dell-storage" - # - "--ignoreVolumelessPods=false" + controller: + args: + - "--csisock=unix:/var/run/csi/csi.sock" + - "--labelvalue=csi-isilon" + - "--arrayConnectivityPollRate=60" + - "--driverPath=csi-isilon.dellemc.com" + - "--mode=controller" + - "--skipArrayConnectionValidation=false" + - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" + + node: + args: + - "--csisock=unix:/var/lib/kubelet/plugins/csi-isilon/csi_sock" + - "--labelvalue=csi-isilon" + - "--arrayConnectivityPollRate=60" + - "--driverPath=csi-isilon.dellemc.com" + - "--mode=node" + - "--leaderelection=false" + - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" encryption: # enabled: Enable/disable volume encryption feature. @@ -421,9 +426,6 @@ encryption: # pluginName: The name of the provisioner to use for encrypted volumes. pluginName: "sec-isilon.dellemc.com" - # image: Encryption driver image name. - image: "dellemc/csm-encryption:v0.3.0" - # apiPort: TCP port number used by the REST API server. apiPort: 3838 @@ -450,6 +452,3 @@ encryption: # See the gocryptfs documentation for more details. extraArgs: [] -images: - # "driver" defines the container image, used for the driver container. - driverRepository: dellemc diff --git a/charts/csi-powermax/Chart.yaml b/charts/csi-powermax/Chart.yaml index b4244160..43930591 100644 --- a/charts/csi-powermax/Chart.yaml +++ b/charts/csi-powermax/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: "2.8.0" +appVersion: "2.9.0" name: csi-powermax -version: 2.8.0 +version: 2.9.0 description: | PowerMax CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as @@ -16,7 +16,7 @@ keywords: - storage dependencies: - name: csireverseproxy - version: 2.7.0 + version: 2.8.0 condition: required home: https://github.com/dell/csi-powermax icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4 diff --git a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml index 1825b03b..25ad85eb 100644 --- a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy type: application -version: 2.7.0 +version: 2.8.0 -appVersion: 2.7.0 +appVersion: 2.8.0 diff --git a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml index 3f6419f1..51ed5390 100644 --- a/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/conf/config.yaml @@ -1,49 +1,7 @@ -mode: {{ .Values.mode }} +mode: "StandAlone" port: {{ .Values.port }} logLevel: {{ .Values.global.logLevel | default "debug" }} logFormat: {{ .Values.global.logFormat | default "TEXT" }} - {{- if eq .Values.mode "Linked" }} -linkConfig: - primary: - {{- $primary := first .Values.global.managementServers }} - url: {{ required "Must provide a primary Unisphere HTTPS endpoint." $primary.endpoint }} - {{- if $primary.certSecret }} - {{- $check := toString $primary.skipCertificateValidation }} - skipCertificateValidation: {{ ternary $primary.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }} - {{- else }} - skipCertificateValidation: true - {{- end }} - certSecret: {{ $primary.certSecret | default "" }} - {{- if $primary.limits }} - {{- $limits := $primary.limits }} - limits: - maxActiveRead: {{ $limits.maxActiveRead | default 0 }} - maxActiveWrite: {{ $limits.maxActiveWrite | default 0 }} - maxOutStandingRead: {{ $limits.maxOutStandingRead | default 0 }} - maxOutStandingWrite: {{ $limits.maxOutStandingWrite | default 0 }} - {{- end }} - {{- if first (rest .Values.global.managementServers) }} - {{- $backup := first (rest .Values.global.managementServers) }} - backup: - url: {{ required "Must provide a primary Unisphere HTTPS endpoint." $backup.endpoint }} - {{- if $backup.certSecret }} - {{- $check := toString $backup.skipCertificateValidation }} - skipCertificateValidation: {{ ternary $backup.skipCertificateValidation true (or (eq $check "true") (eq $check "false")) }} - {{- else }} - skipCertificateValidation: true - {{- end }} - certSecret: {{ $backup.certSecret | default "" }} - {{- if $backup.limits }} - {{- $limits := $backup.limits }} - limits: - maxActiveRead: {{ $limits.maxActiveRead | default 0 }} - maxActiveWrite: {{ $limits.maxActiveWrite | default 0 }} - maxOutStandingRead: {{ $limits.maxOutStandingRead | default 0 }} - maxOutStandingWrite: {{ $limits.maxOutStandingWrite | default 0 }} - {{- end }} - {{- end }} - {{- end }} -{{- if eq .Values.mode "StandAlone" }} standAloneConfig: {{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret }} storageArrays: @@ -79,4 +37,3 @@ standAloneConfig: maxOutStandingWrite: {{ $value.limits.maxOutStandingWrite | default 0 }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index fcd87e30..bdfc36fa 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -1,4 +1,4 @@ -image: dellemc/csipowermax-reverseproxy:v2.7.0 +image: dellemc/csipowermax-reverseproxy:v2.8.0 port: 2222 # TLS secret which is used for setting up the proxy HTTPS server diff --git a/charts/csi-powermax/templates/_helpers.tpl b/charts/csi-powermax/templates/_helpers.tpl index 4cb67bdd..80bf5d70 100644 --- a/charts/csi-powermax/templates/_helpers.tpl +++ b/charts/csi-powermax/templates/_helpers.tpl @@ -1,53 +1,3 @@ -{{/* -Return the appropriate sidecar images based on k8s version -*/}} -{{- define "csi-powermax.attacherImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powermax.provisionerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powermax.snapshotterImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powermax.resizerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powermax.registrarImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powermax.healthmonitorImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "23") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} {{- define "csi-powermax.isStorageCapacitySupported" -}} {{- if eq .Values.storageCapacity.enabled true -}} diff --git a/charts/csi-powermax/templates/controller.yaml b/charts/csi-powermax/templates/controller.yaml index 7785fbf0..12d6b2da 100644 --- a/charts/csi-powermax/templates/controller.yaml +++ b/charts/csi-powermax/templates/controller.yaml @@ -168,7 +168,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: attacher - image: {{ required "Must provide the CSI attacher container image." ( include "csi-powermax.attacherImage" . ) }} + image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -183,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: {{ required "Must provide the CSI provisioner container image." ( include "csi-powermax.provisionerImage" . ) }} + image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -216,7 +216,7 @@ spec: {{- if hasKey .Values.controller "snapshot" }} {{- if eq .Values.controller.snapshot.enabled true }} - name: snapshotter - image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-powermax.snapshotterImage" . ) }} + image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -235,7 +235,7 @@ spec: {{- end }} {{- if eq .Values.replication.enabled true}} - name: dell-csi-replicator - image: {{ required "Must provide the Dell CSI Replicator Resizer image." .Values.replication.image}} + image: {{ required "Must provide the Dell CSI Replicator Resizer image." .Values.images.replication }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -261,7 +261,7 @@ spec: {{- end }} {{- if eq .Values.migration.enabled true}} - name: dell-csi-migrator - image: {{ required "Must provide the Dell CSI Migrator Resizer image." .Values.migration.image}} + image: {{ required "Must provide the Dell CSI Migrator Resizer image." .Values.images.migration }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -287,7 +287,7 @@ spec: {{- if hasKey .Values.controller "resizer" }} {{- if eq .Values.controller.resizer.enabled true }} - name: resizer - image: {{ required "Must provide the CSI resizer container image." ( include "csi-powermax.resizerImage" . ) }} + image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -306,7 +306,7 @@ spec: {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} env: - name: PROXY_HOST value: "{{ .Values.authorization.proxyHost }}" @@ -337,7 +337,7 @@ spec: {{- if eq .Values.controller.healthMonitor.enabled true }} - name: csi-external-health-monitor-controller imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the CSI external health monitor controller image." ( include "csi-powermax.healthmonitorImage" . ) }} + image: {{ required "Must provide the CSI external health monitor controller image." .Values.images.healthmonitor }} args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -355,7 +355,7 @@ spec: {{- end }} {{- end }} - name: driver - image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-powermax.sh" ] args: @@ -459,7 +459,7 @@ spec: mountPath: /powermax-config-params {{- if eq .Values.csireverseproxy.deployAsSidecar true }} - name: reverseproxy - image: {{ required "Must provided an image for reverseproxy container." .Values.csireverseproxy.image }} + image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: X_CSI_REVPROXY_CONFIG_DIR diff --git a/charts/csi-powermax/templates/csidriver.yaml b/charts/csi-powermax/templates/csidriver.yaml index 2717b327..88b7c7c7 100644 --- a/charts/csi-powermax/templates/csidriver.yaml +++ b/charts/csi-powermax/templates/csidriver.yaml @@ -4,7 +4,7 @@ metadata: {{- if eq .Values.customDriverName.enabled true}} name: {{ printf "%s-%s" .Release.Namespace .Values.customDriverName.value }} {{- else }} - name: csi-powermax + name: csi-powermax.dellemc.com {{- end }} spec: podInfoOnMount: true diff --git a/charts/csi-powermax/templates/node.yaml b/charts/csi-powermax/templates/node.yaml index 2d91c9b1..8b05dd82 100644 --- a/charts/csi-powermax/templates/node.yaml +++ b/charts/csi-powermax/templates/node.yaml @@ -106,7 +106,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the PowerMax driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-powermax.sh" ] env: @@ -245,7 +245,7 @@ spec: {{- end }} {{- end }} - name: registrar - image: {{ required "Must provide the CSI node registrar container image." ( include "csi-powermax.registrarImage" . ) }} + image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }} args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -275,7 +275,7 @@ spec: add: [ "SYS_ADMIN" ] allowPrivilegeEscalation: true imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the node rescanner sidecar container image." .Values.migration.nodeRescanSidecarImage }} + image: {{ required "Must provide the node rescanner sidecar container image." .Values.images.noderescan }} args: - "--csi-address=$(ADDRESS)" - "--retry-interval-start=1s" @@ -313,7 +313,7 @@ spec: {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} env: - name: PROXY_HOST value: "{{ .Values.authorization.proxyHost }}" diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 885a8ba9..f2a3de10 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -16,7 +16,6 @@ global: # The CSI PowerMax ReverseProxy section to fill out the required configuration # Please refer to the doc website about a # detailed explanation of each configuration parameter - # and the various ReverseProxy modes defaultCredentialsSecret: powermax-creds storageArrays: @@ -49,11 +48,28 @@ global: # Current version of the driver # Don't modify this value as this value will be used by the install script -version: "v2.8.0" +version: "v2.9.0" +# "images" defines every container images used for the driver and its sidecars. +# To use your own images, or a private registry, change the values here. images: # "driver" defines the container image, used for the driver container. - driverRepository: dellemc + driver: dellemc/csi-powermax:v2.9.0 + csireverseproxy: dellemc/csipowermax-reverseproxy:v2.8.0 + # CSI sidecars + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0 + # CSM sidecars + replication: dellemc/dell-csi-replicator:v1.7.0 + authorization: dellemc/csm-authorization-sidecar:v1.9.0 + migration: dellemc/dell-csi-migrator:v1.3.0 + # Node rescan sidecar does a rescan on nodes for identifying new paths + # Default value: dellemc/dell-csi-node-rescanner:v1.0.1 + noderescan: dellemc/dell-csi-node-rescanner:v1.2.0 ## K8S/DRIVER ATTRIBUTES ######################## # customDriverName: If enabled, sets the driver name to the @@ -260,10 +276,6 @@ enableCHAP: false # csireverseproxy: Refers to the subchart csireverseproxy csireverseproxy: - # image: Define the container images used for the reverse proxy - # Default value: None - # Example: "csipowermax-reverseproxy:v2.7.0" - image: dellemc/csipowermax-reverseproxy:v2.7.0 # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key # Default value: None @@ -279,11 +291,6 @@ csireverseproxy: # Default value: None # Examples: "1111", "8080" port: 2222 - # Mode of CSI reverse proxy - this is a standalone API - # it doesn't belong to kubernetes cluster API - # Default value: None - # Example: "StandAlone" - mode: StandAlone # Auto-create TLS certificate for csi-reverseproxy certManager: # Set selfSignedCert to use a self-signed certificate @@ -380,9 +387,6 @@ openshift: false # Default value: "false" replication: enabled: false - # Change this to use any specific version of the dell-csi-replicator sidecar - # Default value: None - image: dellemc/dell-csi-replicator:v1.6.0 # replicationContextPrefix enables side cars to read # required information from the volume context # Default value: "powermax" @@ -401,12 +405,6 @@ replication: # Default value: "false" migration: enabled: false - # Change this to use any specific version of the dell-csi-migrator sidecar - # Default value: None - image: dellemc/dell-csi-migrator:v1.2.0 - # Node rescan sidecar does a rescan on nodes for identifying new paths - # Default value: None - nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.1.0 # migrationPrefix: Determine if migration is enabled # Default value: "migration.storage.dell.com" # Examples: "migration.storage.dell.com" @@ -421,9 +419,6 @@ migration: # Default value: "false" authorization: enabled: false - # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: diff --git a/charts/csi-powerstore/Chart.yaml b/charts/csi-powerstore/Chart.yaml index d7815a98..2d4d5a9e 100644 --- a/charts/csi-powerstore/Chart.yaml +++ b/charts/csi-powerstore/Chart.yaml @@ -14,9 +14,9 @@ # # apiVersion: v2 -appVersion: "2.8.0" +appVersion: "2.9.0" name: csi-powerstore -version: 2.8.0 +version: 2.9.0 description: | PowerStore CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/charts/csi-powerstore/templates/_helpers.tpl b/charts/csi-powerstore/templates/_helpers.tpl index 300585d6..cdbe7ada 100644 --- a/charts/csi-powerstore/templates/_helpers.tpl +++ b/charts/csi-powerstore/templates/_helpers.tpl @@ -1,54 +1,3 @@ -{{/* -Return the appropriate sidecar images based on k8s version -*/}} -{{- define "csi-powerstore.attacherImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powerstore.provisionerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powerstore.snapshotterImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powerstore.resizerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powerstore.registrarImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-powerstore.healthmonitorImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - {{/* Return true if storage capacity tracking is enabled and is supported based on k8s version */}} diff --git a/charts/csi-powerstore/templates/controller.yaml b/charts/csi-powerstore/templates/controller.yaml index 8770c6a2..968ccf61 100644 --- a/charts/csi-powerstore/templates/controller.yaml +++ b/charts/csi-powerstore/templates/controller.yaml @@ -171,6 +171,8 @@ spec: metadata: labels: name: {{ .Release.Name }}-controller + annotations: + kubectl.kubernetes.io/default-container: driver spec: {{ if .Values.controller.nodeSelector }} nodeSelector: @@ -195,7 +197,7 @@ spec: {{- if hasKey .Values "podmon" }} {{- if eq .Values.podmon.enabled true }} - name: podmon - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.controller.args | nindent 12 }} @@ -223,7 +225,7 @@ spec: {{ if .Values.dev.enableTracing }}{{- include "pstore.tracing" . | nindent 8 }}{{ end }} {{- end }} - name: attacher - image: {{ required "Must provide the CSI attacher container image." ( include "csi-powerstore.attacherImage" . ) }} + image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -241,7 +243,7 @@ spec: {{- if hasKey .Values.controller "resizer" }} {{- if eq .Values.controller.resizer.enabled true }} - name: resizer - image: {{ required "Must provide the CSI resizer container image." ( include "csi-powerstore.resizerImage" . ) }} + image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -256,7 +258,7 @@ spec: {{end}} {{end}} - name: provisioner - image: {{ required "Must provide the CSI provisioner container image." ( include "csi-powerstore.provisionerImage" . ) }} + image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -287,7 +289,7 @@ spec: {{- if hasKey .Values.controller "snapshot" }} {{- if eq .Values.controller.snapshot.enabled true }} - name: snapshotter - image: {{ required "Must provide the CSI snapshotter container image." ( include "csi-powerstore.snapshotterImage" . ) }} + image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -305,7 +307,7 @@ spec: {{- if hasKey .Values.controller "vgsnapshot" }} {{- if eq .Values.controller.vgsnapshot.enabled true }} - name: vg-snapshotter - image: {{ required "Must provide the vgsnapshotter container image." .Values.controller.vgsnapshot.image }} + image: {{ required "Must provide the vgsnapshotter container image." .Values.images.vgsnapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: ADDRESS @@ -318,7 +320,7 @@ spec: {{- if hasKey .Values.controller "replication" }} {{- if eq .Values.controller.replication.enabled true}} - name: dell-csi-replicator - image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image}} + image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -346,7 +348,7 @@ spec: {{- if hasKey .Values.controller "healthMonitor" }} {{- if eq .Values.controller.healthMonitor.enabled true}} - name: csi-external-health-monitor-controller - image: {{ required "Must provide the CSI external health monitor controller image." ( include "csi-powerstore.healthmonitorImage" . ) }} + image: {{ required "Must provide the CSI external health monitor controller image." .Values.images.healthmonitor }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--v=5" @@ -365,7 +367,7 @@ spec: {{- end }} {{- end }} - name: csi-metadata-retriever - image: {{ required "Must provide the CSI Metadata retriever container image." .Values.controller.metadataretriever }} + image: {{ required "Must provide the CSI Metadata retriever container image." .Values.images.metadataretriever }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-metadata-retriever" ] env: @@ -380,7 +382,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: {{ required "Must provide the PowerStore driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the PowerStore driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-powerstore" ] env: diff --git a/charts/csi-powerstore/templates/node.yaml b/charts/csi-powerstore/templates/node.yaml index 9771df68..1ee79696 100644 --- a/charts/csi-powerstore/templates/node.yaml +++ b/charts/csi-powerstore/templates/node.yaml @@ -96,6 +96,8 @@ spec: {{- if .Values.podmon.enabled }} driver.dellemc.com: dell-storage {{- end }} + annotations: + kubectl.kubernetes.io/default-container: driver spec: {{ if .Values.node.nodeSelector }} nodeSelector: @@ -118,7 +120,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.node.args | nindent 12 }} @@ -171,7 +173,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the Powerstore driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }} + image: {{ required "Must provide the Powerstore driver image repository." .Values.images.driver }} imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-powerstore" ] env: @@ -264,7 +266,7 @@ spec: - name: powerstore-config-params mountPath: /powerstore-config-params - name: registrar - image: {{ required "Must provide the CSI node registrar container image." ( include "csi-powerstore.registrarImage" . ) }} + image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--v=5" diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml index e025d014..4843fe5e 100644 --- a/charts/csi-powerstore/values.yaml +++ b/charts/csi-powerstore/values.yaml @@ -21,9 +21,28 @@ # Allowed values: string # Default value: None driverName: "csi-powerstore.dellemc.com" +# "version" is used to verify the values file matches driver version +# Not recommend to change +version: v2.9.0 -# Driver version required to pull the latest driver image -version: "v2.8.0" +# "images" defines every container images used for the driver and its sidecars. +# To use your own images, or a private registry, change the values here. +images: + # "driver" defines the container image, used for the driver container. + driver: dellemc/csi-powerstore:v2.9.0 + # CSI sidecars + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0 + + # CSM sidecars + replication: dellemc/dell-csi-replicator:v1.7.0 + vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0 + podmon: dellemc/podmon:v1.8.0 + metadataretriever: dellemc/csi-metadata-retriever:v1.6.0 # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. @@ -103,10 +122,6 @@ controller: # false: disable volume-group-snapshot feature(do not install vg-snapshotter sidecar) # Default value: false enabled: false - # image: Image to use for volume-group-snapshotter. This shouldn't be changed - # Allowed values: string - # Default value: dellemc/csi-volumegroup-snapshotter:v1.3.0 - image: dellemc/csi-volumegroup-snapshotter:v1.3.0 # snapshot: allows to enable/disable snapshot feature # snapshot CRDs needs to be installed before enabling this feature @@ -155,11 +170,6 @@ controller: # Default value: false enabled: false - # image: Image to use for dell-csi-replicator. This shouldn't be changed - # Allowed values: string - # Default value: None - image: dellemc/dell-csi-replicator:v1.6.0 - # replicationContextPrefix: prefix to use for naming of resources created by replication feature # Allowed values: string # Default value: powerstore @@ -170,9 +180,6 @@ controller: # Default value: replication.storage.dell.com replicationPrefix: "replication.storage.dell.com" - # Image for csi-metadata-retriever - metadataretriever: dellemc/csi-metadata-retriever:v1.5.0 - # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -318,7 +325,6 @@ storageCapacity: # Enable this feature only after contact support for additional information podmon: enabled: false - image: dellemc/podmon:v1.7.0 controller: args: - "--csisock=unix:/var/run/csi/csi.sock" @@ -342,7 +348,3 @@ podmon: - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - "--ignoreVolumelessPods=false" - -images: - # "driver" defines the container image, used for the driver container. - driverRepository: dellemc diff --git a/charts/csi-unity/Chart.yaml b/charts/csi-unity/Chart.yaml index e0071cc2..5d9259fd 100644 --- a/charts/csi-unity/Chart.yaml +++ b/charts/csi-unity/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: 2.8.0 +appVersion: 2.9.0 name: csi-unity -version: 2.8.0 +version: 2.9.0 description: | Unity XT CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/charts/csi-unity/templates/_helpers.tpl b/charts/csi-unity/templates/_helpers.tpl index c20b246f..4031377c 100644 --- a/charts/csi-unity/templates/_helpers.tpl +++ b/charts/csi-unity/templates/_helpers.tpl @@ -1,54 +1,3 @@ -{{/* -Return the appropriate sidecar images based on k8s version -*/}} -{{- define "csi-unity.attacherImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-unity.provisionerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-unity.snapshotterImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-unity.resizerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-unity.registrarImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-unity.healthmonitorImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - {{/* Return true if storage capacity tracking is enabled and is supported based on k8s version */}} diff --git a/charts/csi-unity/templates/controller.yaml b/charts/csi-unity/templates/controller.yaml index 2b126072..1f3e2220 100644 --- a/charts/csi-unity/templates/controller.yaml +++ b/charts/csi-unity/templates/controller.yaml @@ -152,7 +152,7 @@ spec: {{- if .Values.podmon.enabled }} - name: podmon imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} args: {{- toYaml .Values.podmon.controller.args | nindent 12 }} env: @@ -175,7 +175,7 @@ spec: mountPath: /unity-config {{- end }} - name: attacher - image: {{ required "Must provide the CSI attacher container image." ( include "csi-unity.attacherImage" . ) }} + image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -187,7 +187,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: {{ required "Must provide the CSI provisioner container image." ( include "csi-unity.provisionerImage" . ) }} + image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }} args: - "--csi-address=$(ADDRESS)" - "--volume-name-prefix={{ required "Must provide a Volume Name Prefix." .Values.controller.volumeNamePrefix }}" @@ -220,7 +220,7 @@ spec: {{- if hasKey .Values.controller "snapshot" }} {{- if eq .Values.controller.snapshot.enabled true }} - name: snapshotter - image: {{ required "Must provide the CSI snapshotter container image. " ( include "csi-unity.snapshotterImage" . ) }} + image: {{ required "Must provide the CSI snapshotter container image. " .Values.images.snapshotter }} args: - "--csi-address=$(ADDRESS)" - "--snapshot-name-prefix={{ required "Must privided a Snapshot Name Prefix" .Values.controller.snapshot.snapNamePrefix }}" @@ -239,7 +239,7 @@ spec: {{- if hasKey .Values.controller "resizer" }} {{- if eq .Values.controller.resizer.enabled true }} - name: resizer - image: {{ required "Must provide the CSI resizer container image." ( include "csi-unity.resizerImage" . ) }} + image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }} args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -255,7 +255,7 @@ spec: {{- if hasKey .Values.controller "healthMonitor" }} {{- if eq .Values.controller.healthMonitor.enabled true }} - name: csi-external-health-monitor-controller - image: {{ required "Must provide the CSI external health monitor image." ( include "csi-unity.healthmonitorImage" . ) }} + image: {{ required "Must provide the CSI external health monitor image." .Values.images.healthmonitor }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--v=5" @@ -274,7 +274,7 @@ spec: {{- end }} {{- end }} - name: driver - image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}" + image: "{{ required "Must provide the driver image repository." .Values.images.driver }}" args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" diff --git a/charts/csi-unity/templates/node.yaml b/charts/csi-unity/templates/node.yaml index d013812e..9358b0cd 100644 --- a/charts/csi-unity/templates/node.yaml +++ b/charts/csi-unity/templates/node.yaml @@ -97,7 +97,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true imagePullPolicy: {{ .Values.imagePullPolicy }} - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} args: {{- toYaml .Values.podmon.node.args | nindent 12 }} env: @@ -145,7 +145,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}" + image: "{{ required "Must provide the driver image repository." .Values.images.driver }}" args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" @@ -204,7 +204,7 @@ spec: - name: unity-secret mountPath: /unity-secret - name: registrar - image: {{ required "Must provide the CSI registrar container image." ( include "csi-unity.registrarImage" . ) }} + image: {{ required "Must provide the CSI registrar container image." .Values.images.registrar }} args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/charts/csi-unity/values.yaml b/charts/csi-unity/values.yaml index 56825fae..c311a19f 100644 --- a/charts/csi-unity/values.yaml +++ b/charts/csi-unity/values.yaml @@ -3,8 +3,22 @@ # version: version of this values file # Note: Do not change this value -# Examples : "v2.8.0" , "nightly" -version: "v2.8.0" +# Examples : "v2.9.0" , "nightly" +version: "v2.9.0" + +images: + # "driver" defines the container image, used for the driver container. + driver: dellemc/csi-unity:v2.9.0 + # CSI sidecars + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0 + + # CSM sidecars + podmon: dellemc/podmon:v1.8.0 # LogLevel is used to set the logging level of the driver. # Allowed values: "error", "warn"/"warning", "info", "debug" @@ -190,11 +204,6 @@ podmon: # defaule value : None # Examples : true , false enabled: false - # image - image name - # allowed values - string - # default value : None - # Example : "podman:latest", "pod:latest" - image: dellemc/podmon:v1.7.0 controller: args: - "--csisock=unix:/var/run/csi/csi.sock" @@ -255,7 +264,3 @@ storageCapacity: # Allowed values: 1m,2m,3m,...,10m,...,60m etc # Default value: 5m pollInterval: 5m - -images: - # "driver" defines the container image, used for the driver container. - driverRepository: dellemc diff --git a/charts/csi-vxflexos/Chart.yaml b/charts/csi-vxflexos/Chart.yaml index adc4da24..9857da49 100644 --- a/charts/csi-vxflexos/Chart.yaml +++ b/charts/csi-vxflexos/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: "2.8.0" +appVersion: "2.9.0" name: csi-vxflexos -version: "2.8.0" +version: "2.9.0" description: | VxFlex OS CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/charts/csi-vxflexos/templates/_helpers.tpl b/charts/csi-vxflexos/templates/_helpers.tpl index 621f38fc..a7df6b37 100644 --- a/charts/csi-vxflexos/templates/_helpers.tpl +++ b/charts/csi-vxflexos/templates/_helpers.tpl @@ -1,61 +1,10 @@ -{{/* -Return the appropriate sidecar images based on k8s version -*/}} -{{- define "csi-vxflexos.attacherImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-attacher:v4.3.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-vxflexos.provisionerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-provisioner:v3.5.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-vxflexos.snapshotterImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-vxflexos.resizerImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-resizer:v1.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-vxflexos.registrarImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{- define "csi-vxflexos.healthmonitorImage" -}} - {{- if eq .Capabilities.KubeVersion.Major "1" }} - {{- if and (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "21") (le (trimSuffix "+" .Capabilities.KubeVersion.Minor) "28") -}} - {{- print "registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0" -}} - {{- end -}} - {{- end -}} -{{- end -}} - {{/* Return true if storage capacity tracking is enabled and is supported based on k8s version */}} {{- define "csi-vxflexos.isStorageCapacitySupported" -}} -{{- if eq .Values.storageCapacity.enabled true -}} - {{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}} - {{- true -}} + {{- if eq .Values.storageCapacity.enabled true -}} + {{- if and (eq .Capabilities.KubeVersion.Major "1") (ge (trimSuffix "+" .Capabilities.KubeVersion.Minor) "24") -}} + {{- true -}} + {{- end -}} {{- end -}} -{{- end -}} {{- end -}} \ No newline at end of file diff --git a/charts/csi-vxflexos/templates/controller.yaml b/charts/csi-vxflexos/templates/controller.yaml index 6cb80cb2..d308cc00 100644 --- a/charts/csi-vxflexos/templates/controller.yaml +++ b/charts/csi-vxflexos/templates/controller.yaml @@ -145,7 +145,7 @@ metadata: {{- if hasKey .Values "authorization" }} {{- if eq .Values.authorization.enabled true }} annotations: - com.dell.karavi-authorization-proxy: "true" + com.dell.karavi-authorization-proxy: "true" {{ end }} {{ end }} spec: @@ -167,6 +167,8 @@ spec: vg-snapshotter-enabled: "false" {{- end }} name: {{ .Release.Name }}-controller + annotations: + kubectl.kubernetes.io/default-container: "driver" spec: affinity: nodeSelector: @@ -192,7 +194,7 @@ spec: {{- if hasKey .Values "podmon" }} {{- if eq .Values.podmon.enabled true }} - name: podmon - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.controller.args | nindent 12 }} @@ -217,7 +219,7 @@ spec: {{- end }} {{- end }} - name: attacher - image: {{ required "Must provide the CSI attacher container image." ( include "csi-vxflexos.attacherImage" . ) }} + image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -232,7 +234,7 @@ spec: {{- if hasKey .Values.controller "replication" }} {{- if eq .Values.controller.replication.enabled true}} - name: dell-csi-replicator - image: {{ required "Must provide the Dell CSI Replicator image." .Values.controller.replication.image}} + image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -258,7 +260,7 @@ spec: {{- end }} {{- end }} - name: provisioner - image: {{ required "Must provide the CSI provisioner container image." ( include "csi-vxflexos.provisionerImage" . ) }} + image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -290,7 +292,7 @@ spec: {{- if hasKey .Values.controller "healthMonitor" }} {{- if eq .Values.controller.healthMonitor.enabled true}} - name: csi-external-health-monitor-controller - image: {{ required "Must provide the CSI external health monitor image." ( include "csi-vxflexos.healthmonitorImage" . ) }} + image: {{ required "Must provide the CSI external health monitor image." .Values.images.healthmonitor }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -311,7 +313,7 @@ spec: {{- if hasKey .Values "vgsnapshotter" }} {{- if eq .Values.vgsnapshotter.enabled true }} - name: vg-snapshotter - image: {{ required "Must provide the vgsnapshotter container image." .Values.vgsnapshotter.image }} + image: {{ required "Must provide the vgsnapshotter container image." .Values.images.vgsnapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: ADDRESS @@ -324,7 +326,7 @@ spec: {{- if hasKey .Values.controller "snapshot" }} {{- if eq .Values.controller.snapshot.enabled true }} - name: snapshotter - image: {{ required "Must provide the CSI snapshotter container image. " ( include "csi-vxflexos.snapshotterImage" . ) }} + image: {{ required "Must provide the CSI snapshotter container image. " .Values.images.snapshotter }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -342,7 +344,7 @@ spec: {{- if hasKey .Values.controller "resizer" }} {{- if eq .Values.controller.resizer.enabled true }} - name: resizer - image: {{ required "Must provide the CSI resizer container image." ( include "csi-vxflexos.resizerImage" . ) }} + image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--csi-address=$(ADDRESS)" @@ -359,7 +361,7 @@ spec: {{- if hasKey .Values "authorization" }} {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: PROXY_HOST @@ -388,7 +390,7 @@ spec: {{- end }} {{- end }} - name: driver - image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}" + image: "{{ required "Must provide the driver image repository." .Values.images.driver }}" imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-vxflexos.sh" ] args: @@ -426,6 +428,8 @@ spec: value: "{{ .Values.enableQuota }}" {{- end }} {{- end }} + - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS + value: {{ .Values.externalAccess }} volumeMounts: - name: socket-dir mountPath: /var/run/csi @@ -468,4 +472,4 @@ spec: - key: cert-{{ $e }} path: cert-{{ $e }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/csi-vxflexos/templates/node.yaml b/charts/csi-vxflexos/templates/node.yaml index 44806fb0..80c898dc 100644 --- a/charts/csi-vxflexos/templates/node.yaml +++ b/charts/csi-vxflexos/templates/node.yaml @@ -80,6 +80,8 @@ spec: {{- if eq .Values.podmon.enabled true }} driver.dellemc.com: dell-storage {{- end }} + annotations: + kubectl.kubernetes.io/default-container: "driver" spec: {{- if .Values.node.nodeSelector }} nodeSelector: @@ -106,7 +108,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: {{ required "Must provide the podmon container image." .Values.podmon.image }} + image: {{ required "Must provide the podmon container image." .Values.images.podmon }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: {{- toYaml .Values.podmon.node.args | nindent 12 }} @@ -148,7 +150,7 @@ spec: {{- if hasKey .Values "authorization" }} {{- if eq .Values.authorization.enabled true }} - name: karavi-authorization-proxy - image: {{ required "Must provide the authorization sidecar container image." .Values.authorization.sidecarProxyImage }} + image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }} imagePullPolicy: {{ .Values.imagePullPolicy }} env: - name: PROXY_HOST @@ -182,7 +184,7 @@ spec: allowPrivilegeEscalation: true capabilities: add: ["SYS_ADMIN"] - image: "{{ required "Must provide the driver image repository." .Values.images.driverRepository }}/{{ .Chart.Name }}:{{ .Values.version }}" + image: "{{ required "Must provide the driver image repository." .Values.images.driver }}" imagePullPolicy: {{ .Values.imagePullPolicy }} command: [ "/csi-vxflexos.sh" ] args: @@ -226,6 +228,8 @@ spec: - name: pods-path mountPath: {{ .Values.kubeletConfigDir }}/pods mountPropagation: "Bidirectional" + - name: noderoot + mountPath: /noderoot - name: dev mountPath: /dev - name: vxflexos-config @@ -238,7 +242,7 @@ spec: readOnly: true {{- end}} - name: registrar - image: {{ required "Must provide the CSI registrar container image." ( include "csi-vxflexos.registrarImage" . ) }} + image: {{ required "Must provide the CSI registrar container image." .Values.images.registrar }} imagePullPolicy: {{ .Values.imagePullPolicy }} args: - "--v=5" @@ -342,6 +346,10 @@ spec: hostPath: path: {{ .Values.kubeletConfigDir }}/pods type: Directory + - name: noderoot + hostPath: + path: / + type: Directory - name: dev hostPath: path: /dev diff --git a/charts/csi-vxflexos/values.yaml b/charts/csi-vxflexos/values.yaml index 6c0052d2..7cfab7be 100644 --- a/charts/csi-vxflexos/values.yaml +++ b/charts/csi-vxflexos/values.yaml @@ -3,15 +3,28 @@ # "version" is used to verify the values file matches driver version # Not recommend to change -version: v2.8.0 +version: v2.9.0 + +# "images" defines every container images used for the driver and its sidecars. +# To use your own images, or a private registry, change the values here. images: # "driver" defines the container image, used for the driver container. - driverRepository: dellemc - + driver: dellemc/csi-vxflexos:v2.9.0 # "powerflexSdc" defines the SDC image for init container. - powerflexSdc: dellemc/sdc:3.6.1 - + powerflexSdc: dellemc/sdc:4.5 + # CSI sidecars + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.4.2 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v3.6.2 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.2 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.9.2 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.10.0 + # CSM sidecars + replication: dellemc/dell-csi-replicator:v1.7.0 + vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0 + podmon: dellemc/podmon:v1.8.0 + authorization: dellemc/csm-authorization-sidecar:v1.9.0 # Represents number of certificate secrets, which user is going to create for ssl authentication. (vxflexos-cert-0..vxflexos-cert-n) # If user does not use certificate, set to 0 @@ -46,6 +59,11 @@ defaultFsType: ext4 # Default value: None imagePullPolicy: IfNotPresent +# externalAccess: allows to specify additional entries for hostAccess of NFS volumes. Both single IP address and subnet are valid entries. +# Allowed Values: x.x.x.x/xx or x.x.x.x +# Default Value: None +externalAccess: + # enableQuota: a boolean that, when enabled, will set quota limit for a newly provisioned NFS volume. # Allowed values: # true: set quota for volume @@ -107,11 +125,6 @@ controller: # Default value: false enabled: false - # image: Image to use for dell-csi-replicator. This shouldn't be changed - # Allowed values: string - # Default value: None - image: dellemc/dell-csi-replicator:v1.6.0 - # replicationContextPrefix: prefix to use for naming of resources created by replication feature # Allowed values: string # Default value: powerflex @@ -301,31 +314,30 @@ monitor: # These options control the running of the vgsnapshotter container vgsnapshotter: enabled: false - image: dellemc/csi-volumegroup-snapshotter:v1.3.0 # Podmon is an optional feature under development and tech preview. # Enable this feature only after contact support for additional information podmon: enabled: false - image: dellemc/podmon:v1.7.0 - #controller: - # args: - # - "--csisock=unix:/var/run/csi/csi.sock" - # - "--labelvalue=csi-vxflexos" - # - "--mode=controller" - # - "--skipArrayConnectionValidation=false" - # - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - # - "--driverPodLabelValue=dell-storage" - # - "--ignoreVolumelessPods=false" - #node: - # args: - # - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - # - "--labelvalue=csi-vxflexos" - # - "--mode=node" - # - "--leaderelection=false" - # - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - # - "--driverPodLabelValue=dell-storage" - # - "--ignoreVolumelessPods=false" + + controller: + args: + - "--csisock=unix:/var/run/csi/csi.sock" + - "--labelvalue=csi-vxflexos" + - "--mode=controller" + - "--skipArrayConnectionValidation=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" + node: + args: + - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + - "--labelvalue=csi-vxflexos" + - "--mode=node" + - "--leaderelection=false" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + - "--driverPodLabelValue=dell-storage" + - "--ignoreVolumelessPods=false" # CSM module attributes # authorization: enable csm-authorization for RBAC @@ -337,10 +349,6 @@ podmon: authorization: enabled: false - # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 - # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -350,4 +358,4 @@ authorization: # "true" - TLS certificate verification will be skipped # "false" - TLS certificate will be verified # Default value: "true" - skipCertificateValidation: true \ No newline at end of file + skipCertificateValidation: true diff --git a/charts/csm-authorization/Chart.yaml b/charts/csm-authorization/Chart.yaml index 21dbf905..ac692b3d 100644 --- a/charts/csm-authorization/Chart.yaml +++ b/charts/csm-authorization/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: csm-authorization -version: 1.8.0 -appVersion: 1.8.0 +version: 1.9.0 +appVersion: 1.9.0 type: application description: | CSM for Authorization is part of the [Container Storage Modules](https://github.com/dell/csm) open source suite of Kubernetes diff --git a/charts/csm-authorization/values.yaml b/charts/csm-authorization/values.yaml index c07ff9b8..20967512 100644 --- a/charts/csm-authorization/values.yaml +++ b/charts/csm-authorization/values.yaml @@ -11,10 +11,10 @@ cert-manager: authorization: # images to use in installation images: - proxyService: dellemc/csm-authorization-proxy:v1.8.0 - tenantService: dellemc/csm-authorization-tenant:v1.8.0 - roleService: dellemc/csm-authorization-role:v1.8.0 - storageService: dellemc/csm-authorization-storage:v1.8.0 + proxyService: dellemc/csm-authorization-proxy:v1.9.0 + tenantService: dellemc/csm-authorization-tenant:v1.9.0 + roleService: dellemc/csm-authorization-role:v1.9.0 + storageService: dellemc/csm-authorization-storage:v1.9.0 opa: openpolicyagent/opa opaKubeMgmt: openpolicyagent/kube-mgmt:0.11 diff --git a/charts/csm-replication/Chart.yaml b/charts/csm-replication/Chart.yaml index a287568b..df1214e8 100644 --- a/charts/csm-replication/Chart.yaml +++ b/charts/csm-replication/Chart.yaml @@ -3,5 +3,5 @@ name: csm-replication type: application description: | CSM for Replication helm charts -version: 1.6.0 -appVersion: "1.6.0" +version: 1.7.0 +appVersion: "1.7.0" diff --git a/charts/csm-replication/values.yaml b/charts/csm-replication/values.yaml index c49882b5..a670480b 100644 --- a/charts/csm-replication/values.yaml +++ b/charts/csm-replication/values.yaml @@ -5,7 +5,7 @@ replicas: 1 # image: Defines controller image. This shouldn't be changed # Allowed values: string -image: dellemc/dell-replication-controller:v1.6.0 +image: dellemc/dell-replication-controller:v1.7.0 # logLevel: Defines initial log level for controller. This can be changed in runtime # Allowed values: "debug", "info", "warn", "error", "panic" diff --git a/charts/karavi-observability/Chart.yaml b/charts/karavi-observability/Chart.yaml index d15b0f5e..78d715f6 100644 --- a/charts/karavi-observability/Chart.yaml +++ b/charts/karavi-observability/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: "1.6.0" +appVersion: "1.7.0" name: karavi-observability description: CSM for Observability is part of the [Container Storage Modules](https://github.com/dell/csm) open source suite of Kubernetes storage enablers for Dell EMC storage products. CSM for Observability provides Kubernetes administrators with visibility into metrics and topology data related to containerized storage. type: application -version: 1.6.0 +version: 1.7.0 dependencies: - name: cert-manager version: 1.10.0 diff --git a/charts/karavi-observability/values.yaml b/charts/karavi-observability/values.yaml index c47aecbc..51f97b95 100644 --- a/charts/karavi-observability/values.yaml +++ b/charts/karavi-observability/values.yaml @@ -1,5 +1,5 @@ karaviTopology: - image: dellemc/csm-topology:v1.6.0 + image: dellemc/csm-topology:v1.7.0 enabled: true # comma separated list of provisioner names (ex: csi-vxflexos.dellemc.com) provisionerNames: csi-vxflexos.dellemc.com,csi-powerstore.dellemc.com,csi-isilon.dellemc.com,csi-powermax.dellemc.com @@ -13,7 +13,7 @@ karaviTopology: probability: 0.0 karaviMetricsPowerflex: - image: dellemc/csm-metrics-powerflex:v1.6.0 + image: dellemc/csm-metrics-powerflex:v1.7.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-vxflexos.dellemc.com) @@ -40,8 +40,8 @@ karaviMetricsPowerflex: authorization: enabled: false # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 + # Default value: dellemc/csm-authorization-sidecar:v1.9.0 + sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.9.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -53,7 +53,7 @@ karaviMetricsPowerflex: skipCertificateValidation: true karaviMetricsPowerstore: - image: dellemc/csm-metrics-powerstore:v1.6.0 + image: dellemc/csm-metrics-powerstore:v1.7.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-powerstore.dellemc.com) @@ -79,7 +79,7 @@ karaviMetricsPowerstore: probability: 0.0 karaviMetricsPowerscale: - image: dellemc/csm-metrics-powerscale:v1.3.0 + image: dellemc/csm-metrics-powerscale:v1.4.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-isilon.dellemc.com) @@ -116,8 +116,8 @@ karaviMetricsPowerscale: authorization: enabled: false # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 + # Default value: dellemc/csm-authorization-sidecar:v1.9.0 + sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.9.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -129,7 +129,7 @@ karaviMetricsPowerscale: skipCertificateValidation: true karaviMetricsPowermax: - image: dellemc/csm-metrics-powermax:v1.1.0 + image: dellemc/csm-metrics-powermax:v1.2.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-powermax.dellemc.com) @@ -153,8 +153,8 @@ karaviMetricsPowermax: authorization: enabled: false # sidecarProxyImage: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.8.0 - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 + # Default value: dellemc/csm-authorization-sidecar:v1.9.0 + sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.9.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: