From 0c7713a1b3cf5b7de398433a6dce47602f6e85cf Mon Sep 17 00:00:00 2001
From: Fernando Alfaro Campos <Fernando.Alfaro_campos@Dell.com>
Date: Wed, 25 Sep 2024 16:32:36 -0400
Subject: [PATCH] Update powerscale template files

---
 .../e2e/testfiles/storage_csm_powerscale.yaml | 23 +++++++++++++++++++
 .../storage_csm_powerscale_auth.yaml          | 10 +++++++-
 .../storage_csm_powerscale_resiliency.yaml    | 17 --------------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/tests/e2e/testfiles/storage_csm_powerscale.yaml b/tests/e2e/testfiles/storage_csm_powerscale.yaml
index e1172fd30..953f7b7d2 100644
--- a/tests/e2e/testfiles/storage_csm_powerscale.yaml
+++ b/tests/e2e/testfiles/storage_csm_powerscale.yaml
@@ -312,6 +312,14 @@ spec:
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
           image: dellemc/csm-topology:v1.9.0
+          # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          certificate: ""
+          # privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          privateKey: ""
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -324,12 +332,27 @@ spec:
           # image: Defines otel-collector image. This shouldn't be changed
           # Allowed values: string
           image: otel/opentelemetry-collector:0.42.0
+          # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          certificate: ""
+          # privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
+          #  for self-signed certs, leave empty string
+          # Allowed values: string
+          privateKey: ""
           envs:
             # image of nginx proxy image
             # Allowed values: string
             # Default value: "nginxinc/nginx-unprivileged:1.20"
             - name: "NGINX_PROXY_IMAGE"
               value: "nginxinc/nginx-unprivileged:1.20"
+        # enabled: Enable/Disable cert-manager
+        # Allowed values:
+        #   true: enable deployment of cert-manager
+        #   false: disable deployment of cert-manager only if it's already deployed
+        # Default value: true
+        - name: cert-manager
+          enabled: false
         - name: metrics-powerscale
           # enabled: Enable/Disable PowerScale metrics
           enabled: false
diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml
index 99a1154c7..6176b4436 100644
--- a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml
+++ b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml
@@ -16,6 +16,7 @@ spec:
     replicas: 1
     dnsPolicy: ClusterFirstWithHostNet
     forceUpdate: true
+    forceRemoveDriver: true
     common:
       image: "dellemc/csi-isilon:nightly"
       imagePullPolicy: IfNotPresent
@@ -33,7 +34,7 @@ spec:
         # Allowed value: valid port number
         # Default value: 8080
         - name: X_CSI_ISI_PORT
-          value: ""
+          value: "8080"
         # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster.
         # This value acts as a default value for isiPath, if not specified for a cluster config in secret
         # Ensure that this path exists on PowerScale cluster.
@@ -65,6 +66,13 @@ spec:
         # Default value: true
         - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION
           value: "true"
+        # X_CSI_ISI_AUTH_TYPE: Specify the authentication method to be used.
+        # Allowed values:
+        #   0: basic authentication
+        #   1: session-based authentication
+        # Default value: 0
+        - name: X_CSI_ISI_AUTH_TYPE
+          value: "1"
         # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label <provisionerName>.dellemc.com/<powerscalefqdnorip>:<provisionerName>
         # has to be used for making connection to backend PowerScale Array.
         # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class.
diff --git a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml
index 5409ef5bb..badf06f20 100644
--- a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml
+++ b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml
@@ -293,20 +293,3 @@ spec:
             - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
             - "--driverPodLabelValue=dell-storage"
             - "--ignoreVolumelessPods=false"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: isilon-config-params
-  namespace: isilon
-data:
-  driver-config-params.yaml: |
-    CSI_LOG_LEVEL: "debug"
-    CSI_LOG_FORMAT: "TEXT"
-    PODMON_CONTROLLER_LOG_LEVEL: "debug"
-    PODMON_CONTROLLER_LOG_FORMAT: "TEXT"
-    PODMON_NODE_LOG_LEVEL: "debug"
-    PODMON_NODE_LOG_FORMAT: "TEXT"
-spec:
-  driver:
-    configVersion: v2.11.0