From 77122e0e4c944a5ca2b910f882f4a42574637f69 Mon Sep 17 00:00:00 2001
From: coulof <49235405+coulof@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:18:00 +0000
Subject: [PATCH] Update and simplify the generated helm template (#882)

---
 .../csminstallationwizard/src/index.html      |   4 +-
 .../src/static/js/utility.js                  |  12 ++
 .../templates/helm/csm-1.9.0-values.template  | 109 ------------------
 3 files changed, 14 insertions(+), 111 deletions(-)

diff --git a/content/docs/deployment/csminstallationwizard/src/index.html b/content/docs/deployment/csminstallationwizard/src/index.html
index 06ba8885ff..be8738461e 100644
--- a/content/docs/deployment/csminstallationwizard/src/index.html
+++ b/content/docs/deployment/csminstallationwizard/src/index.html
@@ -68,11 +68,11 @@
 
                 <!-- main content starts -->
                 <div id="main">
-                  <div class="was-validated row mb-4 image-repository">
+                  <div id="image-repository" class="was-validated row mb-4 image-repository" style="display: none;">
                     <label for="image-repository" class="col-sm-2 col-form-label" data-bs-toggle="tooltip" data-bs-placement="right" title="Specify the registry from where the image should be pulled" style="width: 150px;">Image Repository</label>
                     <div class="col-sm-9"></div>
                     <div class="col-sm-3">
-                      <input class="form-control input-lg" type="text" id="image-repository" placeholder="dellemc"  oninput="validateInput(validateForm, CONSTANTS)" required>
+                      <input class="form-control input-lg" type="text" id="image-repository" placeholder="dellemc"  onchange="onCSMVersionChange();" oninput="validateInput(validateForm, CONSTANTS)" required>
                     </div>
                     <div class="col-sm-4">
                       <div class="row mt-1">
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/utility.js b/content/docs/deployment/csminstallationwizard/src/static/js/utility.js
index 7f869a0b3d..a4b0fc0b71 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/utility.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/utility.js
@@ -138,6 +138,17 @@ function setDefaultValues(defaultValuesParam, csmMapValues) {
 
 }
 
+function onCSMVersionChange() {
+    var selectedVersion = document.getElementById('csm-version').value;
+    var imageRepoSection = document.getElementById('image-repository');
+
+    if (selectedVersion === '1.8.0' || selectedVersion === '1.7.0') {
+        imageRepoSection.style.display = '';
+    } else {
+        imageRepoSection.style.display = 'none';
+    }
+}
+
 function setMap(str) {
 	const testMap = new Map();
 	var keyValues = str.split('\n');
@@ -156,5 +167,6 @@ if (typeof exports !== 'undefined') {
 		validateForm,
 		setMap,
 		setDefaultValues,
+		onCSMVersionChange,
 	};
 }
diff --git a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.9.0-values.template b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.9.0-values.template
index 26dafb8377..4493e0a332 100644
--- a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.9.0-values.template
+++ b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.9.0-values.template
@@ -5,8 +5,6 @@
 csi-powerstore:
   enabled: $POWERSTORE_ENABLED
   version: v2.9.0
-  images:
-    driverRepository: $IMAGE_REPOSITORY
   ## Controller ATTRIBUTES
   controller:
     controllerCount: $CONTROLLER_COUNT
@@ -17,11 +15,8 @@ csi-powerstore:
     tolerations: $CONTROLLER_TOLERATIONS
     replication:
       enabled: $REPLICATION_ENABLED
-      image: dellemc/dell-csi-replicator:v1.6.0
     vgsnapshot:
       enabled: $VG_SNAPSHOT_ENABLED
-      image: dellemc/csi-volumegroup-snapshotter:v1.3.0
-    metadataretriever: dellemc/csi-metadata-retriever:v1.5.0
     snapshot:
       enabled: $SNAPSHOT_ENABLED
       snapNamePrefix: $SNAP_NAME_PREFIX
@@ -62,30 +57,6 @@ csi-powerstore:
     enabled: $STORAGE_CAPACITY_ENABLED
   podmon:
     enabled: $RESILIENCY_ENABLED
-    image: dellemc/podmon:v1.7.0
-    controller:
-      args:
-        - "--csisock=unix:/var/run/csi/csi.sock"
-        - "--labelvalue=csi-powerstore"
-        - "--arrayConnectivityPollRate=60"
-        - "--driverPath=csi-powerstore.dellemc.com"
-        - "--mode=controller"
-        - "--skipArrayConnectionValidation=false"
-        - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
-        - "--driverPodLabelValue=dell-storage"
-        - "--ignoreVolumelessPods=false"
-
-    node:
-      args:
-        - "--csisock=unix:/var/lib/kubelet/plugins/csi-powerstore.dellemc.com/csi_sock"
-        - "--labelvalue=csi-powerstore"
-        - "--arrayConnectivityPollRate=60"
-        - "--driverPath=csi-powerstore.dellemc.com"
-        - "--mode=node"
-        - "--leaderelection=false"
-        - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
-        - "--driverPodLabelValue=dell-storage"
-        - "--ignoreVolumelessPods=false"
 
   maxPowerstoreVolumesPerNode: $MAX_VOLUMES_PER_NODE
 
@@ -104,8 +75,6 @@ csi-powermax:
       - endpoint: $POWERMAX_MANAGEMENT_SERVERS_ENDPOINT_URL
       - endpoint: $TARGET_UNISPHERE
   version: v2.8.0
-  images:
-    driverRepository: $IMAGE_REPOSITORY
   clusterPrefix: $POWERMAX_CLUSTER_PREFIX
   portGroups: "$POWERMAX_PORT_GROUPS"
   fsGroupPolicy: "$FSGROUP_POLICY"
@@ -143,18 +112,13 @@ csi-powermax:
        operator: "Exists"
        effect: "NoExecute"
   csireverseproxy:
-    image: dellemc/csipowermax-reverseproxy:v2.7.0
     deployAsSidecar: true
   replication:
     enabled: $REPLICATION_ENABLED
-    image: dellemc/dell-csi-replicator:v1.6.0
   migration:
     enabled: $MIGRATION_ENABLED
-    image: dellemc/dell-csi-migrator:v1.2.0
-    nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.1.0
   authorization:
     enabled: $AUTHORIZATION_ENABLED
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
     proxyHost: $AUTHORIZATION_PROXY_HOST
     skipCertificateValidation: $AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION
   storageCapacity:
@@ -171,14 +135,10 @@ csi-powermax:
 csi-vxflexos:
   enabled: $POWERFLEX_ENABLED
   version: v2.8.0
-  images:
-    driverRepository: $IMAGE_REPOSITORY
-    powerflexSdc: dellemc/sdc:3.6.1
   certSecretCount: $CERT_SECRET_COUNT
   controller:
     replication:
       enabled: $REPLICATION_ENABLED
-      image: dellemc/dell-csi-replicator:v1.6.0
     healthMonitor:
       enabled: $HEALTH_MONITOR_ENABLED
     controllerCount: $CONTROLLER_COUNT
@@ -225,31 +185,10 @@ csi-vxflexos:
     enabled: $MONITOR_ENABLED
   vgsnapshotter:
     enabled: $VG_SNAPSHOT_ENABLED
-    image: dellemc/csi-volumegroup-snapshotter:v1.3.0
   podmon:
     enabled: $RESILIENCY_ENABLED
-    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"
   authorization:
     enabled: $AUTHORIZATION_ENABLED
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
     proxyHost: $AUTHORIZATION_PROXY_HOST
     skipCertificateValidation: $AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION
   maxPowerflexVolumesPerNode: $MAX_VOLUMES_PER_NODE
@@ -333,45 +272,18 @@ csi-isilon:
 
   authorization:
     enabled: $AUTHORIZATION_ENABLED
-    sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0
     proxyHost: $AUTHORIZATION_PROXY_HOST
     skipCertificateValidation: $AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION
 
   # Enable this feature only after contact support for additional information
   podmon:
     enabled: $RESILIENCY_ENABLED
-    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"
 
 ## K8S/CSI-Unity ATTRIBUTES
 ##########################################
 csi-unity:
   enabled: $UNITY_ENABLED
   version: v2.8.0
-  images:
-    driverRepository: $IMAGE_REPOSITORY
   certSecretCount: $CERT_SECRET_COUNT
   fsGroupPolicy: $FSGROUP_POLICY
   controller:
@@ -424,27 +336,6 @@ csi-unity:
   maxUnityVolumesPerNode: $MAX_VOLUMES_PER_NODE
   podmon:
     enabled: $RESILIENCY_ENABLED
-    image: dellemc/podmon:v1.7.0
-    controller:
-      args:
-        - "--csisock=unix:/var/run/csi/csi.sock"
-        - "--labelvalue=csi-unity"
-        - "--driverPath=csi-unity.dellemc.com"
-        - "--mode=controller"
-        - "--skipArrayConnectionValidation=false"
-        - "--driver-config-params=/unity-config/driver-config-params.yaml"
-        - "--driverPodLabelValue=dell-storage"
-        - "--ignoreVolumelessPods=false"
-    node:
-      args:
-        - "--csisock=unix:/var/lib/kubelet/plugins/unity.emc.dell.com/csi_sock"
-        - "--labelvalue=csi-unity"
-        - "--driverPath=csi-unity.dellemc.com"
-        - "--mode=node"
-        - "--leaderelection=false"
-        - "--driver-config-params=/unity-config/driver-config-params.yaml"
-        - "--driverPodLabelValue=dell-storage"
-        - "--ignoreVolumelessPods=false"
 
 ## K8S/Replication Module ATTRIBUTES
 ##########################################