From 94ef14eb9184adb2f0c56767eb5b35f3763afb3e Mon Sep 17 00:00:00 2001
From: Rishabh Raj <120644626+rishabhatdell@users.noreply.github.com>
Date: Fri, 7 Jun 2024 17:00:49 +0530
Subject: [PATCH] Updated templates for CSM 1.11 (#1129)

* Updated templates for CSM 1.11

* fix unit tests

* fix helm chart versions

* fixed unit tests

* updated hel charts version
---
 config.toml                                   |  2 +-
 .../csm-versions/default-values.properties    |  2 +-
 .../csminstallationwizard/src/index.html      |  8 +-
 .../src/static/js/constants.js                |  6 +-
 .../src/static/js/tests/generate-yaml.test.js |  6 +-
 .../src/static/js/tests/ui-functions.test.js  | 10 +--
 .../src/static/js/tests/utility.test.js       |  6 +-
 .../src/static/js/ui-functions.js             | 16 ++--
 .../templates/helm/csm-1.11.0-values.template | 76 +++++++++----------
 .../operator/csm-isilon-1.11.0.template       | 20 ++---
 .../operator/csm-powermax-1.11.0.template     | 14 ++--
 .../operator/csm-powerstore-1.11.0.template   |  6 +-
 12 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/config.toml b/config.toml
index ad977d6d2a..919f68ed82 100644
--- a/config.toml
+++ b/config.toml
@@ -176,7 +176,7 @@ enable = false
   url = "https://dell.github.io/csm-docs/docs/"
 
 [[params.versions]]
-  version = "v1.10.0"
+  version = "v1.10.2"
   url = "https://dell.github.io/csm-docs/v1"
 
 [[params.versions]]
diff --git a/content/docs/deployment/csminstallationwizard/src/csm-versions/default-values.properties b/content/docs/deployment/csminstallationwizard/src/csm-versions/default-values.properties
index 61fd4afa52..7ec130a487 100644
--- a/content/docs/deployment/csminstallationwizard/src/csm-versions/default-values.properties
+++ b/content/docs/deployment/csminstallationwizard/src/csm-versions/default-values.properties
@@ -1,4 +1,4 @@
-csmVersion=1.10.1
+csmVersion=1.11.0
 imageRepository=dellemc
 controllerCount=1
 nodeSelectorLabel=node-role.kubernetes.io/control-plane:
diff --git a/content/docs/deployment/csminstallationwizard/src/index.html b/content/docs/deployment/csminstallationwizard/src/index.html
index 6cebdb07d0..df2597bfd4 100644
--- a/content/docs/deployment/csminstallationwizard/src/index.html
+++ b/content/docs/deployment/csminstallationwizard/src/index.html
@@ -90,10 +90,10 @@
                     <div class="col-sm-9"></div>
                     <div class="col-sm-3">
                       <select id="csm-version" class="form-select" onchange="onCSMVersionChange(); validateInput(validateForm, CONSTANTS)" required>
-                        <option value="1.7.0">CSM 1.7</option>
-                        <option value="1.8.0">CSM 1.8</option>                        
-                        <option value="1.9.3">CSM 1.9</option>
-                        <option value="1.10.1" selected>CSM 1.10.1</option>
+                        <option value="1.8.0">CSM 1.8</option>
+                        <option value="1.9.3">CSM 1.9</option>                        
+                        <option value="1.10.2">CSM 1.10</option>
+                        <option value="1.11.0" selected>CSM 1.11</option>
                       </select>
                     </div>
                   </div>
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/constants.js b/content/docs/deployment/csminstallationwizard/src/static/js/constants.js
index b4975024fd..c11ae18901 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/constants.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/constants.js
@@ -40,10 +40,10 @@ const CONSTANTS = {
 	PROPERTIES: ".properties",
 	HELM: "helm",
 	OPERATOR: "operator",
-	CSM_HELM_V170: "1.0.0",
 	CSM_HELM_V180: "1.1.0",
-	CSM_HELM_V190: "1.2.1",
-	CSM_HELM_V1101: "1.3.1",
+	CSM_HELM_V190: "1.2.2",
+	CSM_HELM_V1102: "1.3.2",
+	CSM_HELM_V1110: "1.4.0",
 	HELM_TAINTS: `
      - key: "$KEY"
        operator: "Exists"
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/tests/generate-yaml.test.js b/content/docs/deployment/csminstallationwizard/src/static/js/tests/generate-yaml.test.js
index d3f86ca24f..44164efc64 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/tests/generate-yaml.test.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/tests/generate-yaml.test.js
@@ -42,10 +42,10 @@ const CONSTANTS = {
 	PROPERTIES: ".properties",
 	HELM: "helm",
 	OPERATOR: "operator",
-	CSM_HELM_V170: "1.0.0",
 	CSM_HELM_V180: "1.1.0",
-	CSM_HELM_V190: "1.2.0",
-	CSM_HELM_V1100: "1.3.0",
+	CSM_HELM_V190: "1.2.2",
+	CSM_HELM_V1102: "1.3.2",
+	CSM_HELM_V1110: "1.4.0",
 	HELM_TAINTS: `
     - key: "$KEY"
       operator: "Exists"
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/tests/ui-functions.test.js b/content/docs/deployment/csminstallationwizard/src/static/js/tests/ui-functions.test.js
index eb6e90a452..d4096b888c 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/tests/ui-functions.test.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/tests/ui-functions.test.js
@@ -68,10 +68,10 @@ const CONSTANTS = {
 	PROPERTIES: ".properties",
 	HELM: "helm",
 	OPERATOR: "operator",
-	CSM_HELM_V170: "1.0.0",
 	CSM_HELM_V180: "1.1.0",
-	CSM_HELM_V190: "1.2.0",
-	CSM_HELM_V1100: "1.3.0",
+	CSM_HELM_V190: "1.2.2",
+	CSM_HELM_V1102: "1.3.2",
+	CSM_HELM_V1110: "1.4.0",
 };
 
 describe("GIVEN onAuthorizationChange function", () => {
@@ -718,7 +718,7 @@ describe("GIVEN displayCommands function", () => {
 			<input id="array" value="powerstore">
 			<input id="installation-type" value="helm">
 			<input type="text" id="driver-namespace" value="csi-powerstore">
-			<input type="text" id="csm-version" value="1.7.0">
+			<input type="text" id="csm-version" value="1.8.0">
             <div id="command-text-area" style="display:none">
                 <div id="command-title"></div>
                 <span id="command-note" style="display:none"></span>
@@ -733,7 +733,7 @@ describe("GIVEN displayCommands function", () => {
 		expect($("#command-title").text()).toEqual("Run the following commands to install");
 		expect($("#command-note").text()).toEqual("Ensure that the namespaces and secrets are created before installing the helm chart");
 		expect($("#command1").text()).toEqual("helm repo add dell https://dell.github.io/helm-charts");
-		expect($("#command2").text()).toEqual("helm install powerstore dell/container-storage-modules -n csi-powerstore --version 1.0.0 -f values.yaml");
+		expect($("#command2").text()).toEqual("helm install powerstore dell/container-storage-modules -n csi-powerstore --version 1.1.0 -f values.yaml");
 	});
 
 	test("SHOULD show expected commands: Installation Type: Operator", () => {
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/tests/utility.test.js b/content/docs/deployment/csminstallationwizard/src/static/js/tests/utility.test.js
index ec53d7a6e2..3d068b187e 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/tests/utility.test.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/tests/utility.test.js
@@ -45,10 +45,10 @@ const CONSTANT_PARAM = {
 	PROPERTIES: ".properties",
 	HELM: "helm",
 	OPERATOR: "operator",
-	CSM_HELM_V170: "1.0.0",
 	CSM_HELM_V180: "1.1.0",
-	CSM_HELM_V190: "1.2.0",
-	CSM_HELM_V1100: "1.3.0",
+	CSM_HELM_V190: "1.2.2",
+	CSM_HELM_V1102: "1.3.2",
+	CSM_HELM_V1110: "1.4.0",
 	HELM_TAINTS: `
      - key: "$KEY"
        operator: "Exists"
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js b/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
index e6cc6af39b..f8dd87d6cb 100644
--- a/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
+++ b/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
@@ -470,20 +470,20 @@ function displayCommands(releaseNameValue, commandTitleValue, commandNoteValue,
 	installationType = document.getElementById("installation-type").value
 	var helmChartVersion;
 	switch (csmVersion) {
-		case "1.7.0":
-			helmChartVersion = CONSTANTS.CSM_HELM_V170;
-			break;
 		case "1.8.0":
 			helmChartVersion = CONSTANTS.CSM_HELM_V180;
 			break;
-		case "1.9.3":
-			helmChartVersion = CONSTANTS.CSM_HELM_V193;
+		case "1.9.0":
+			helmChartVersion = CONSTANTS.CSM_HELM_V190;
+			break;
+		case "1.10.2":
+			helmChartVersion = CONSTANTS.CSM_HELM_V1102;
 			break;
-		case "1.10.1":
-			helmChartVersion = CONSTANTS.CSM_HELM_V1101;
+		case "1.11.0":
+			helmChartVersion = CONSTANTS.CSM_HELM_V1100;
 			break;
 		default:
-			helmChartVersion = CONSTANTS.CSM_HELM_V1101;
+			helmChartVersion = CONSTANTS.CSM_HELM_V1100;
 			break;
 	}
 	$("#command-text-area").show();
diff --git a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.11.0-values.template b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.11.0-values.template
index b76d70d6eb..caa436626a 100644
--- a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.11.0-values.template
+++ b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.11.0-values.template
@@ -9,18 +9,18 @@ csi-powerstore:
     # "driver" defines the container image, used for the driver container.
     driver: dellemc/csi-powerstore:v2.11.0
     # CSI sidecars
-    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
-    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
-    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
-    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
-    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
-    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
+    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
+    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
+    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
+    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
+    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
 
     # CSM sidecars
     replication: dellemc/dell-csi-replicator:v1.9.0
-    vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0
+    vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.6.0
     podmon: dellemc/podmon:v1.10.0
-    metadataretriever: dellemc/csi-metadata-retriever:v1.6.0
+    metadataretriever: dellemc/csi-metadata-retriever:v1.8.0
   ## Controller ATTRIBUTES
   controller:
     controllerCount: $CONTROLLER_COUNT
@@ -118,17 +118,17 @@ csi-powermax:
   images:
     # "driver" defines the container image, used for the driver container.
     driver: dellemc/csi-powermax:v2.11.0
-    csireverseproxy: dellemc/csipowermax-reverseproxy:v2.9.0
+    csireverseproxy: dellemc/csipowermax-reverseproxy:v2.10.0
     # CSI sidecars
-    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
-    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
-    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
-    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
-    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
-    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
+    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
+    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
+    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
+    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
+    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
     # CSM sidecars
     replication: dellemc/dell-csi-replicator:v1.9.0
-    authorization: dellemc/csm-authorization-sidecar:v1.10.0
+    authorization: dellemc/csm-authorization-sidecar:v1.11.0
     migration: dellemc/dell-csi-migrator:v1.3.0
     noderescan: dellemc/dell-csi-node-rescanner:v1.2.0
   clusterPrefix: $POWERMAX_CLUSTER_PREFIX
@@ -223,17 +223,17 @@ csi-vxflexos:
     # "powerflexSdc" defines the SDC image for init container.
     powerflexSdc: dellemc/sdc:4.5
     # CSI sidecars
-    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
-    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
-    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
-    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
-    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
-    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
+    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
+    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
+    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
+    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
+    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
     # CSM sidecars
     replication: dellemc/dell-csi-replicator:v1.9.0
-    vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0
+    vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.6.0
     podmon: dellemc/podmon:v1.10.0
-    authorization: dellemc/csm-authorization-sidecar:v1.10.0
+    authorization: dellemc/csm-authorization-sidecar:v1.11.0
   certSecretCount: $CERT_SECRET_COUNT
   controller:
     replication:
@@ -320,17 +320,17 @@ csi-isilon:
     # "driver" defines the container image, used for the driver container.
     driver: dellemc/csi-isilon:v2.11.0
     # CSI sidecars
-    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
-    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
-    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
-    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
-    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
-    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
+    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
+    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
+    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
+    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
+    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
     # CSM sidecars
     replication: dellemc/dell-csi-replicator:v1.9.0
     podmon: dellemc/podmon:v1.10.0
-    authorization: dellemc/csm-authorization-sidecar:v1.10.0
-    metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
+    authorization: dellemc/csm-authorization-sidecar:v1.11.0
+    metadataretriever: dellemc/csi-metadata-retriever:v1.8.0
     encryption: dellemc/csm-encryption:v0.3.0
 
   certSecretCount: $CERT_SECRET_COUNT
@@ -430,12 +430,12 @@ csi-unity:
     # "driver" defines the container image, used for the driver container.
     driver: dellemc/csi-unity:v2.11.0
     # CSI sidecars
-    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
-    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
-    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
-    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
-    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
-    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+    attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
+    provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
+    snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
+    resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
+    registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
+    healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
     # CSM sidecars
     podmon: dellemc/podmon:v1.10.0
   certSecretCount: $CERT_SECRET_COUNT
diff --git a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template
index 1b2266edfb..5bc5d912c4 100644
--- a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template
+++ b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template
@@ -165,11 +165,11 @@ spec:
       # Leave as blank to consider all nodes
       # Allowed values: map of key-value pairs
       # Default value: None
-      nodeSelector:$CONTROLLER_POD_NODE_SELECTOR
+      nodeSelector: $CONTROLLER_POD_NODE_SELECTOR
 
       # tolerations: Define tolerations for the controller deployment, if required.
       # Default value: None
-      tolerations:$CONTROLLER_TOLERATIONS
+      tolerations: $CONTROLLER_TOLERATIONS
 
     node:
       envs:
@@ -212,11 +212,11 @@ spec:
       # Leave as blank to consider all nodes
       # Allowed values: map of key-value pairs
       # Default value: None
-      nodeSelector:$NODE_POD_NODE_SELECTOR
+      nodeSelector: $NODE_POD_NODE_SELECTOR
 
       # tolerations: Define tolerations for the node daemonset, if required.
       # Default value: None
-      tolerations:$NODE_TOLERATIONS
+      tolerations: $NODE_TOLERATIONS
       # - key: "node.kubernetes.io/memory-pressure"
       #   operator: "Exists"
       #   effect: "NoExecute"
@@ -245,10 +245,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: $AUTHORIZATION_ENABLED
-      configVersion: v1.10.0
+      configVersion: v1.11.0
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.10.0
+        image: dellemc/csm-authorization-sidecar:v1.11.0
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"
@@ -289,7 +289,7 @@ spec:
       - name: dell-replication-controller-manager
         # image: Defines controller image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/dell-replication-controller:v1.7.0
+        image: dellemc/dell-replication-controller:v1.9.0
         envs:
           # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
           # Set the value to "self" in case of stretched/single cluster configuration
@@ -321,14 +321,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: $OBSERVABILITY_OPERATOR_ENABLED
-      configVersion: v1.7.0
+      configVersion: v1.9.0
       components:
         - name: topology
           # enabled: Enable/Disable topology
           enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.7.0
+          image: dellemc/csm-topology:v1.9.0
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -362,7 +362,7 @@ spec:
           enabled: $OBSERVABILITY_OPERATOR_METRICS
           # image: Defines PowerScale metrics image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-metrics-powerscale:v1.4.0
+          image: dellemc/csm-metrics-powerscale:v1.6.0
           envs:
             # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale
             # Allowed values: int
diff --git a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template
index 55264ee3af..ac38800db8 100644
--- a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template
+++ b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template
@@ -232,14 +232,14 @@ spec:
     - name: csireverseproxy
       # enabled: Always set to true
       enabled: true
-      configVersion: v2.9.0
+      configVersion: v2.10.0
       forceRemoveModule: true
       components:
       - name: csipowermax-reverseproxy
       # image: Define the container images used for the reverse proxy
       # Default value: None
-      # Example: "csipowermax-reverseproxy:v2.9.0"
-        image: dellemc/csipowermax-reverseproxy:v2.9.0
+      # Example: "csipowermax-reverseproxy:v2.10.0"
+        image: dellemc/csipowermax-reverseproxy:v2.10.0
         envs:
           # "tlsSecret" defines the TLS secret that is created with certificate
           # and its associated key
@@ -299,7 +299,7 @@ spec:
       - name: dell-replication-controller-manager
         # image: Defines controller image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/dell-replication-controller:v1.7.0
+        image: dellemc/dell-replication-controller:v1.9.0
         envs:
           # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
           # Set the value to "self" in case of stretched/single cluster configuration
@@ -330,14 +330,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: $OBSERVABILITY_OPERATOR_ENABLED
-      configVersion: v1.7.0
+      configVersion: v1.9.0
       components:
       - name: topology
         # enabled: Enable/Disable topology
         enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
         # image: Defines karavi-topology image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/csm-topology:v1.7.0
+        image: dellemc/csm-topology:v1.9.0
         envs:
           # topology log level
           # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -362,7 +362,7 @@ spec:
         # enabled: Enable/Disable PowerMax metrics
         enabled: $OBSERVABILITY_OPERATOR_METRICS
         # image: Defines PowerMax metrics image. This shouldn't be changed
-        image: dellemc/csm-metrics-powermax:v1.2.0
+        image: dellemc/csm-metrics-powermax:v1.4.0
         envs:
           # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax
           # Allowed values: int
diff --git a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template
index 0a357fef38..3eeb1c1519 100644
--- a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template
+++ b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template
@@ -114,7 +114,7 @@ spec:
       # tolerations: Define tolerations for the controllers, if required.
       # Leave as blank to install controller on worker nodes
       # Default value: None
-      tolerations:$CONTROLLER_TOLERATIONS
+      tolerations: $CONTROLLER_TOLERATIONS
 
     node:
       envs:
@@ -141,12 +141,12 @@ spec:
       # Leave as blank to consider all nodes
       # Allowed values: map of key-value pairs
       # Default value: None
-      nodeSelector:$NODE_POD_NODE_SELECTOR
+      nodeSelector: $NODE_POD_NODE_SELECTOR
 
       # tolerations: Define tolerations for the controllers, if required.
       # Leave as blank to install controller on worker nodes
       # Default value: None
-      tolerations:$NODE_TOLERATIONS
+      tolerations: $NODE_TOLERATIONS
   
   modules:
     - name: resiliency