diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml index 8fe01c27..a2c1bb62 100644 --- a/samples/storage_csm_powermax_v2120.yaml +++ b/samples/storage_csm_powermax_v2120.yaml @@ -53,17 +53,6 @@ spec: # Default value: None imagePullPolicy: IfNotPresent envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -77,26 +66,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, - # "NVMETCP" for NVMeTCP or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "NVMETCP" = NVMeTCP protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/powermax-templates/powermax-array-config.yaml b/tests/e2e/testfiles/powermax-templates/powermax-array-config.yaml index 848ab8ad..2731483b 100644 --- a/tests/e2e/testfiles/powermax-templates/powermax-array-config.yaml +++ b/tests/e2e/testfiles/powermax-templates/powermax-array-config.yaml @@ -17,7 +17,11 @@ metadata: namespace: powermax data: powermax-array-config.yaml: | + # List of comma-separated port groups (ISCSI only). Example: PortGroup1, portGroup2 Required for iSCSI only X_CSI_POWERMAX_PORTGROUPS: "REPLACE_PORTGROUPS" + # Choose which transport protocol to use (ISCSI, FC, NVMETCP, auto or None) defaults to auto if nothing is specified X_CSI_TRANSPORT_PROTOCOL: "REPLACE_PROTOCOL" + # IP address of the Unisphere for PowerMax (Required), Defaults to https://0.0.0.0:8443 X_CSI_POWERMAX_ENDPOINT: "https://REPLACE_AUTH_ENDPOINT:9400" + # List of comma-separated array ID(s) which will be managed by the driver (Required) X_CSI_MANAGED_ARRAYS: "REPLACE_ARRAYS" diff --git a/tests/e2e/testfiles/storage_csm_powermax.yaml b/tests/e2e/testfiles/storage_csm_powermax.yaml index 739ac196..e1151e54 100644 --- a/tests/e2e/testfiles/storage_csm_powermax.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax.yaml @@ -52,19 +52,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -78,24 +67,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml index e1fa52dd..e94cdb7d 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml @@ -51,19 +51,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -77,26 +66,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, - # "NVMETCP" for NVMeTCP or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "NVMETCP" = NVMeTCP protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: @@ -278,7 +247,7 @@ spec: configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml index 6bb4862f..074b7a6b 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml @@ -52,19 +52,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -78,24 +67,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml index d2c282ea..3ec92763 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml @@ -51,19 +51,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -77,26 +66,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, - # "NVMETCP" for NVMeTCP or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "NVMETCP" = NVMeTCP protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: @@ -278,7 +247,7 @@ spec: configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml index 25dd455a..2c357589 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml @@ -52,19 +52,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -78,24 +67,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml index dbaaca2d..131e1254 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml @@ -52,19 +52,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -78,24 +67,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml b/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml index 15e6ee72..a4bcb7ca 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml @@ -52,19 +52,8 @@ spec: # IfNotPresent: Only pull the image if it does not already exist on the node. # Never: Never pull the image. # Default value: None - imagePullPolicy: IfNotPresent + imagePullPolicy: Always envs: - # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning - # Default value: None - # Examples: "000000000001", "000000000002" - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays - # In case of multi-array, provide an endpoint of locally attached array - # Default value: None - # Example: https://0.0.0.1:8443 - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto # all resources created in the Array # This should be unique per K8s/CSI deployment @@ -78,24 +67,6 @@ spec: # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: /var/lib/kubelet - # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. - # It is a comma separated list of portgroup names. - # Required only in case of iSCSI port groups - # Allowed values: iSCSI Port Group names - # Default value: None - # Examples: "pg1", "pg1, pg2" - - name: X_CSI_POWERMAX_PORTGROUPS - value: "" - # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, - # "ISCSI" for iSCSI, or "" for autoselection. - # Allowed values: - # "FC" - Fiber Channel protocol - # "FIBER" - Fiber Channel protocol - # "ISCSI" - iSCSI protocol - # "" - Automatic selection of transport protocol - # Default value: "" - - name: X_CSI_TRANSPORT_PROTOCOL - value: "" # VMware/vSphere virtualization support # set X_CSI_VSPHERE_ENABLED to true, if you to enable VMware virtualized environment support via RDM # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_val1.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_val1.yaml index 4c4852a3..c973a988 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_val1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_val1.yaml @@ -225,7 +225,7 @@ spec: configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_val2.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_val2.yaml index 1f2b83f1..03ab944a 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_val2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_val2.yaml @@ -225,7 +225,7 @@ spec: configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/shared/common.go b/tests/shared/common.go index 6e598cae..4babdaf4 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -14,6 +14,7 @@ package shared import ( "os" + "path/filepath" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" @@ -172,7 +173,7 @@ func MakeConfigMap(name, ns, _ string) *corev1.ConfigMap { // MakeSecretWithJSON returns a driver pre-req secret array-config func MakeSecretWithJSON(name string, ns string, configFile string) *corev1.Secret { - configJSON, _ := os.ReadFile(configFile) + configJSON, _ := os.ReadFile(filepath.Clean(configFile)) data := map[string][]byte{ "config": configJSON, }