diff --git a/deploy/charts/rook-ceph/templates/configmap.yaml b/deploy/charts/rook-ceph/templates/configmap.yaml
index 5961144f4..66a270016 100644
--- a/deploy/charts/rook-ceph/templates/configmap.yaml
+++ b/deploy/charts/rook-ceph/templates/configmap.yaml
@@ -31,244 +31,244 @@ data:
   {{- end }}
 
   {{- with .Values.csi }}
-  ROOK_USE_CSI_OPERATOR: {{ .Values.csi.rookUseCsiOperator | quote }}
-  ROOK_CSI_ENABLE_RBD: {{ .Values.csi.enableRbdDriver | quote }}
-  ROOK_CSI_ENABLE_CEPHFS: {{ .Values.csi.enableCephfsDriver | quote }}
-  ROOK_CSI_DISABLE_DRIVER: {{ .Values.csi.disableCsiDriver | quote }}
-  CSI_ENABLE_CEPHFS_SNAPSHOTTER: {{ .Values.csi.enableCephfsSnapshotter | quote }}
-  CSI_ENABLE_NFS_SNAPSHOTTER: {{ .Values.csi.enableNFSSnapshotter | quote }}
-  CSI_ENABLE_RBD_SNAPSHOTTER: {{ .Values.csi.enableRBDSnapshotter | quote }}
-  CSI_PLUGIN_ENABLE_SELINUX_HOST_MOUNT: {{ .Values.csi.enablePluginSelinuxHostMount | quote }}
-  CSI_ENABLE_ENCRYPTION: {{ .Values.csi.enableCSIEncryption | quote }}
-  CSI_ENABLE_OMAP_GENERATOR: {{ .Values.csi.enableOMAPGenerator | quote }}
-  CSI_ENABLE_HOST_NETWORK: {{ .Values.csi.enableCSIHostNetwork | quote }}
-  CSI_ENABLE_METADATA: {{ .Values.csi.enableMetadata | quote }}
-  CSI_ENABLE_VOLUME_GROUP_SNAPSHOT: {{ .Values.csi.enableVolumeGroupSnapshot | quote }}
-  {{- if .Values.csi.csiDriverNamePrefix }}
-  CSI_DRIVER_NAME_PREFIX: {{ .Values.csi.csiDriverNamePrefix | quote }}
+  ROOK_USE_CSI_OPERATOR: {{ .rookUseCsiOperator | quote }}
+  ROOK_CSI_ENABLE_RBD: {{ .enableRbdDriver | quote }}
+  ROOK_CSI_ENABLE_CEPHFS: {{ .enableCephfsDriver | quote }}
+  ROOK_CSI_DISABLE_DRIVER: {{ .disableCsiDriver | quote }}
+  CSI_ENABLE_CEPHFS_SNAPSHOTTER: {{ .enableCephfsSnapshotter | quote }}
+  CSI_ENABLE_NFS_SNAPSHOTTER: {{ .enableNFSSnapshotter | quote }}
+  CSI_ENABLE_RBD_SNAPSHOTTER: {{ .enableRBDSnapshotter | quote }}
+  CSI_PLUGIN_ENABLE_SELINUX_HOST_MOUNT: {{ .enablePluginSelinuxHostMount | quote }}
+  CSI_ENABLE_ENCRYPTION: {{ .enableCSIEncryption | quote }}
+  CSI_ENABLE_OMAP_GENERATOR: {{ .enableOMAPGenerator | quote }}
+  CSI_ENABLE_HOST_NETWORK: {{ .enableCSIHostNetwork | quote }}
+  CSI_ENABLE_METADATA: {{ .enableMetadata | quote }}
+  CSI_ENABLE_VOLUME_GROUP_SNAPSHOT: {{ .enableVolumeGroupSnapshot | quote }}
+  {{- if .csiDriverNamePrefix }}
+  CSI_DRIVER_NAME_PREFIX: {{ .csiDriverNamePrefix | quote }}
   {{- end }}
-  {{- if .Values.csi.pluginPriorityClassName }}
-  CSI_PLUGIN_PRIORITY_CLASSNAME: {{ .Values.csi.pluginPriorityClassName | quote }}
+  {{- if .pluginPriorityClassName }}
+  CSI_PLUGIN_PRIORITY_CLASSNAME: {{ .pluginPriorityClassName | quote }}
   {{- end }}
-  {{- if .Values.csi.provisionerPriorityClassName }}
-  CSI_PROVISIONER_PRIORITY_CLASSNAME: {{ .Values.csi.provisionerPriorityClassName | quote }}
+  {{- if .provisionerPriorityClassName }}
+  CSI_PROVISIONER_PRIORITY_CLASSNAME: {{ .provisionerPriorityClassName | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSPluginUpdateStrategy }}
-  CSI_CEPHFS_PLUGIN_UPDATE_STRATEGY: {{ .Values.csi.cephFSPluginUpdateStrategy | quote }}
+  {{- if .cephFSPluginUpdateStrategy }}
+  CSI_CEPHFS_PLUGIN_UPDATE_STRATEGY: {{ .cephFSPluginUpdateStrategy | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSPluginUpdateStrategyMaxUnavailable }}
-  CSI_CEPHFS_PLUGIN_UPDATE_STRATEGY_MAX_UNAVAILABLE: {{ .Values.csi.cephFSPluginUpdateStrategyMaxUnavailable | quote }}
+  {{- if .cephFSPluginUpdateStrategyMaxUnavailable }}
+  CSI_CEPHFS_PLUGIN_UPDATE_STRATEGY_MAX_UNAVAILABLE: {{ .cephFSPluginUpdateStrategyMaxUnavailable | quote }}
   {{- end }}
-  {{- if .Values.csi.nfsPluginUpdateStrategy }}
-  CSI_NFS_PLUGIN_UPDATE_STRATEGY: {{ .Values.csi.nfsPluginUpdateStrategy | quote }}
+  {{- if .nfsPluginUpdateStrategy }}
+  CSI_NFS_PLUGIN_UPDATE_STRATEGY: {{ .nfsPluginUpdateStrategy | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdFSGroupPolicy }}
-  CSI_RBD_FSGROUPPOLICY: {{ .Values.csi.rbdFSGroupPolicy | quote }}
+  {{- if .rbdFSGroupPolicy }}
+  CSI_RBD_FSGROUPPOLICY: {{ .rbdFSGroupPolicy | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSFSGroupPolicy }}
-  CSI_CEPHFS_FSGROUPPOLICY: {{ .Values.csi.cephFSFSGroupPolicy | quote }}
+  {{- if .cephFSFSGroupPolicy }}
+  CSI_CEPHFS_FSGROUPPOLICY: {{ .cephFSFSGroupPolicy | quote }}
   {{- end }}
-  {{- if .Values.csi.nfsFSGroupPolicy }}
-  CSI_NFS_FSGROUPPOLICY: {{ .Values.csi.nfsFSGroupPolicy | quote }}
+  {{- if .nfsFSGroupPolicy }}
+  CSI_NFS_FSGROUPPOLICY: {{ .nfsFSGroupPolicy | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdPluginUpdateStrategy }}
-  CSI_RBD_PLUGIN_UPDATE_STRATEGY: {{ .Values.csi.rbdPluginUpdateStrategy | quote }}
+  {{- if .rbdPluginUpdateStrategy }}
+  CSI_RBD_PLUGIN_UPDATE_STRATEGY: {{ .rbdPluginUpdateStrategy | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSKernelMountOptions }}
-  CSI_CEPHFS_KERNEL_MOUNT_OPTIONS: {{ .Values.csi.cephFSKernelMountOptions | quote }}
+  {{- if .cephFSKernelMountOptions }}
+  CSI_CEPHFS_KERNEL_MOUNT_OPTIONS: {{ .cephFSKernelMountOptions | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdPluginUpdateStrategyMaxUnavailable }}
-  CSI_RBD_PLUGIN_UPDATE_STRATEGY_MAX_UNAVAILABLE: {{ .Values.csi.rbdPluginUpdateStrategyMaxUnavailable | quote }}
+  {{- if .rbdPluginUpdateStrategyMaxUnavailable }}
+  CSI_RBD_PLUGIN_UPDATE_STRATEGY_MAX_UNAVAILABLE: {{ .rbdPluginUpdateStrategyMaxUnavailable | quote }}
   {{- end }}
-  {{- if .Values.csi.kubeletDirPath }}
-  ROOK_CSI_KUBELET_DIR_PATH: {{ .Values.csi.kubeletDirPath | quote }}
+  {{- if .kubeletDirPath }}
+  ROOK_CSI_KUBELET_DIR_PATH: {{ .kubeletDirPath | quote }}
   {{- end }}
-  {{- if .Values.csi.csiLeaderElectionLeaseDuration }}
-  CSI_LEADER_ELECTION_LEASE_DURATION: {{ .Values.csi.csiLeaderElectionLeaseDuration | quote }}
+  {{- if .csiLeaderElectionLeaseDuration }}
+  CSI_LEADER_ELECTION_LEASE_DURATION: {{ .csiLeaderElectionLeaseDuration | quote }}
   {{- end }}
-  {{- if .Values.csi.csiLeaderElectionRenewDeadline }}
-  CSI_LEADER_ELECTION_RENEW_DEADLINE: {{ .Values.csi.csiLeaderElectionRenewDeadline | quote }}
+  {{- if .csiLeaderElectionRenewDeadline }}
+  CSI_LEADER_ELECTION_RENEW_DEADLINE: {{ .csiLeaderElectionRenewDeadline | quote }}
   {{- end }}
-  {{- if .Values.csi.csiLeaderElectionRetryPeriod }}
-  CSI_LEADER_ELECTION_RETRY_PERIOD: {{ .Values.csi.csiLeaderElectionRetryPeriod | quote }}
+  {{- if .csiLeaderElectionRetryPeriod }}
+  CSI_LEADER_ELECTION_RETRY_PERIOD: {{ .csiLeaderElectionRetryPeriod | quote }}
   {{- end }}
-  {{- if .Values.csi.cephcsi }}
-  {{- if and .Values.csi.cephcsi.repository .Values.csi.cephcsi.tag }}
-  ROOK_CSI_CEPH_IMAGE: "{{ .Values.csi.cephcsi.repository }}:{{ .Values.csi.cephcsi.tag }}"
+  {{- if .cephcsi }}
+  {{- if and .cephcsi.repository .cephcsi.tag }}
+  ROOK_CSI_CEPH_IMAGE: "{{ .cephcsi.repository }}:{{ .cephcsi.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.registrar }}
-  {{- if and .Values.csi.registrar.repository .Values.csi.registrar.tag }}
-  ROOK_CSI_REGISTRAR_IMAGE: "{{ .Values.csi.registrar.repository }}:{{ .Values.csi.registrar.tag }}"
+  {{- if .registrar }}
+  {{- if and .registrar.repository .registrar.tag }}
+  ROOK_CSI_REGISTRAR_IMAGE: "{{ .registrar.repository }}:{{ .registrar.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.provisioner }}
-  {{- if and .Values.csi.provisioner.repository .Values.csi.provisioner.tag }}
-  ROOK_CSI_PROVISIONER_IMAGE: "{{ .Values.csi.provisioner.repository }}:{{ .Values.csi.provisioner.tag }}"
+  {{- if .provisioner }}
+  {{- if and .provisioner.repository .provisioner.tag }}
+  ROOK_CSI_PROVISIONER_IMAGE: "{{ .provisioner.repository }}:{{ .provisioner.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.snapshotter }}
-  {{- if and .Values.csi.snapshotter.repository .Values.csi.snapshotter.tag }}
-  ROOK_CSI_SNAPSHOTTER_IMAGE: "{{ .Values.csi.snapshotter.repository }}:{{ .Values.csi.snapshotter.tag }}"
+  {{- if .snapshotter }}
+  {{- if and .snapshotter.repository .snapshotter.tag }}
+  ROOK_CSI_SNAPSHOTTER_IMAGE: "{{ .snapshotter.repository }}:{{ .snapshotter.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.attacher }}
-  {{- if and .Values.csi.attacher.repository .Values.csi.attacher.tag }}
-  ROOK_CSI_ATTACHER_IMAGE: "{{ .Values.csi.attacher.repository }}:{{ .Values.csi.attacher.tag }}"
+  {{- if .attacher }}
+  {{- if and .attacher.repository .attacher.tag }}
+  ROOK_CSI_ATTACHER_IMAGE: "{{ .attacher.repository }}:{{ .attacher.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.resizer }}
-  {{- if and .Values.csi.resizer.repository .Values.csi.resizer.tag }}
-  ROOK_CSI_RESIZER_IMAGE: "{{ .Values.csi.resizer.repository }}:{{ .Values.csi.resizer.tag }}"
+  {{- if .resizer }}
+  {{- if and .resizer.repository .resizer.tag }}
+  ROOK_CSI_RESIZER_IMAGE: "{{ .resizer.repository }}:{{ .resizer.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.imagePullPolicy }}
-  ROOK_CSI_IMAGE_PULL_POLICY: {{ .Values.csi.imagePullPolicy | quote }}
+  {{- if .imagePullPolicy }}
+  ROOK_CSI_IMAGE_PULL_POLICY: {{ .imagePullPolicy | quote }}
   {{- end }}
-  {{- if .Values.csi.csiAddons }}
-  CSI_ENABLE_CSIADDONS: {{ .Values.csi.csiAddons.enabled | quote }}
-  {{- if and .Values.csi.csiAddons.repository .Values.csi.csiAddons.tag }}
-  ROOK_CSIADDONS_IMAGE: "{{ .Values.csi.csiAddons.repository }}:{{ .Values.csi.csiAddons.tag }}"
+  {{- if .csiAddons }}
+  CSI_ENABLE_CSIADDONS: {{ .csiAddons.enabled | quote }}
+  {{- if and .csiAddons.repository .csiAddons.tag }}
+  ROOK_CSIADDONS_IMAGE: "{{ .csiAddons.repository }}:{{ .csiAddons.tag }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.crossNamespaceVolumeDataSource }}
-  CSI_ENABLE_CROSS_NAMESPACE_VOLUME_DATA_SOURCE: {{ .Values.csi.crossNamespaceVolumeDataSource.enabled | quote }}
+  {{- if .crossNamespaceVolumeDataSource }}
+  CSI_ENABLE_CROSS_NAMESPACE_VOLUME_DATA_SOURCE: {{ .crossNamespaceVolumeDataSource.enabled | quote }}
   {{- end }}
-  {{- if .Values.csi.topology }}
-  CSI_ENABLE_TOPOLOGY: {{ .Values.csi.topology.enabled | quote }}
-  {{- if .Values.csi.topology.domainLabels }}
-  CSI_TOPOLOGY_DOMAIN_LABELS: {{ .Values.csi.topology.domainLabels | join "," }}
+  {{- if .topology }}
+  CSI_ENABLE_TOPOLOGY: {{ .topology.enabled | quote }}
+  {{- if .topology.domainLabels }}
+  CSI_TOPOLOGY_DOMAIN_LABELS: {{ .topology.domainLabels | join "," }}
   {{- end }}
   {{- end }}
-  {{- if .Values.csi.nfs }}
-  ROOK_CSI_ENABLE_NFS: {{ .Values.csi.nfs.enabled | quote }}
+  {{- if .nfs }}
+  ROOK_CSI_ENABLE_NFS: {{ .nfs.enabled | quote }}
   {{- end }}
-  {{- if .Values.csi.cephfsPodLabels }}
-  ROOK_CSI_CEPHFS_POD_LABELS: {{ .Values.csi.cephfsPodLabels | quote }}
+  {{- if .cephfsPodLabels }}
+  ROOK_CSI_CEPHFS_POD_LABELS: {{ .cephfsPodLabels | quote }}
   {{- end }}
-  {{- if .Values.csi.nfsPodLabels }}
-  ROOK_CSI_NFS_POD_LABELS: {{ .Values.csi.nfsPodLabels | quote }}
+  {{- if .nfsPodLabels }}
+  ROOK_CSI_NFS_POD_LABELS: {{ .nfsPodLabels | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdPodLabels }}
-  ROOK_CSI_RBD_POD_LABELS: {{ .Values.csi.rbdPodLabels | quote }}
+  {{- if .rbdPodLabels }}
+  ROOK_CSI_RBD_POD_LABELS: {{ .rbdPodLabels | quote }}
   {{- end }}
-  {{- if .Values.csi.provisionerTolerations }}
-  CSI_PROVISIONER_TOLERATIONS: {{ toYaml .Values.csi.provisionerTolerations | quote }}
+  {{- if .provisionerTolerations }}
+  CSI_PROVISIONER_TOLERATIONS: {{ toYaml .provisionerTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.provisionerNodeAffinity }}
-  CSI_PROVISIONER_NODE_AFFINITY: {{ .Values.csi.provisionerNodeAffinity }}
+  {{- if .provisionerNodeAffinity }}
+  CSI_PROVISIONER_NODE_AFFINITY: {{ .provisionerNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.rbdProvisionerTolerations }}
-  CSI_RBD_PROVISIONER_TOLERATIONS: {{ toYaml .Values.csi.rbdProvisionerTolerations | quote }}
+  {{- if .rbdProvisionerTolerations }}
+  CSI_RBD_PROVISIONER_TOLERATIONS: {{ toYaml .rbdProvisionerTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdProvisionerNodeAffinity }}
-  CSI_RBD_PROVISIONER_NODE_AFFINITY: {{ .Values.csi.rbdProvisionerNodeAffinity }}
+  {{- if .rbdProvisionerNodeAffinity }}
+  CSI_RBD_PROVISIONER_NODE_AFFINITY: {{ .rbdProvisionerNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.cephFSProvisionerTolerations }}
-  CSI_CEPHFS_PROVISIONER_TOLERATIONS: {{ toYaml .Values.csi.cephFSProvisionerTolerations | quote }}
+  {{- if .cephFSProvisionerTolerations }}
+  CSI_CEPHFS_PROVISIONER_TOLERATIONS: {{ toYaml .cephFSProvisionerTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSProvisionerNodeAffinity }}
-  CSI_CEPHFS_PROVISIONER_NODE_AFFINITY: {{ .Values.csi.cephFSProvisionerNodeAffinity }}
+  {{- if .cephFSProvisionerNodeAffinity }}
+  CSI_CEPHFS_PROVISIONER_NODE_AFFINITY: {{ .cephFSProvisionerNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.nfsProvisionerTolerations }}
-  CSI_NFS_PROVISIONER_TOLERATIONS: {{ toYaml .Values.csi.nfsProvisionerTolerations | quote }}
+  {{- if .nfsProvisionerTolerations }}
+  CSI_NFS_PROVISIONER_TOLERATIONS: {{ toYaml .nfsProvisionerTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.nfsProvisionerNodeAffinity }}
-  CSI_NFS_PROVISIONER_NODE_AFFINITY: {{ .Values.csi.nfsProvisionerNodeAffinity }}
+  {{- if .nfsProvisionerNodeAffinity }}
+  CSI_NFS_PROVISIONER_NODE_AFFINITY: {{ .nfsProvisionerNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.pluginTolerations }}
-  CSI_PLUGIN_TOLERATIONS: {{ toYaml .Values.csi.pluginTolerations | quote }}
+  {{- if .pluginTolerations }}
+  CSI_PLUGIN_TOLERATIONS: {{ toYaml .pluginTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.pluginNodeAffinity }}
-  CSI_PLUGIN_NODE_AFFINITY: {{ .Values.csi.pluginNodeAffinity }}
+  {{- if .pluginNodeAffinity }}
+  CSI_PLUGIN_NODE_AFFINITY: {{ .pluginNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.rbdPluginTolerations }}
-  CSI_RBD_PLUGIN_TOLERATIONS: {{ toYaml .Values.csi.rbdPluginTolerations | quote }}
+  {{- if .rbdPluginTolerations }}
+  CSI_RBD_PLUGIN_TOLERATIONS: {{ toYaml .rbdPluginTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdPluginNodeAffinity }}
-  CSI_RBD_PLUGIN_NODE_AFFINITY: {{ .Values.csi.rbdPluginNodeAffinity }}
+  {{- if .rbdPluginNodeAffinity }}
+  CSI_RBD_PLUGIN_NODE_AFFINITY: {{ .rbdPluginNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.cephFSPluginTolerations }}
-  CSI_CEPHFS_PLUGIN_TOLERATIONS: {{ toYaml .Values.csi.cephFSPluginTolerations | quote }}
+  {{- if .cephFSPluginTolerations }}
+  CSI_CEPHFS_PLUGIN_TOLERATIONS: {{ toYaml .cephFSPluginTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.cephFSPluginNodeAffinity }}
-  CSI_CEPHFS_PLUGIN_NODE_AFFINITY: {{ .Values.csi.cephFSPluginNodeAffinity }}
+  {{- if .cephFSPluginNodeAffinity }}
+  CSI_CEPHFS_PLUGIN_NODE_AFFINITY: {{ .cephFSPluginNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.nfsPluginTolerations }}
-  CSI_NFS_PLUGIN_TOLERATIONS: {{ toYaml .Values.csi.nfsPluginTolerations | quote }}
+  {{- if .nfsPluginTolerations }}
+  CSI_NFS_PLUGIN_TOLERATIONS: {{ toYaml .nfsPluginTolerations | quote }}
   {{- end }}
-  {{- if .Values.csi.nfsPluginNodeAffinity }}
-  CSI_NFS_PLUGIN_NODE_AFFINITY: {{ .Values.csi.nfsPluginNodeAffinity }}
+  {{- if .nfsPluginNodeAffinity }}
+  CSI_NFS_PLUGIN_NODE_AFFINITY: {{ .nfsPluginNodeAffinity }}
   {{- end }}
-  {{- if .Values.csi.cephfsLivenessMetricsPort }}
-  CSI_CEPHFS_LIVENESS_METRICS_PORT: {{ .Values.csi.cephfsLivenessMetricsPort | quote }}
+  {{- if .cephfsLivenessMetricsPort }}
+  CSI_CEPHFS_LIVENESS_METRICS_PORT: {{ .cephfsLivenessMetricsPort | quote }}
   {{- end }}
-  {{- if .Values.csi.enableLiveness }}
-  CSI_ENABLE_LIVENESS: {{ .Values.csi.enableLiveness | quote }}
+  {{- if .enableLiveness }}
+  CSI_ENABLE_LIVENESS: {{ .enableLiveness | quote }}
   {{- end }}
-  {{- if .Values.csi.rbdLivenessMetricsPort }}
-  CSI_RBD_LIVENESS_METRICS_PORT: {{ .Values.csi.rbdLivenessMetricsPort | quote }}
+  {{- if .rbdLivenessMetricsPort }}
+  CSI_RBD_LIVENESS_METRICS_PORT: {{ .rbdLivenessMetricsPort | quote }}
   {{- end }}
-  {{- if .Values.csi.csiAddonsPort }}
-  CSIADDONS_PORT: {{ .Values.csi.csiAddonsPort | quote }}
+  {{- if .csiAddonsPort }}
+  CSIADDONS_PORT: {{ .csiAddonsPort | quote }}
   {{- end }}
-  {{- if .Values.csi.csiAddonsRBDProvisionerPort }}
-  CSIADDONS_RBD_PROVISIONER_PORT: {{ .Values.csi.csiAddonsRBDProvisionerPort | quote }}
+  {{- if .csiAddonsRBDProvisionerPort }}
+  CSIADDONS_RBD_PROVISIONER_PORT: {{ .csiAddonsRBDProvisionerPort | quote }}
   {{- end }}
-  {{- if .Values.csi.csiAddonsCephFSProvisionerPort }}
-  CSIADDONS_CEPHFS_PROVISIONER_PORT: {{ .Values.csi.csiAddonsCephFSProvisionerPort | quote }}
+  {{- if .csiAddonsCephFSProvisionerPort }}
+  CSIADDONS_CEPHFS_PROVISIONER_PORT: {{ .csiAddonsCephFSProvisionerPort | quote }}
   {{- end }}
-  {{- if .Values.csi.forceCephFSKernelClient }}
-  CSI_FORCE_CEPHFS_KERNEL_CLIENT: {{ .Values.csi.forceCephFSKernelClient | quote }}
+  {{- if .forceCephFSKernelClient }}
+  CSI_FORCE_CEPHFS_KERNEL_CLIENT: {{ .forceCephFSKernelClient | quote }}
   {{- end }}
-  {{- if .Values.csi.logLevel }}
-  CSI_LOG_LEVEL: {{ .Values.csi.logLevel | quote }}
+  {{- if .logLevel }}
+  CSI_LOG_LEVEL: {{ .logLevel | quote }}
   {{- end }}
-  {{- if .Values.csi.sidecarLogLevel }}
-  CSI_SIDECAR_LOG_LEVEL: {{ .Values.csi.sidecarLogLevel | quote }}
+  {{- if .sidecarLogLevel }}
+  CSI_SIDECAR_LOG_LEVEL: {{ .sidecarLogLevel | quote }}
   {{- end }}
-  {{- if .Values.csi.clusterName }}
-  CSI_CLUSTER_NAME: {{ .Values.csi.clusterName | quote }}
+  {{- if .clusterName }}
+  CSI_CLUSTER_NAME: {{ .clusterName | quote }}
   {{- end }}
-  {{- if .Values.csi.grpcTimeoutInSeconds }}
-  CSI_GRPC_TIMEOUT_SECONDS: {{ .Values.csi.grpcTimeoutInSeconds | quote }}
+  {{- if .grpcTimeoutInSeconds }}
+  CSI_GRPC_TIMEOUT_SECONDS: {{ .grpcTimeoutInSeconds | quote }}
   {{- end }}
-  {{- if .Values.csi.provisionerReplicas }}
-  CSI_PROVISIONER_REPLICAS: {{ .Values.csi.provisionerReplicas | quote }}
+  {{- if .provisionerReplicas }}
+  CSI_PROVISIONER_REPLICAS: {{ .provisionerReplicas | quote }}
   {{- end }}
-  {{- if .Values.csi.csiRBDProvisionerResource }}
-  CSI_RBD_PROVISIONER_RESOURCE: {{ .Values.csi.csiRBDProvisionerResource | quote }}
+  {{- if .csiRBDProvisionerResource }}
+  CSI_RBD_PROVISIONER_RESOURCE: {{ .csiRBDProvisionerResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiRBDPluginResource }}
-  CSI_RBD_PLUGIN_RESOURCE: {{ .Values.csi.csiRBDPluginResource | quote }}
+  {{- if .csiRBDPluginResource }}
+  CSI_RBD_PLUGIN_RESOURCE: {{ .csiRBDPluginResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiCephFSProvisionerResource }}
-  CSI_CEPHFS_PROVISIONER_RESOURCE: {{ .Values.csi.csiCephFSProvisionerResource | quote }}
+  {{- if .csiCephFSProvisionerResource }}
+  CSI_CEPHFS_PROVISIONER_RESOURCE: {{ .csiCephFSProvisionerResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiCephFSPluginResource }}
-  CSI_CEPHFS_PLUGIN_RESOURCE: {{ .Values.csi.csiCephFSPluginResource | quote }}
+  {{- if .csiCephFSPluginResource }}
+  CSI_CEPHFS_PLUGIN_RESOURCE: {{ .csiCephFSPluginResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiNFSProvisionerResource }}
-  CSI_NFS_PROVISIONER_RESOURCE: {{ .Values.csi.csiNFSProvisionerResource | quote }}
+  {{- if .csiNFSProvisionerResource }}
+  CSI_NFS_PROVISIONER_RESOURCE: {{ .csiNFSProvisionerResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiNFSPluginResource }}
-  CSI_NFS_PLUGIN_RESOURCE: {{ .Values.csi.csiNFSPluginResource | quote }}
+  {{- if .csiNFSPluginResource }}
+  CSI_NFS_PLUGIN_RESOURCE: {{ .csiNFSPluginResource | quote }}
   {{- end }}
-  {{- if .Values.csi.csiRBDPluginVolume }}
-  CSI_RBD_PLUGIN_VOLUME: {{ toYaml .Values.csi.csiRBDPluginVolume | quote }}
+  {{- if .csiRBDPluginVolume }}
+  CSI_RBD_PLUGIN_VOLUME: {{ toYaml .csiRBDPluginVolume | quote }}
   {{- end }}
-  {{- if .Values.csi.csiRBDPluginVolumeMount }}
-  CSI_RBD_PLUGIN_VOLUME_MOUNT: {{ toYaml .Values.csi.csiRBDPluginVolumeMount | quote }}
+  {{- if .csiRBDPluginVolumeMount }}
+  CSI_RBD_PLUGIN_VOLUME_MOUNT: {{ toYaml .csiRBDPluginVolumeMount | quote }}
   {{- end }}
-  {{- if .Values.csi.csiCephFSPluginVolume }}
-  CSI_CEPHFS_PLUGIN_VOLUME: {{ toYaml .Values.csi.csiCephFSPluginVolume | quote }}
+  {{- if .csiCephFSPluginVolume }}
+  CSI_CEPHFS_PLUGIN_VOLUME: {{ toYaml .csiCephFSPluginVolume | quote }}
   {{- end }}
-  {{- if .Values.csi.csiCephFSPluginVolumeMount }}
-  CSI_CEPHFS_PLUGIN_VOLUME_MOUNT: {{ toYaml .Values.csi.csiCephFSPluginVolumeMount | quote }}
+  {{- if .csiCephFSPluginVolumeMount }}
+  CSI_CEPHFS_PLUGIN_VOLUME_MOUNT: {{ toYaml .csiCephFSPluginVolumeMount | quote }}
   {{- end }}
-  CSI_CEPHFS_ATTACH_REQUIRED: {{ .Values.csi.cephFSAttachRequired | quote }}
-  CSI_RBD_ATTACH_REQUIRED: {{ .Values.csi.rbdAttachRequired | quote }}
-  CSI_NFS_ATTACH_REQUIRED: {{ .Values.csi.nfsAttachRequired | quote }}
+  CSI_CEPHFS_ATTACH_REQUIRED: {{ .cephFSAttachRequired | quote }}
+  CSI_RBD_ATTACH_REQUIRED: {{ .rbdAttachRequired | quote }}
+  CSI_NFS_ATTACH_REQUIRED: {{ .nfsAttachRequired | quote }}
   {{- end }}
   {{- if .Values.csi.kubeApiBurst }}
   CSI_KUBE_API_BURST: {{ .Values.csi.kubeApiBurst | quote }}