diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 04f103a3..7d0df2cf 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -70,7 +70,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret + value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -198,7 +198,7 @@ spec: name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value + value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/operatorconfig/driverconfig/powerflex/v2.13.0/node.yaml b/operatorconfig/driverconfig/powerflex/v2.13.0/node.yaml index b6e6f937..d7ea8e32 100644 --- a/operatorconfig/driverconfig/powerflex/v2.13.0/node.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.13.0/node.yaml @@ -30,6 +30,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch", "update"] - apiGroups: ["security.openshift.io"] resourceNames: ["privileged"] resources: ["securitycontextconstraints"] @@ -192,11 +195,41 @@ spec: - name: host-opt-emc-path mountPath: /host_opt_emc_path initContainers: + - name: mdm-container + image: quay.io/dell/container-storage-modules/csi-vxflexos:nightly + imagePullPolicy: Always + command: ["/csi-vxflexos.sh"] + args: + - "--array-config=/vxflexos-config/config" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + env: + - name: X_CSI_MODE + value: mdm-info + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + volumeMounts: + - name: vxflexos-config + mountPath: /vxflexos-config + - name: vxflexos-config-params + mountPath: /vxflexos-config-params + - name: certs + mountPath: /certs + readOnly: true + - name: mdm-dir + mountPath: /data - name: sdc securityContext: privileged: true image: dellemc/sdc:4.5.2.1 imagePullPolicy: IfNotPresent + command: + - "/bin/sh" + - "-c" + - | + source /data/node_mdms.txt + /files/scripts/init.sh env: - name: NODENAME valueFrom: @@ -204,11 +237,6 @@ spec: fieldPath: spec.nodeName - name: MODE value: "config" - - name: MDM - valueFrom: - secretKeyRef: - name: -config - key: MDM - name: HOST_DRV_CFG_PATH value: /opt/emc/scaleio/sdc/bin volumeMounts: @@ -224,6 +252,8 @@ spec: mountPath: /host_drv_cfg_path - name: host-opt-emc-path mountPath: /host_opt_emc_path + - name: mdm-dir + mountPath: /data volumes: - name: registration-dir hostPath: @@ -291,6 +321,8 @@ spec: hostPath: path: /var/run type: Directory + - name: mdm-dir + emptyDir: {} - name: certs projected: sources: diff --git a/pkg/drivers/common_test.go b/pkg/drivers/common_test.go index 6d0f5880..d406b6ba 100644 --- a/pkg/drivers/common_test.go +++ b/pkg/drivers/common_test.go @@ -116,6 +116,9 @@ func csmWithTolerations(driver csmv1.DriverType, version string) csmv1.Container func csmForPowerFlex(customCSMName string) csmv1.ContainerStorageModule { res := shared.MakeCSM(customCSMName, pFlexNS, shared.PFlexConfigVersion) + // Add driver common image + res.Spec.Driver.Common.Image = "driverimage" + // Add sdc initcontainer res.Spec.Driver.InitContainers = []csmv1.ContainerTemplate{{ Name: "sdc", diff --git a/pkg/drivers/commonconfig.go b/pkg/drivers/commonconfig.go index 5a7d3717..95d7552d 100644 --- a/pkg/drivers/commonconfig.go +++ b/pkg/drivers/commonconfig.go @@ -315,6 +315,13 @@ func GetNode(ctx context.Context, cr csmv1.ContainerStorageModule, operatorConfi for i := range initcontainers { utils.ReplaceAllContainerImageApply(operatorConfig.K8sVersion, &initcontainers[i]) utils.UpdateInitContainerApply(cr.Spec.Driver.InitContainers, &initcontainers[i]) + // mdm-container is exclusive to powerflex driver deamonset, will use the driver image as an init container + if *initcontainers[i].Name == "mdm-container" { + if string(cr.Spec.Driver.Common.Image) != "" { + image := string(cr.Spec.Driver.Common.Image) + initcontainers[i].Image = &image + } + } } nodeYaml.DaemonSetApplyConfig.Spec.Template.Spec.InitContainers = initcontainers diff --git a/pkg/drivers/commonconfig_test.go b/pkg/drivers/commonconfig_test.go index f4b64a8b..4bad1828 100644 --- a/pkg/drivers/commonconfig_test.go +++ b/pkg/drivers/commonconfig_test.go @@ -127,11 +127,23 @@ func TestGetController(t *testing.T) { func TestGetNode(t *testing.T) { ctx := context.Background() + foundInitMdm := false for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - _, err := GetNode(ctx, tt.csm, config, tt.driverName, tt.filename) + node, err := GetNode(ctx, tt.csm, config, tt.driverName, tt.filename) if tt.expectedErr == "" { assert.Nil(t, err) + initcontainers := node.DaemonSetApplyConfig.Spec.Template.Spec.InitContainers + for i := range initcontainers { + if *initcontainers[i].Name == "mdm-container" { + foundInitMdm = true + assert.Equal(t, string(tt.csm.Spec.Driver.Common.Image), *initcontainers[i].Image) + } + } + // if driver is powerflex, then check that mdm-container is present + if tt.driverName == "powerflex" { + assert.Equal(t, true, foundInitMdm) + } } else { assert.Containsf(t, err.Error(), tt.expectedErr, "expected error containing %q, got %s", tt.expectedErr, err) } diff --git a/pkg/modules/testdata/cr_powerflex_observability.yaml b/pkg/modules/testdata/cr_powerflex_observability.yaml index 575e6a1c..90bb8e19 100644 --- a/pkg/modules/testdata/cr_powerflex_observability.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability.yaml @@ -41,7 +41,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -120,7 +120,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml index e0e19282..47b4da9f 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml @@ -51,7 +51,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret + value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -164,7 +164,7 @@ spec: name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value + value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml index cf680591..96ef04d2 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml @@ -51,7 +51,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret + value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -164,7 +164,7 @@ spec: name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value + value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/samples/storage_csm_powerflex_v2130.yaml b/samples/storage_csm_powerflex_v2130.yaml index 6ba9b4bd..3c13fa69 100644 --- a/samples/storage_csm_powerflex_v2130.yaml +++ b/samples/storage_csm_powerflex_v2130.yaml @@ -70,7 +70,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret + value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". # Default monitor-interval: 60s @@ -199,7 +199,7 @@ spec: name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value + value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/config/driverconfig/powerflex/v2.13.0/node.yaml b/tests/config/driverconfig/powerflex/v2.13.0/node.yaml index 76462edb..9f6dc85d 100644 --- a/tests/config/driverconfig/powerflex/v2.13.0/node.yaml +++ b/tests/config/driverconfig/powerflex/v2.13.0/node.yaml @@ -183,11 +183,43 @@ spec: - name: udev-d mountPath: /rules.d initContainers: + - name: mdm-container + image: quay.io/dell/container-storage-modules/csi-vxflexos:nightly + imagePullPolicy: Always + command: ["/csi-vxflexos.sh"] + args: + - "--array-config=/vxflexos-config/config" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + env: + - name: X_CSI_MODE + value: mdm-info + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + volumeMounts: + - name: vxflexos-config + mountPath: /vxflexos-config + - name: vxflexos-config-params + mountPath: /vxflexos-config-params + - name: certs + mountPath: /certs + readOnly: true + - name: mdm-dir + mountPath: /data - name: sdc securityContext: privileged: true image: dellemc/sdc:4.5.2.1 imagePullPolicy: IfNotPresent + command: + - "/bin/sh" + - "-c" + - | + echo "Inside sdc init-container" + source /data/node_mdms.txt + env + /files/scripts/init.sh env: - name: NODENAME valueFrom: @@ -195,11 +227,6 @@ spec: fieldPath: spec.nodeName - name: MODE value: "config" - - name: MDM - valueFrom: - secretKeyRef: - name: -config - key: MDM - name: HOST_DRV_CFG_PATH value: /opt/emc/scaleio/sdc/bin volumeMounts: diff --git a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server.yaml b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server.yaml index 1103f3df..04007b0a 100644 --- a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server.yaml +++ b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server.yaml @@ -9,7 +9,7 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.11.0 + configVersion: v1.13.0 forceRemoveModule: true components: # For Kubernetes Container Platform only @@ -30,12 +30,12 @@ spec: - name: proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.11.0 - tenantService: dellemc/csm-authorization-tenant:v1.11.0 - roleService: dellemc/csm-authorization-role:v1.11.0 - storageService: dellemc/csm-authorization-storage:v1.11.0 + proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v1-nightly + tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1-nightly + roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v1-nightly + storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v1-nightly opa: openpolicyagent/opa - opaKubeMgmt: openpolicyagent/kube-mgmt:0.11 + opaKubeMgmt: openpolicyagent/kube-mgmt:8.5.7 # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string diff --git a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_n_minus_1.yaml b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_n_minus_1.yaml index bced5a7c..8a47eec1 100644 --- a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_n_minus_1.yaml +++ b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_n_minus_1.yaml @@ -30,12 +30,12 @@ spec: - name: proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.12.0 - tenantService: dellemc/csm-authorization-tenant:v1.12.0 - roleService: dellemc/csm-authorization-role:v1.12.0 - storageService: dellemc/csm-authorization-storage:v1.12.0 + proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v1.12.0 + tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1.12.0 + roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v1.12.0 + storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v1.12.0 opa: openpolicyagent/opa - opaKubeMgmt: openpolicyagent/kube-mgmt:0.11 + opaKubeMgmt: openpolicyagent/kube-mgmt:8.5.7 # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string diff --git a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml index d0fd7194..60c065ae 100644 --- a/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml +++ b/tests/e2e/testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml @@ -30,10 +30,10 @@ spec: - name: proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v1.13.0 - tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1.13.0 - roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v1.13.0 - storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v1.13.0 + proxyService: quay.io/dell/container-storage-modules/csm-authorization-proxy:v1-nightly + tenantService: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1-nightly + roleService: quay.io/dell/container-storage-modules/csm-authorization-role:v1-nightly + storageService: quay.io/dell/container-storage-modules/csm-authorization-storage:v1-nightly opa: docker.io/openpolicyagent/opa:latest opaKubeMgmt: docker.io/openpolicyagent/kube-mgmt:8.5.7 # certificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates diff --git a/tests/e2e/testfiles/scenarios.yaml b/tests/e2e/testfiles/scenarios.yaml index 515ead79..38043f54 100644 --- a/tests/e2e/testfiles/scenarios.yaml +++ b/tests/e2e/testfiles/scenarios.yaml @@ -140,8 +140,8 @@ - "Validate [authorization-proxy-server] module from CR [1] is installed" - "Configure authorization-proxy-server for [powerflex] for CR [1]" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflexAuth]" + - "Set up temporary secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflexAuth]" - "Apply custom resource [3]" - "Validate custom resource [3]" - "Validate [powerflex] driver from CR [3] is installed" @@ -160,8 +160,6 @@ - "Enable forceRemoveDriver on CR [4]" - "Delete custom resource [4]" - "Delete custom resource [2]" - - "Restore template [testfiles/powerflex-templates/csm-authorization-config.json] for [pflexAuthSidecar]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: Cert CSI @@ -628,7 +626,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -637,7 +635,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/ephemeral.properties] for [pflexEphemeral]" customTest: @@ -654,7 +651,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [2]" - "Apply custom resource [1]" - "Validate custom resource [1]" @@ -664,7 +661,6 @@ - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - "Delete custom resource [2]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: check_parameters.sh @@ -678,7 +674,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -686,7 +682,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: check_parameters.sh @@ -701,7 +696,7 @@ - "Given an environment with k8s or openshift, and CSM operator installed" - "Set [control-plane] node label" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -710,7 +705,6 @@ - "Remove [control-plane] node label" - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: check_parameters.sh @@ -724,7 +718,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -732,7 +726,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: check_parameters.sh @@ -746,7 +739,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -754,7 +747,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: check_parameters.sh @@ -768,7 +760,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [powerflex-config] in namespace [dell] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -776,7 +768,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: Cert CSI and check_parameters.sh @@ -790,13 +781,12 @@ - "powerflex" steps: - "Given an environment with k8s or openshift, and CSM operator installed" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Validate [powerflex] driver from CR [1] is not installed" - scenario: "Install PowerFlex Driver (With Authorization V2)" paths: @@ -1010,7 +1000,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" @@ -1025,8 +1015,11 @@ # cleanup - "Enable forceRemoveDriver on CR [2]" - "Delete custom resource [2]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" + customTest: + - name: Cert CSI + run: + - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2 - scenario: "Install PowerFlex Driver (With Observability)" paths: - "testfiles/storage_csm_powerflex_observability.yaml" @@ -1036,7 +1029,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [observability] module from CR [1] is installed" @@ -1044,7 +1037,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" customTest: - name: Cert CSI @@ -1058,14 +1050,13 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [observability] module from CR [1] is installed" # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - scenario: "Install PowerFlex Driver(With Observability and Custom Cert for Otel-Collector)" paths: @@ -1075,14 +1066,13 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [observability] module from CR [1] is installed" # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - scenario: "Install PowerFlex Driver (Standalone), Enable/Disable Observability" paths: @@ -1094,7 +1084,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [observability] module from CR [1] is not installed" @@ -1107,9 +1097,7 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Run custom test" - scenario: "Install Powerflex Driver (With Replication)" paths: - "testfiles/storage_csm_powerflex_replica.yaml" @@ -1120,20 +1108,14 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [replication] module from CR [1] is installed" - - "Run custom test" # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - customTest: - - name: HelloWorld - run: - - echo "no current test implemented for replication" - scenario: "Install Powerflex Driver (Standalone), Enable/Disable Replication" paths: - "testfiles/storage_csm_powerflex.yaml" @@ -1143,7 +1125,7 @@ steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [replication] module from CR [1] is not installed" @@ -1156,7 +1138,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - scenario: "Install PowerFlex Driver(Standalone), Enable Authorization V1, Enable Observability" paths: @@ -1174,9 +1155,8 @@ - "Validate [authorization-proxy-server] module from CR [1] is installed" - "Configure authorization-proxy-server for [powerflex] for CR [1]" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [2]" - "Validate custom resource [2]" - "Validate [powerflex] driver from CR [2] is installed" @@ -1191,14 +1171,11 @@ - "Validate [powerflex] driver from CR [2] is installed" - "Validate [authorization] module from CR [2] is installed" - "Validate [observability] module from CR [2] is installed" - - "Run custom test" # cleanup - "Enable forceRemoveDriver on CR [2]" - "Delete custom resource [1]" - "Delete custom resource [2]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Restore template [testfiles/powerflex-templates/csm-authorization-config.json] for [pflexAuthSidecar]" - scenario: "Install PowerFlex Driver(With Authorization V1 and Observability)" paths: - "testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml" @@ -1215,9 +1192,8 @@ - "Validate [authorization-proxy-server] module from CR [1] is installed" - "Configure authorization-proxy-server for [powerflex] for CR [1]" - "Create storageclass with name [op-e2e-vxflexos] and template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflexAuth]" + - "Set up temporary secret with template [testfiles/powerflex-templates/csm-authorization-config.json] name [karavi-authorization-config] in namespace [test-vxflexos] for [pflexAuthSidecar]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflexAuth]" - "Apply custom resource [2]" - "Validate custom resource [2]" - "Validate [powerflex] driver from CR [2] is installed" @@ -1228,9 +1204,7 @@ - "Enable forceRemoveDriver on CR [2]" - "Delete custom resource [2]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]" - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]" - - "Restore template [testfiles/powerflex-templates/csm-authorization-config.json] for [pflexAuthSidecar]" customTest: - name: Cert CSI run: @@ -1289,19 +1263,13 @@ - "sanity" steps: - "Given an environment with k8s or openshift, and CSM operator installed" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" - "Validate [resiliency] module from CR [1] is installed" - - "Run custom test" # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - customTest: - - name: CustomTest - run: - - echo "no current test for resiliency" - scenario: "Install PowerFlex Driver(Standalone), Enable/Disable Resiliency" paths: - "testfiles/storage_csm_powerflex.yaml" @@ -1310,7 +1278,7 @@ - "resiliency" steps: - "Given an environment with k8s or openshift, and CSM operator installed" - - "Set up secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" + - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]" - "Apply custom resource [1]" - "Validate custom resource [1]" - "Validate [powerflex] driver from CR [1] is installed" @@ -1324,7 +1292,6 @@ # cleanup - "Enable forceRemoveDriver on CR [1]" - "Delete custom resource [1]" - - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]" - scenario: "Install PowerScale Driver(With Resiliency)" paths: - "testfiles/storage_csm_powerscale_resiliency.yaml" @@ -1946,6 +1913,7 @@ - "testfiles/storage_csm_powerflex.yaml" tags: - "zoning" + - "powerflex" steps: - "Given an environment with k8s or openshift, and CSM operator installed" - "Run [Apply Node Labels]" diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml index 4770fe3c..339485ea 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex.yaml @@ -50,7 +50,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -160,7 +160,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml index fafa1a1e..b69fd3a9 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml @@ -45,7 +45,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -149,7 +149,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml index 77f1b7e1..3d168b5f 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml @@ -45,7 +45,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -148,7 +148,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml index dac23da8..1b8f5d08 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml @@ -45,7 +45,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -148,7 +148,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml index a0c2acd8..0c81d846 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml @@ -45,7 +45,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -149,7 +149,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml index 49e6b995..30c1f3d0 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml @@ -43,7 +43,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -122,16 +122,16 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v2.1.0 + configVersion: v1.13.0 components: - name: karavi-authorization-proxy - image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1-nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml index 5e5e724f..37589f89 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml @@ -122,16 +122,16 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v2.0.0 + configVersion: v1.12.0 components: - name: karavi-authorization-proxy - image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.0.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml index 8d74fd3a..3b2d28b9 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml @@ -50,7 +50,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -160,7 +160,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml index 4c81b91e..0b19f7e5 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml @@ -45,7 +45,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value + value: "10.xx.xx.xx,10.xx.xx.xx" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -149,7 +149,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml index 6293e7ee..50ace77e 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml @@ -43,7 +43,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -122,7 +122,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml index b7daed8f..4def8ec0 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml @@ -43,7 +43,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -122,16 +122,16 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v2.1.0 + configVersion: v1.13.0 components: - name: karavi-authorization-proxy - image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:nightly + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1-nightly envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml index 73dd8adb..8fefedca 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml @@ -43,7 +43,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -122,7 +122,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml index b3991a71..5fc51dd5 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml @@ -43,7 +43,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -122,7 +122,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # observability: allows to configure observability - name: observability diff --git a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml index ecf1ab81..8b86393e 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml @@ -21,7 +21,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.11.0" + image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -50,7 +50,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -160,7 +160,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: # Replication: allows to configure replication # Replication CRDs must be installed before installing driver @@ -177,7 +177,7 @@ spec: # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string # Default value: None - image: dellemc/dell-csi-replicator:v1.9.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:nightly envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string diff --git a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml index 0d84e1e5..45956199 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml @@ -59,7 +59,7 @@ spec: - name: HOST_PID value: "1" - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller @@ -169,7 +169,7 @@ spec: name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" # provide MDM value + value: "10.x.x.x,10.x.x.x" # provide MDM value modules: - name: resiliency # enabled: Enable/Disable Resiliency feature diff --git a/tests/shared/common.go b/tests/shared/common.go index fc48d6ae..73934a46 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -28,8 +28,8 @@ import ( // ConfigVersions used for all unit tests const ( - PFlexConfigVersion string = "v2.12.0" - DowngradeConfigVersion string = "v2.11.0" + PFlexConfigVersion string = "v2.13.0" + DowngradeConfigVersion string = "v2.12.0" ConfigVersion string = "v2.11.0" UpgradeConfigVersion string = "v2.11.0" JumpUpgradeConfigVersion string = "v2.12.0"