Updated UI for module support in powerscale (#765)

* Updated UI for module support in powerscale * fix authorization issue
dell · Aug 22, 2023 · 8f3b3b3 · 8f3b3b3
1 parent 57b0b24
commit 8f3b3b3
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 30 deletions.
diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/generate-yaml.js b/content/docs/deployment/csminstallationwizard/src/static/js/generate-yaml.js
@@ -100,7 +100,7 @@ function setValues(csmMapValues, CONSTANTS_PARAM) {
 	DriverValues.operatorResiliency = $("#operator-resiliency").prop('checked') ? true : false;
 	DriverValues.storageCapacity = $("#storage-capacity").prop('checked') ? true : false;
 	DriverValues.authorizationSkipCertValidation = $("#authorization-skip-cert-validation").prop('checked') ? true : false;
-	DriverValues.authorizationProxyHost = document.getElementById("authorization-proxy-host").value || '""';
+	DriverValues.authorizationProxyHost = document.getElementById("authorization-proxy-host").value;
 	DriverValues.certManagerEnabled = $("#certmanager").prop('checked') ? true : false;
 	DriverValues.topologyEnabled = $("#topology").prop('checked') ? true : false;
 	observabilityEnabled = DriverValues.observability;

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
@@ -147,7 +147,7 @@ describe("GIVEN setValues function", () => {
 			resiliency: false,
 			storageCapacity: false,
 			authorizationSkipCertValidation: false,
-			authorizationProxyHost: '""',
+			authorizationProxyHost: '',
 			certManagerEnabled: false,
 			storageArrayId: undefined,
 			storageArrayEndpointUrl: '""',
@@ -258,7 +258,7 @@ describe("GIVEN setValues function", () => {
 			resiliency: false,
 			storageCapacity: false,
 			authorizationSkipCertValidation: false,
-			authorizationProxyHost: '""',
+			authorizationProxyHost: '',
 			certManagerEnabled: false,
 			storageArrayId: undefined,
 			storageArrayEndpointUrl: '""',
@@ -642,7 +642,7 @@ describe("GIVEN createYamlString function", () => {
 		replicationImage: "dellemc/dell-csi-replicator:v1.4.0",
 		authorizationImage: "dellemc/csm-authorization-sidecar:v1.6.0",
 		certManagerEnabled: false,
-		authorizationProxyHost: '""',
+		authorizationProxyHost: '',
 		monitor: false,
 		certSecretCount: 0,
 		storageArrayId: "",
@@ -762,7 +762,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
         skipCertificateValidation:  true
       vSphere:
         enabled: false
@@ -827,7 +827,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
 
     ## CSI Unity
     ########################
@@ -1027,7 +1027,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
         skipCertificateValidation:  true
       vSphere:
         enabled: false
@@ -1092,7 +1092,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
 
     ## CSI Unity
     ########################
@@ -1293,7 +1293,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
         skipCertificateValidation:  true
       vSphere:
         enabled: false
@@ -1358,7 +1358,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
 
     ## CSI Unity
     ########################
@@ -1561,7 +1561,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
         skipCertificateValidation:  true
       vSphere:
         enabled: false
@@ -1626,7 +1626,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
 
     ## CSI Unity
     ########################
@@ -1828,7 +1828,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
         skipCertificateValidation:  true
       vSphere:
         enabled: false
@@ -1893,7 +1893,7 @@ describe("GIVEN createYamlString function", () => {
       authorization:
         enabled: false
         sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.6.0
-        proxyHost: ""
+        proxyHost: 
 
     ## CSI Unity
     ########################

diff --git a/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js b/content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
@@ -305,6 +305,9 @@ function displayModules(installationType, driverName, CONSTANTS_PARAM) {
 			$(".storage-capacity").show();
 			document.getElementById("driver-namespace").value = CONSTANTS_PARAM.POWERSCALE_NAMESPACE;
 			if (installationType === 'operator'){
+				$(".observability-operator").show();
+				$(".observability").hide();
+				$(".replication-operator").show();
 				$(".resiliency").hide();
 				$(".resiliency-operator").show();
 				$(".image-repository").hide();

diff --git a/...nt/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.7.0.template b/...nt/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.7.0.template
@@ -295,7 +295,7 @@ spec:
           # Set the value to "self" in case of stretched/single cluster configuration
           # Allowed values: string
           - name: "TARGET_CLUSTERS_IDS"
-            value: "target-cluster-1"
+            value: "$TARGET_CLUSTER_ID"
           # Replication log level
           # Allowed values: "error", "warn"/"warning", "info", "debug"
           # Default value: "debug"
@@ -325,12 +325,12 @@ spec:
     # observability: allows to configure observability
     - name: observability
       # enabled: Enable/Disable observability
-      enabled: $OBSERVABILITY_ENABLED
+      enabled: $OBSERVABILITY_OPERATOR_ENABLED
       configVersion: v1.5.0
       components:
         - name: topology
           # enabled: Enable/Disable topology
-          enabled: $OBSERVABILITY_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-topology:v1.5.0
@@ -343,7 +343,7 @@ spec:
 
         - name: otel-collector
           # enabled: Enable/Disable OpenTelemetry Collector
-          enabled: $POWERSCALE_OBSERVABILITY_METRICS_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_OTEL
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
           image: otel/opentelemetry-collector:0.42.0
@@ -360,11 +360,11 @@ spec:
           #   true: enable deployment of cert-manager
           #   false: disable deployment of cert-manager only if it's already deployed
           # Default value: false
-          enabled: $OBSERVABILITY_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_ENABLED
 
         - name: metrics-powerscale
           # enabled: Enable/Disable PowerScale metrics
-          enabled: $POWERSCALE_OBSERVABILITY_METRICS_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_METRICS
           # image: Defines PowerScale metrics image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-metrics-powerscale:v1.2.0

diff --git a/...nt/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template b/...nt/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template
@@ -295,7 +295,7 @@ spec:
           # Set the value to "self" in case of stretched/single cluster configuration
           # Allowed values: string
           - name: "TARGET_CLUSTERS_IDS"
-            value: "target-cluster-1"
+            value: "$TARGET_CLUSTER_ID"
           # Replication log level
           # Allowed values: "error", "warn"/"warning", "info", "debug"
           # Default value: "debug"
@@ -325,12 +325,12 @@ spec:
     # observability: allows to configure observability
     - name: observability
       # enabled: Enable/Disable observability
-      enabled: $OBSERVABILITY_ENABLED
+      enabled: $OBSERVABILITY_OPERATOR_ENABLED
       configVersion: v1.5.0
       components:
         - name: topology
           # enabled: Enable/Disable topology
-          enabled: $OBSERVABILITY_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-topology:v1.5.0
@@ -343,7 +343,7 @@ spec:
 
         - name: otel-collector
           # enabled: Enable/Disable OpenTelemetry Collector
-          enabled: $POWERSCALE_OBSERVABILITY_METRICS_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_OTEL
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
           image: otel/opentelemetry-collector:0.42.0
@@ -360,11 +360,11 @@ spec:
           #   true: enable deployment of cert-manager
           #   false: disable deployment of cert-manager only if it's already deployed
           # Default value: false
-          enabled: $OBSERVABILITY_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_ENABLED
 
         - name: metrics-powerscale
           # enabled: Enable/Disable PowerScale metrics
-          enabled: $POWERSCALE_OBSERVABILITY_METRICS_ENABLED
+          enabled: $OBSERVABILITY_OPERATOR_METRICS
           # image: Defines PowerScale metrics image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-metrics-powerscale:v1.2.0

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
@@ -249,10 +249,10 @@ spec:
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"
-            value: $AUTHORIZATION_PROXY_HOST
+            value: "$AUTHORIZATION_PROXY_HOST"
           # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server
           - name: "SKIP_CERTIFICATE_VALIDATION"
-            value: $AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION
+            value: "$AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION"
 
     # Replication: allows configuring replication module
     # Replication CRDs must be installed before installing driver

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
@@ -255,10 +255,10 @@ spec:
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"
-            value: $AUTHORIZATION_PROXY_HOST
+            value: "$AUTHORIZATION_PROXY_HOST"
           # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server
           - name: "SKIP_CERTIFICATE_VALIDATION"
-            value: $AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION
+            value: "$AUTHORIZATION_SKIP_CERTIFICATE_VALIDATION"
 
     # Replication: allows configuring replication module
     # Replication CRDs must be installed before installing driver