Release v1.12.0 (#549)

* [charts/csm-authorization] Add redis as a chart dependency (#480) * add redis as a chart dependency * update depdencies * Enable dependabot for version updates (#479) * Enable dependabot for version updates This PR includes a dependabot configuration file that instructs dependabot to look for version updates to container images in the following charts: - csi-vxflexos - csm-authorization - karavi-observability Other charts can be updated by following a similar pattern to alter the chart values and templates, and then adding the chart to the .github/dependabot file. Tested by running `helm template --dependency-update <chart-name>` and manually inspecting the resulting yaml for proper image specifications. Signed-off-by: Eric Young <[email protected]> --------- Signed-off-by: Eric Young <[email protected]> * [charts/csm-authorization-v2.0] Support multiple instances of vault (#485) * support multiple vaults * update comments * fix spacing * Bump the csm-authorization group across 1 directory with 2 updates (#482) * Bump the csm-authorization group across 1 directory with 2 updates Bumps the csm-authorization group with 2 updates in the /charts/csm-authorization directory: openpolicyagent/kube-mgmt and redis. Updates `openpolicyagent/kube-mgmt` from 0.11 to 8.5.7 Updates `redis` from 6.0.8-alpine to 7.4.0-alpine --- updated-dependencies: - dependency-name: openpolicyagent/kube-mgmt dependency-type: direct:production update-type: version-update:semver-major dependency-group: csm-authorization - dependency-name: redis dependency-type: direct:production update-type: version-update:semver-major dependency-group: csm-authorization ... Signed-off-by: dependabot[bot] <[email protected]> * update policy for kube-mgmt to read in for opa * make same updates for v2 * update redis image --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: root <[email protected]> * Bump the csi-vxflexos group across 1 directory with 3 updates (#483) Bumps the csi-vxflexos group with 3 updates in the /charts/csi-vxflexos directory: sig-storage/csi-provisioner, sig-storage/csi-resizer and sig-storage/csi-node-driver-registrar. Updates `sig-storage/csi-provisioner` from v5.0.1 to v5.0.2 Updates `sig-storage/csi-resizer` from v1.11.1 to v1.11.2 Updates `sig-storage/csi-node-driver-registrar` from v2.10.1 to v2.11.1 --- updated-dependencies: - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-vxflexos ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Removing commented line from csi-isilon controller yaml. (#487) * Authorization v2 update storage crd with isiPath for powerscale support (#488) * Update storage crd with isiPath * Add description for CR parameters * csi-vxflexos version bump up (#490) * Bump the csi-vxflexos group across 1 directory with 4 updates (#493) Bumps the csi-vxflexos group with 4 updates in the /charts/csi-vxflexos directory: sig-storage/csi-attacher, sig-storage/csi-provisioner, sig-storage/csi-resizer and sig-storage/csi-node-driver-registrar. Updates `sig-storage/csi-attacher` from v4.6.1 to v4.7.0 Updates `sig-storage/csi-provisioner` from v5.0.2 to v5.1.0 Updates `sig-storage/csi-resizer` from v1.11.2 to v1.12.0 Updates `sig-storage/csi-node-driver-registrar` from v2.11.1 to v2.12.0 --- updated-dependencies: - dependency-name: sig-storage/csi-attacher dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-vxflexos ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump openpolicyagent/kube-mgmt (#492) Bumps the csm-authorization group with 1 update in the /charts/csm-authorization directory: openpolicyagent/kube-mgmt. Updates `openpolicyagent/kube-mgmt` from 8.5.7 to 8.5.8 --- updated-dependencies: - dependency-name: openpolicyagent/kube-mgmt dependency-type: direct:production update-type: version-update:semver-patch dependency-group: csm-authorization ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [charts/csm-authorization-v2.0] Enable dependabot for authorization v2 (#494) * enable dependabot for auth v2 * combine into one * Adding dependabot compatibility for csi-isilon images (#489) * Cherry-picked .github/dependabot.yaml from 6e0b47d (#481) * update isilon images for dependabot * updating dependabot.yaml for isilon * remove trailing spaces * add missing period --------- Co-authored-by: Eric Young <[email protected]> * Bump openpolicyagent/kube-mgmt (#496) Bumps the csm-authorization group with 1 update in the /charts/csm-authorization-v2.0 directory: openpolicyagent/kube-mgmt. Updates `openpolicyagent/kube-mgmt` from 8.5.7 to 8.5.8 --- updated-dependencies: - dependency-name: openpolicyagent/kube-mgmt dependency-type: direct:production update-type: version-update:semver-patch dependency-group: csm-authorization ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * charts/csi-unity version bump up (#498) * Bump nginxinc/nginx-unprivileged (#484) Bumps the karavi-observability group with 1 update in the /charts/karavi-observability directory: nginxinc/nginx-unprivileged. Updates `nginxinc/nginx-unprivileged` from 1.20 to 1.27 --- updated-dependencies: - dependency-name: nginxinc/nginx-unprivileged dependency-type: direct:production update-type: version-update:semver-minor dependency-group: karavi-observability ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * add coordination.k8s.io access for observability (#502) * Update the CRD versions to v1 (#503) * Add dependabot compatibility for csi-powerstore images (#505) * Add dependabot compatibility for csi-powerstore images * Update dependabot.yml * Adding dependabot compatibility for csi-unity (#508) * Adding dependabot compatibility for csi-unity * removing trailing spaces * Bump the csi-powerstore group across 1 directory with 6 updates (#507) Bumps the csi-powerstore group with 6 updates in the /charts/csi-powerstore directory: | Package | From | To | | --- | --- | --- | | sig-storage/csi-attacher | `v4.6.1` | `v4.7.0` | | sig-storage/csi-provisioner | `v5.0.1` | `v5.1.0` | | sig-storage/csi-snapshotter | `v8.0.1` | `v8.1.0` | | sig-storage/csi-resizer | `v1.11.1` | `v1.12.0` | | sig-storage/csi-node-driver-registrar | `v2.10.1` | `v2.12.0` | | sig-storage/csi-external-health-monitor-controller | `v0.12.1` | `v0.13.0` | Updates `sig-storage/csi-attacher` from v4.6.1 to v4.7.0 Updates `sig-storage/csi-provisioner` from v5.0.1 to v5.1.0 Updates `sig-storage/csi-snapshotter` from v8.0.1 to v8.1.0 Updates `sig-storage/csi-resizer` from v1.11.1 to v1.12.0 Updates `sig-storage/csi-node-driver-registrar` from v2.10.1 to v2.12.0 Updates `sig-storage/csi-external-health-monitor-controller` from v0.12.1 to v0.13.0 --- updated-dependencies: - dependency-name: sig-storage/csi-attacher dependency-type: direct:production dependency-group: csi-powerstore - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-powerstore - dependency-name: sig-storage/csi-snapshotter dependency-type: direct:production dependency-group: csi-powerstore - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-powerstore - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-powerstore - dependency-name: sig-storage/csi-external-health-monitor-controller dependency-type: direct:production dependency-group: csi-powerstore ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the csi-vxflexos group across 1 directory with 2 updates (#501) Bumps the csi-vxflexos group with 2 updates in the /charts/csi-vxflexos directory: sig-storage/csi-snapshotter and sig-storage/csi-external-health-monitor-controller. Updates `sig-storage/csi-snapshotter` from v8.0.1 to v8.1.0 Updates `sig-storage/csi-external-health-monitor-controller` from v0.12.1 to v0.13.0 --- updated-dependencies: - dependency-name: sig-storage/csi-snapshotter dependency-type: direct:production dependency-group: csi-vxflexos - dependency-name: sig-storage/csi-external-health-monitor-controller dependency-type: direct:production dependency-group: csi-vxflexos ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the csi-isilon group across 1 directory with 6 updates (#500) Bumps the csi-isilon group with 6 updates in the /charts/csi-isilon directory: | Package | From | To | | --- | --- | --- | | sig-storage/csi-attacher | `v4.6.1` | `v4.7.0` | | sig-storage/csi-provisioner | `v5.0.1` | `v5.1.0` | | sig-storage/csi-snapshotter | `v8.0.1` | `v8.1.0` | | sig-storage/csi-resizer | `v1.11.1` | `v1.12.0` | | sig-storage/csi-node-driver-registrar | `v2.10.1` | `v2.12.0` | | sig-storage/csi-external-health-monitor-controller | `v0.12.1` | `v0.13.0` | Updates `sig-storage/csi-attacher` from v4.6.1 to v4.7.0 Updates `sig-storage/csi-provisioner` from v5.0.1 to v5.1.0 Updates `sig-storage/csi-snapshotter` from v8.0.1 to v8.1.0 Updates `sig-storage/csi-resizer` from v1.11.1 to v1.12.0 Updates `sig-storage/csi-node-driver-registrar` from v2.10.1 to v2.12.0 Updates `sig-storage/csi-external-health-monitor-controller` from v0.12.1 to v0.13.0 --- updated-dependencies: - dependency-name: sig-storage/csi-attacher dependency-type: direct:production dependency-group: csi-isilon - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-isilon - dependency-name: sig-storage/csi-snapshotter dependency-type: direct:production dependency-group: csi-isilon - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-isilon - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-isilon - dependency-name: sig-storage/csi-external-health-monitor-controller dependency-type: direct:production dependency-group: csi-isilon ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * charts/container-storage-modules updated podmon version (#504) * updated podmon version * update replication version * Update Chart.yaml * updated replication versions * updated replication versions * updated replication versions * bump observability version * fix instruction link --------- Co-authored-by: Chiman Jain <[email protected]> * Add flag to enable or disable the SDC init container (#511) * Bump the csi-unity group across 1 directory with 6 updates (#510) Bumps the csi-unity group with 6 updates in the /charts/csi-unity directory: | Package | From | To | | --- | --- | --- | | sig-storage/csi-attacher | `v4.6.1` | `v4.7.0` | | sig-storage/csi-provisioner | `v5.0.1` | `v5.1.0` | | sig-storage/csi-snapshotter | `v8.0.1` | `v8.1.0` | | sig-storage/csi-resizer | `v1.11.1` | `v1.12.0` | | sig-storage/csi-node-driver-registrar | `v2.10.1` | `v2.12.0` | | sig-storage/csi-external-health-monitor-controller | `v0.12.1` | `v0.13.0` | Updates `sig-storage/csi-attacher` from v4.6.1 to v4.7.0 Updates `sig-storage/csi-provisioner` from v5.0.1 to v5.1.0 Updates `sig-storage/csi-snapshotter` from v8.0.1 to v8.1.0 Updates `sig-storage/csi-resizer` from v1.11.1 to v1.12.0 Updates `sig-storage/csi-node-driver-registrar` from v2.10.1 to v2.12.0 Updates `sig-storage/csi-external-health-monitor-controller` from v0.12.1 to v0.13.0 --- updated-dependencies: - dependency-name: sig-storage/csi-attacher dependency-type: direct:production dependency-group: csi-unity - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-unity - dependency-name: sig-storage/csi-snapshotter dependency-type: direct:production dependency-group: csi-unity - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-unity - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-unity - dependency-name: sig-storage/csi-external-health-monitor-controller dependency-type: direct:production dependency-group: csi-unity ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [charts/csm-authorization-v2.0]: Add OTEL Collector address to storage-service and expose prometheus metrics (#512) * Cherry-picked .github/dependabot.yaml from 6e0b47d (#481) * [charts/csm-authorization-v2.0] Enable dependabot for authorization v2 (#495) * add dependabot config * combine into one * updating dependabot.yaml for isilon (#491) * Add dependabot compatibility for csi-powerstore images (#506) * Add dependabot compatibility for csi-powerstore images * Update dependabot.yml * Adding dependabot compatibility for csi-unity (#509) * Adding dependabot compatibility for csi-unity * Adding dependabot compatibility for csi-unity * Adding dependabot compatibility for csi-unity * add collector address * remove depdendabot --------- Co-authored-by: Eric Young <[email protected]> Co-authored-by: shaynafinocchiaro <[email protected]> Co-authored-by: aqu-dell <[email protected]> Co-authored-by: Akshay Saini <[email protected]> Co-authored-by: sakshi-garg1 <[email protected]> * Enable SDC by default if not explicitly set (#513) * Add dependabot compatibility for csi-powermax images (#515) * Bump the csi-powermax group across 1 directory with 6 updates (#526) Bumps the csi-powermax group with 6 updates in the /charts/csi-powermax directory: | Package | From | To | | --- | --- | --- | | sig-storage/csi-attacher | `v4.6.1` | `v4.7.0` | | sig-storage/csi-provisioner | `v5.0.1` | `v5.1.0` | | sig-storage/csi-snapshotter | `v8.0.1` | `v8.1.0` | | sig-storage/csi-resizer | `v1.11.1` | `v1.12.0` | | sig-storage/csi-node-driver-registrar | `v2.10.1` | `v2.12.0` | | sig-storage/csi-external-health-monitor-controller | `v0.12.1` | `v0.13.0` | Updates `sig-storage/csi-attacher` from v4.6.1 to v4.7.0 Updates `sig-storage/csi-provisioner` from v5.0.1 to v5.1.0 Updates `sig-storage/csi-snapshotter` from v8.0.1 to v8.1.0 Updates `sig-storage/csi-resizer` from v1.11.1 to v1.12.0 Updates `sig-storage/csi-node-driver-registrar` from v2.10.1 to v2.12.0 Updates `sig-storage/csi-external-health-monitor-controller` from v0.12.1 to v0.13.0 --- updated-dependencies: - dependency-name: sig-storage/csi-attacher dependency-type: direct:production dependency-group: csi-powermax - dependency-name: sig-storage/csi-provisioner dependency-type: direct:production dependency-group: csi-powermax - dependency-name: sig-storage/csi-snapshotter dependency-type: direct:production dependency-group: csi-powermax - dependency-name: sig-storage/csi-resizer dependency-type: direct:production dependency-group: csi-powermax - dependency-name: sig-storage/csi-node-driver-registrar dependency-type: direct:production dependency-group: csi-powermax - dependency-name: sig-storage/csi-external-health-monitor-controller dependency-type: direct:production dependency-group: csi-powermax ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Adding Interfaces for disabling SDC dependency on Powerflex NFS Volumes (#528) * Making SDC optional for Powerflex NFS Volumes * Resolve formatting issue * Removed encryption (#533) * [charts/csm-installer] Adding dependabot compatibility for csm-installer images (#532) * adding image tag * csm-installer depedabot yml update * Removing trailing whitespace * add label (#535) * Bump dellemc/csi-powerstore (#521) * Bump the csm-authorization group across 2 directories with 2 updates (#534) * vgs version update (#536) * [installation-wizard/container-storage-modules] Adding dependabot compatibility for installation-wizard charts (#537) * Add dependabot target * Update installation wizard values * Fix linting issues --------- Co-authored-by: Don Khan <[email protected]> * driver version bump (#540) * updating image references to quay.io (#539) * refer quay.io * fix * fix lint * fixing yaml lint issues * remove csm-installer * linetr fix * driver version bump * reverseproxy chart bump * fixed the linter issue Signed-off-by: Bahubali Jain <[email protected]> --------- Signed-off-by: Bahubali Jain <[email protected]> Co-authored-by: shefali-malhotra <[email protected]> Co-authored-by: Surya <[email protected]> Co-authored-by: Bahubali Jain <[email protected]> Co-authored-by: shefali-malhotra <[email protected]> * update auth for 1.12 (#541) * updated replication version (#542) * Update missed replication version updates (#544) * Add disks path to vxflexos node (#545) * Bump dell/container-storage-modules/csi-metadata-retriever (#546) Bumps the container-storage-modules group with 1 update in the /installation-wizard/container-storage-modules directory: dell/container-storage-modules/csi-metadata-retriever. Updates `dell/container-storage-modules/csi-metadata-retriever` from v1.8.0 to v1.9.0 --- updated-dependencies: - dependency-name: dell/container-storage-modules/csi-metadata-retriever dependency-type: direct:production dependency-group: container-storage-modules ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump dell/container-storage-modules/csi-metadata-retriever (#548) Bumps the csi-powerstore group with 1 update in the /charts/csi-powerstore directory: dell/container-storage-modules/csi-metadata-retriever. Updates `dell/container-storage-modules/csi-metadata-retriever` from v1.8.0 to v1.9.0 --- updated-dependencies: - dependency-name: dell/container-storage-modules/csi-metadata-retriever dependency-type: direct:production dependency-group: csi-powerstore ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump dell/container-storage-modules/csi-metadata-retriever (#547) Bumps the csi-isilon group with 1 update in the /charts/csi-isilon directory: dell/container-storage-modules/csi-metadata-retriever. Updates `dell/container-storage-modules/csi-metadata-retriever` from v1.8.0 to v1.9.0 --- updated-dependencies: - dependency-name: dell/container-storage-modules/csi-metadata-retriever dependency-type: direct:production dependency-group: csi-isilon ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: Eric Young <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Bahubali Jain <[email protected]> Co-authored-by: Eric Young <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: rodrigobassil <[email protected]> Co-authored-by: alikdell <[email protected]> Co-authored-by: Rishabh Raj <[email protected]> Co-authored-by: aqu-dell <[email protected]> Co-authored-by: KshitijaKakde <[email protected]> Co-authored-by: Chiman Jain <[email protected]> Co-authored-by: Harshita Pandey <[email protected]> Co-authored-by: Akshay Saini <[email protected]> Co-authored-by: sakshi-garg1 <[email protected]> Co-authored-by: Niranjan N <[email protected]> Co-authored-by: Chiman Jain <[email protected]> Co-authored-by: Trevor Dawe <[email protected]> Co-authored-by: Aaron Tye <[email protected]> Co-authored-by: Surya Gupta <[email protected]> Co-authored-by: ChristianAtDell <[email protected]> Co-authored-by: aqu-dell <[email protected]> Co-authored-by: mgandharva <[email protected]> Co-authored-by: Fernando Alfaro Campos <[email protected]> Co-authored-by: Don Khan <[email protected]> Co-authored-by: Nitesh-Rewatkar <[email protected]> Co-authored-by: shefali-malhotra <[email protected]> Co-authored-by: Surya <[email protected]> Co-authored-by: Bahubali Jain <[email protected]> Co-authored-by: shefali-malhotra <[email protected]> Co-authored-by: Santhosh Lakshmanan <[email protected]>
dell · Oct 30, 2024 · 7edbbbb · 7edbbbb
1 parent fa20feb
commit 7edbbbb
Show file tree

Hide file tree

Showing 87 changed files with 879 additions and 1,529 deletions.
diff --git a/.github/workflows/helm-validations.yml b/.github/workflows/helm-validations.yml
@@ -41,7 +41,6 @@ jobs:
             echo "modified=true" >> "$GITHUB_OUTPUT"
           fi
 
-      # disabling step temporarily to have more time to look into "chart metadata is missing these dependencies" error
-      # - name: Run chart-testing linter
-      #   if: steps.modified-charts.outputs.modified == 'true'
-      #   run: ct lint --config ct.yaml
+      - name: Run chart-testing linter
+        if: steps.modified-charts.outputs.modified == 'true'
+        run: ct lint --config ct.yaml
diff --git a/charts/csi-isilon/Chart.yaml b/charts/csi-isilon/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: csi-isilon
-version: 2.11.0
-appVersion: "2.11.0"
+version: 2.12.0
+appVersion: "2.12.0"
 kubeVersion: ">= 1.21.0"
 # If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead
 # kubeVersion: ">= 1.23.0-0"

diff --git a/charts/csi-isilon/templates/controller.yaml b/charts/csi-isilon/templates/controller.yaml
@@ -179,24 +179,13 @@ spec:
       {{- toYaml .Values.controller.tolerations | nindent 8 }}
       {{ end }}
       containers:
-        {{- $encModes := list false }}
-        {{- if eq .Values.encryption.enabled true }}
-        {{- $encModes = list false true }}
-        {{- end }}
-{{- range $encrypted := $encModes }}
-{{- with $ }}
         {{- $driverSock := "csi.sock" }}
         {{- $csiSidecarSuffix := "" }}
-        {{- if $encrypted }}
-        {{- $driverSock = "csi-sec.sock" }}
-        {{- $csiSidecarSuffix = "-sec" }}
-        {{- end }}
         {{- $driverSockPath := printf "/var/run/csi/%s" $driverSock }}
-        {{- if not $encrypted }}
         {{- if hasKey .Values "podmon" }}
         {{- if eq .Values.podmon.enabled true }}
         - name: podmon
-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.controller.args | nindent 12 }}
@@ -219,11 +208,10 @@ spec:
             - name: csi-isilon-config-params
               mountPath: /csi-isilon-config-params
         {{- end }}
-        {{- end }}
         {{- 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.images.replication }}
+          image: {{ required "Must provide the Dell CSI Replicator image." .Values.images.replication.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -250,7 +238,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." .Values.images.resizer }}
+          image: {{ required "Must provide the CSI resizer container image." .Values.images.resizer.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -274,7 +262,7 @@ spec:
         {{ end }}
         {{ end }}
         - name: attacher{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher }}
+          image: {{ required "Must provide the CSI attacher container image." .Values.images.attacher.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -295,9 +283,8 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi
-        {{- if not $encrypted }}
         - name: csi-metadata-retriever
-          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever }}
+          image: {{ required "Must provide the CSI metadata retriever container image." .Values.images.metadataretriever.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: [ "/csi-metadata-retriever" ]
           env:
@@ -309,7 +296,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." .Values.images.healthmonitor }}
+          image: {{ required "Must provide the CSI external-health-monitor-controller container image." .Values.images.healthmonitor.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -335,9 +322,8 @@ spec:
               mountPath: /var/run/csi
         {{end}}
         {{end}}
-        {{- end }}
         - name: provisioner{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner }}
+          image: {{ required "Must provide the CSI provisioner container image." .Values.images.provisioner.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -378,8 +364,7 @@ spec:
         {{- if hasKey .Values.controller "snapshot" }}
         {{- 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." .Values.images.snapshotter }}
+          image: {{ required "Must provide the CSI snapshotter container image." .Values.images.snapshotter.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--csi-address={{ $driverSockPath }}"
@@ -403,9 +388,8 @@ spec:
               mountPath: /var/run/csi
         {{end}}
         {{end}}
-        {{- if not $encrypted }}
         - name: driver
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           command: [ "/csi-isilon" ]
           args:
@@ -487,13 +471,11 @@ spec:
               mountPath: /isilon-configs
             - name: csi-isilon-config-params
               mountPath: /csi-isilon-config-params
-        {{- end }}
-        {{- if not $encrypted }}
         {{- if hasKey .Values "authorization" }}
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization.image }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -520,33 +502,6 @@ spec:
               mountPath: /etc/karavi-authorization
         {{ end }}
         {{ end }}
-        {{- end }}
-        {{- if $encrypted }}
-        - name: driver-sec
-          image: {{ .Values.images.encryption }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
-          args:
-            - --name={{ .Values.encryption.pluginName }}
-            - --nodeId=$(NODE_ID)
-            - "--endpoint=unix://var/run/csi/csi-sec.sock"
-            - "--targetEndpoint=unix://var/run/csi/csi.sock"
-            - --targetType=Isilon
-            - --controller
-            - --logLevel={{ .Values.encryption.logLevel }}
-            {{- range index .Values.encryption.extraArgs }}
-            - {{ . | quote }}
-            {{- end }}
-          env:
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /var/run/csi
-        {{- end }}
-{{- end }}
-{{- end }}
       volumes:
         - name: socket-dir
           emptyDir:

diff --git a/charts/csi-isilon/templates/csidriver.yaml b/charts/csi-isilon/templates/csidriver.yaml
@@ -2,6 +2,8 @@ apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
     name: csi-isilon.dellemc.com
+    labels:
+      security.openshift.io/csi-ephemeral-volume-profile: restricted
 spec:
     attachRequired: true
     podInfoOnMount: true

diff --git a/charts/csi-isilon/templates/node.yaml b/charts/csi-isilon/templates/node.yaml
@@ -95,18 +95,8 @@ spec:
       hostNetwork: true
       dnsPolicy: {{ .Values.node.dnsPolicy }}
       containers:
-        {{- $encModes := list false }}
-        {{- if eq .Values.encryption.enabled true }}
-        {{- $encModes = list false true }}
-        {{- end }}
-{{- range $encrypted := $encModes }}
-{{- with $ }}
         {{- $driverSock := "csi_sock" }}
         {{- $csiSidecarSuffix := "" }}
-        {{- if $encrypted }}
-        {{- $driverSock = "csi_sec_sock" }}
-        {{- $csiSidecarSuffix = "-sec" }}
-        {{- end }}
       {{- if hasKey .Values "podmon" }}
       {{- if eq .Values.podmon.enabled true }}
         - name: podmon
@@ -115,7 +105,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the podmon container image." .Values.images.podmon }}
+          image: {{ required "Must provide the podmon container image." .Values.images.podmon.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             {{- toYaml .Values.podmon.node.args | nindent 12 }}
@@ -159,7 +149,6 @@ spec:
               mountPath: /csi-isilon-config-params
       {{- end }}
       {{- end }}
-        {{- if not $encrypted }}
         - name: driver
           command: ["/csi-isilon"]
           args:
@@ -169,7 +158,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver }}
+          image: {{ required "Must provide the Isilon driver image repository." .Values.images.driver.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: CSI_ENDPOINT
@@ -231,14 +220,8 @@ spec:
           volumeMounts:
             - name: driver-path
               mountPath: {{ .Values.kubeletConfigDir }}/plugins/csi-isilon
-            {{- if eq .Values.encryption.enabled true }}
-            - name: staging-dir
-              mountPath: {{ .Values.kubeletConfigDir }}/plugins/kubernetes.io/csi
-              mountPropagation: Bidirectional
-            {{- else }}
             - name: volumedevices-path
               mountPath: {{ .Values.kubeletConfigDir }}/plugins/kubernetes.io/csi/volumeDevices
-            {{- end }}
             - name: pods-path
               mountPath: {{ .Values.kubeletConfigDir }}/pods
               mountPropagation: "Bidirectional"
@@ -251,9 +234,8 @@ spec:
               mountPath: /isilon-configs
             - name: csi-isilon-config-params
               mountPath: /csi-isilon-config-params
-        {{- end }}
         - name: registrar{{ $csiSidecarSuffix }}
-          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar }}
+          image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar.image }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           args:
             - "--v=5"
@@ -270,12 +252,11 @@ spec:
               mountPath: /registration
             - name: driver-path
               mountPath: /csi
-        {{- if not $encrypted }}
         {{- if hasKey .Values "authorization" }}
         {{- if eq .Values.authorization.enabled true }}
         - name: karavi-authorization-proxy
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization }}
+          image: {{ required "Must provide the authorization sidecar container image." .Values.images.authorization.image }}
           env:
             - name: PROXY_HOST
               value: "{{ .Values.authorization.proxyHost }}"
@@ -302,73 +283,6 @@ spec:
               mountPath: /etc/karavi-authorization
         {{ end }}
         {{ end }}
-        {{- end }}
-        {{- if $encrypted }}
-        - name: driver-sec
-          image: {{ .Values.images.encryption }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
-          securityContext:
-            privileged: true
-            allowPrivilegeEscalation: true
-            capabilities:
-              add: ["SYS_ADMIN"]
-          args:
-            - --name={{ .Values.encryption.pluginName }}
-            - --nodeId=$(NODE_ID)
-            - "--endpoint=unix://var/run/csi/csi_sec_sock"
-            - "--targetEndpoint=unix://var/run/csi/csi_sock"
-            - --targetType=Isilon
-            - --vaultClientConfig=/etc/dea/vault/client.json
-            - --logLevel={{ .Values.encryption.logLevel }}
-            - --licenseName=/etc/dea/license/license
-            {{- if .Values.encryption.livenessPort }}
-            - --livenessPort={{ .Values.encryption.livenessPort }}
-            {{- end}}
-            - --apiPort={{ .Values.encryption.apiPort }}
-            {{- range index .Values.encryption.extraArgs }}
-            - {{ . | quote }}
-            {{- end }}
-          env:
-            - name: NODE_ID
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            {{- if eq .Values.encryption.ocp true }}
-            - name: CORE_ID
-              value: "{{ required "encryption.ocpCoreID not set to core user uid:gid" .Values.encryption.ocpCoreID }}"
-            {{- end }}
-          volumeMounts:
-            - name: vault-config
-              mountPath: /etc/dea/vault
-            - name: driver-path
-              mountPath: /var/run/csi
-            - name: pods-path
-              mountPath: {{ .Values.kubeletConfigDir }}/pods
-              mountPropagation: Bidirectional
-            - name: staging-dir
-              mountPath: {{ .Values.kubeletConfigDir }}/plugins/kubernetes.io/csi
-              mountPropagation: Bidirectional
-            - name: user-home
-              {{- if eq .Values.encryption.ocp true }}
-              mountPath: /corehome
-              {{- else }}
-              mountPath: /roothome
-              {{- end }}
-            - name: license-config
-              mountPath: /etc/dea/license
-          {{- if .Values.encryption.livenessPort }}
-          livenessProbe:
-            httpGet:
-              path: /liveprobe
-              port: {{ .Values.encryption.livenessPort }}
-              initialDelaySeconds: 1500
-              periodSeconds: 1000
-              timeoutSeconds: 3
-              failureThreshold: 100
-          {{- end }}
-        {{- end }}
-{{- end }}
-{{- end }}
       volumes:
         - name: registration-dir
           hostPath:
@@ -432,29 +346,3 @@ spec:
             type: Directory
         {{ end }}
         {{ end }}
-        {{- if eq .Values.encryption.enabled true }}
-        - name: vault-config
-          projected:
-            sources:
-            - secret:
-                name: vault-cert
-            - secret:
-                name: vault-auth
-            - configMap:
-                name: vault-client-conf
-        - name: staging-dir
-          hostPath:
-            path: {{ .Values.kubeletConfigDir }}/plugins/kubernetes.io/csi
-            type: DirectoryOrCreate
-        - name: user-home
-          hostPath:
-            {{- if eq .Values.encryption.ocp true }}
-            path: /home/core
-            {{- else }}
-            path: /root
-            {{- end }}
-            type: Directory
-        - name: license-config
-          secret:
-            secretName: encryption-license
-        {{- end }}