Adding new changes for Powermax (#824)

dell · Sep 5, 2023 · 522b3f2 · 522b3f2
1 parent 0ea2ef2
commit 522b3f2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js b/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
@@ -413,6 +413,9 @@ function displayModules(installationType, driverName, CONSTANTS_PARAM) {
 			$(".replication-mod").show();
 			$(".iscsichap").show();
 			$(".transport-protocol").show();
+			$(".topology").show();
+			$(".fsGroupPolicy").show();
+			$(".max-volumes-per-node").show();
 			document.getElementById("driver-namespace").value = CONSTANTS_PARAM.POWERMAX_NAMESPACE;
 			if (installationType === CONSTANTS_PARAM.OPERATOR) {
 
@@ -426,11 +429,7 @@ function displayModules(installationType, driverName, CONSTANTS_PARAM) {
 				$(".snapshot-feature").hide();
 				$(".vol-name-prefix").hide();
 				$(".transport-protocol").show();
-				$(".migration").hide();
 				$(".resizer").hide();
-				$(".fsGroupPolicy").show();	
-				$(".transport-protocol").show();				
-				$(".topology").show();	
 				document.getElementById("label-value").value = CONSTANTS_PARAM.POWERMAX_LABEL_VALUE;
 			}
 			break;

diff --git a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.7.0-values.template b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.7.0-values.template
@@ -106,6 +106,9 @@ csi-powermax:
     driverRepository: $IMAGE_REPOSITORY
   clusterPrefix: $POWERMAX_CLUSTER_PREFIX
   portGroups: "$POWERMAX_PORT_GROUPS"
+  fsGroupPolicy: "$FSGROUP_POLICY"
+  enableCHAP: $ISCSI_CHAP_ENABLED
+  transportProtocol: "$NODE_TRANSPORT_PROTOCOL"
   controller:
     controllerCount: $CONTROLLER_COUNT
     volumeNamePrefix: $VOLUME_NAME_PREFIX
@@ -121,6 +124,8 @@ csi-powermax:
   node:
     healthMonitor:
       enabled: $HEALTH_MONITOR_ENABLED
+    topologyControl:
+      enabled: $TOPOLOGY_ENABLED
     nodeSelector: $NODE_POD_NODE_SELECTOR
     tolerations: $NODE_TOLERATIONS
      - key: "node.kubernetes.io/memory-pressure"
@@ -438,7 +443,7 @@ karavi-observability:
   enabled: $OBSERVABILITY_ENABLED
   karaviMetricsPowerstore:
     enabled: $POWERSTORE_OBSERVABILITY_METRICS_ENABLED
-  karaviMetricsPowerMax:
+  karaviMetricsPowermax:
     enabled: $POWERMAX_OBSERVABILITY_METRICS_ENABLED
   karaviMetricsPowerflex:
     enabled: $POWERFLEX_OBSERVABILITY_METRICS_ENABLED

diff --git a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template
@@ -108,6 +108,12 @@ csi-powermax:
     driverRepository: $IMAGE_REPOSITORY
   clusterPrefix: $POWERMAX_CLUSTER_PREFIX
   portGroups: "$POWERMAX_PORT_GROUPS"
+  fsGroupPolicy: "$FSGROUP_POLICY"
+  maxPowerMaxVolumesPerNode: $MAX_VOLUMES_PER_NODE
+  enableCHAP: $ISCSI_CHAP_ENABLED
+  transportProtocol: "$NODE_TRANSPORT_PROTOCOL"
+  storageCapacity:
+    enabled: $STORAGE_CAPACITY_ENABLED
   controller:
     controllerCount: $CONTROLLER_COUNT
     volumeNamePrefix: $VOLUME_NAME_PREFIX
@@ -123,6 +129,8 @@ csi-powermax:
   node:
     healthMonitor:
       enabled: $HEALTH_MONITOR_ENABLED
+    topologyControl:
+      enabled: $TOPOLOGY_ENABLED
     nodeSelector: $NODE_POD_NODE_SELECTOR
     tolerations: $NODE_TOLERATIONS
      - key: "node.kubernetes.io/memory-pressure"
@@ -135,7 +143,7 @@ csi-powermax:
        operator: "Exists"
        effect: "NoExecute"
   csireverseproxy:
-    image: dellemc/csipowermax-reverseproxy:v2.6.0
+    image: dellemc/csipowermax-reverseproxy:v2.7.0
     deployAsSidecar: true
   replication:
     enabled: $REPLICATION_ENABLED
@@ -450,7 +458,7 @@ karavi-observability:
   enabled: $OBSERVABILITY_ENABLED
   karaviMetricsPowerstore:
     enabled: $POWERSTORE_OBSERVABILITY_METRICS_ENABLED
-  karaviMetricsPowerMax:
+  karaviMetricsPowermax:
     enabled: $POWERMAX_OBSERVABILITY_METRICS_ENABLED
   karaviMetricsPowerflex:
     enabled: $POWERFLEX_OBSERVABILITY_METRICS_ENABLED

diff --git a/.../docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.7.0.template b/.../docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.7.0.template
@@ -26,11 +26,6 @@ spec:
       # Allowed values: ReadWriteOnceWithFSType, File , None
       # Default value: ReadWriteOnceWithFSType
       fSGroupPolicy: "$FSGROUP_POLICY"
-      # storageCapacity: Helps the scheduler to schedule the pod on a node satisfying the topology constraints, only if the requested capacity is available on the storage array
-      # Allowed values:
-      #   true: enable storage capacity tracking
-      #   false: disable storage capacity tracking
-      storageCapacity: $STORAGE_CAPACITY_ENABLED
     # Config version for CSI PowerMax v2.7.0 driver
     configVersion: v2.7.0
     # replica: Define the number of PowerMax controller nodes

diff --git a/.../docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template b/.../docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template
@@ -186,7 +186,7 @@ spec:
         # Allowed values: Any value greater than or equal to 0
         # Default value: "0"
         - name: X_CSI_MAX_VOLUMES_PER_NODE
-          values: "0"
+          values: "$MAX_VOLUMES_PER_NODE"
       # nodeSelector: Define node selection constraints for node pods.
       # For the pod to be eligible to run on a node, the node must have each
       # of the indicated key-value pairs as labels.
@@ -229,14 +229,14 @@ spec:
     - name: csireverseproxy
       # enabled: Always set to true
       enabled: true
-      configVersion: v2.6.0
+      configVersion: v2.7.0
       forceRemoveModule: true
       components:
       - name: csipowermax-reverseproxy
       # image: Define the container images used for the reverse proxy
       # Default value: None
-      # Example: "csipowermax-reverseproxy:v2.6.0"
-        image: dellemc/csipowermax-reverseproxy:v2.6.0
+      # Example: "csipowermax-reverseproxy:v2.7.0"
+        image: dellemc/csipowermax-reverseproxy:v2.7.0
         envs:
           # "tlsSecret" defines the TLS secret that is created with certificate
           # and its associated key