Patch 1.6.1 Without yaml lint fixes #709

JacobGros · 2024-09-26T20:53:16Z

Description

CSM-Operator changes for CSM 1.11.1, without yaml lint fixes.

GitHub Issues

List the GitHub issues impacted by this PR:

GitHub Issue #
dell/csm#1478
dell/csm#1482

Checklist:

I have performed a self-review of my own code to ensure there are no formatting, vetting, linting, or security issues
I have verified that new and existing unit tests pass locally with my changes
I have not allowed coverage numbers to degenerate
I have maintained at least 90% code coverage
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have added tests that prove my fix is effective or that my feature works
I have maintained backward compatibility

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

…elease branch (#669) Signed-off-by: shefali-malhotra <[email protected]>

* Add Powerscale port variable * Template auth variables * Update go files * Add Powerscale port variable handling * Fix scenarios for PowerScale * Update powerscale template files

* Fix pmaxCreds not set correctly in e2e * Update scenarios.yaml

This reverts commit ca89db9.

This reverts commit e783973.

This reverts commit 8591919.

This reverts commit d919c70.

gallacher · 2024-09-27T17:14:38Z

tests/e2e/steps/steps_def.go

-	pscaleSecretMap        = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_USER": "PSCALE_USER", "REPLACE_PASS": "PSCALE_PASS", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT"}
-	pscaleAuthSecretMap    = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_USER": "PSCALE_USER", "REPLACE_PASS": "PSCALE_PASS", "REPLACE_AUTH_ENDPOINT": "PSCALE_AUTH_ENDPOINT", "REPLACE_PORT": "PSCALE_AUTH_PORT", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT"}
-	pscaleAuthSidecarMap   = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_AUTH_ENDPOINT": "PSCALE_AUTH_ENDPOINT", "REPLACE_PORT": "PSCALE_AUTH_PORT"}
+	pscaleSecretMap        = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_USER": "PSCALE_USER", "REPLACE_PASS": "PSCALE_PASS", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_PORT": "PSCALE_PORT"}


Why are these changes required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:14:54Z

tests/e2e/steps/steps_def.go

@@ -67,7 +67,7 @@ var (
 	pflexCrMap = map[string]string{"REPLACE_STORAGE_NAME": "PFLEX_STORAGE", "REPLACE_STORAGE_TYPE": "PFLEX_STORAGE", "REPLACE_ENDPOINT": "PFLEX_ENDPOINT", "REPLACE_SYSTEM_ID": "PFLEX_SYSTEMID", "REPLACE_VAULT_STORAGE_PATH": "PFLEX_VAULT_STORAGE_PATH", "REPLACE_ROLE_NAME": "PFLEX_ROLE", "REPLACE_QUOTA": "PFLEX_QUOTA", "REPLACE_STORAGE_POOL_PATH": "PFLEX_POOL", "REPLACE_TENANT_NAME": "PFLEX_TENANT", "REPLACE_TENANT_ROLES": "PFLEX_ROLE", "REPLACE_TENANT_VOLUME_PREFIX": "PFLEX_TENANT_PREFIX"}

 	// Auth V2
-	pscaleCrMap = map[string]string{"REPLACE_STORAGE_NAME": "PSCALE_STORAGE", "REPLACE_STORAGE_TYPE": "PSCALE_STORAGE", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_SYSTEM_ID": "PSCALE_CLUSTER", "REPLACE_VAULT_STORAGE_PATH": "PSCALE_VAULT_STORAGE_PATH", "REPLACE_ROLE_NAME": "PSCALE_ROLE", "REPLACE_QUOTA": "PSCALE_QUOTA", "REPLACE_STORAGE_POOL_PATH": "PSCALE_POOL_V2", "REPLACE_TENANT_NAME": "PSCALE_TENANT", "REPLACE_TENANT_ROLES": "PSCALE_ROLE", "REPLACE_TENANT_VOLUME_PREFIX": "PSCALE_TENANT_PREFIX"}
+	pscaleCrMap = map[string]string{"REPLACE_STORAGE_NAME": "PSCALE_STORAGE", "REPLACE_STORAGE_TYPE": "PSCALE_STORAGE", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_SYSTEM_ID": "PSCALE_CLUSTER", "REPLACE_VAULT_STORAGE_PATH": "PSCALE_VAULT_STORAGE_PATH", "REPLACE_ROLE_NAME": "PSCALE_ROLE", "REPLACE_QUOTA": "PSCALE_QUOTA", "REPLACE_STORAGE_POOL_PATH": "PSCALE_POOL_V2", "REPLACE_TENANT_NAME": "PSCALE_TENANT", "REPLACE_TENANT_ROLES": "PSCALE_ROLE", "REPLACE_TENANT_VOLUME_PREFIX": "PSCALE_TENANT_PREFIX", "REPLACE_PORT": "PSCALE_PORT"}


Why are these changes required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:15:24Z

tests/e2e/steps/steps_def.go

@@ -328,7 +328,7 @@ func (step *Step) deleteCustomResource(res Resource, crNumStr string) error {
 func (step *Step) validateCustomResourceStatus(res Resource, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
 	cr := res.CustomResource[crNum-1]
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:15:35Z

tests/e2e/steps/steps_def.go

@@ -346,13 +346,13 @@ func (step *Step) validateCustomResourceStatus(res Resource, crNumStr string) er

 func (step *Step) validateDriverInstalled(res Resource, driverName string, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

I don't believe this change is required for anything, it just reduces the amount of unnecessary delay in the testing substantially to accelerate the test runs.

gallacher · 2024-09-27T17:15:40Z

tests/e2e/steps/steps_def.go

 	return checkAllRunningPods(context.TODO(), res.CustomResource[crNum-1].Namespace, step.clientSet)
 }

 func (step *Step) validateDriverNotInstalled(res Resource, driverName string, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:15:44Z

tests/e2e/steps/steps_def.go

@@ -379,7 +379,7 @@ func (step *Step) removeNodeLabel(res Resource, label string) error {
 func (step *Step) validateModuleInstalled(res Resource, module string, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
 	cr := res.CustomResource[crNum-1]
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:15:50Z

tests/e2e/steps/steps_def.go

@@ -424,7 +424,7 @@ func (step *Step) validateModuleInstalled(res Resource, module string, crNumStr
 func (step *Step) validateModuleNotInstalled(res Resource, module string, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
 	cr := res.CustomResource[crNum-1]
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:15:56Z

tests/e2e/steps/steps_def.go

@@ -889,7 +889,7 @@ func (step *Step) runCustomTest(res Resource) error {
 func (step *Step) enableModule(res Resource, module string, crNumStr string) error {
 	crNum, _ := strconv.Atoi(crNumStr)
 	cr := res.CustomResource[crNum-1]
-	time.Sleep(60 * time.Second)
+	time.Sleep(20 * time.Second)


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:16:08Z

tests/e2e/steps/steps_def.go

@@ -1303,6 +1303,16 @@ func (step *Step) AuthorizationV1Resources(storageType, driver, port, proxyHost,
 	// get env variables
 	if os.Getenv(endpointvar) != "" {
 		endpoint = os.Getenv(endpointvar)
+


Why is this change required for 1.6.1 and not 1.6.0?

gallacher · 2024-09-27T17:16:19Z

tests/e2e/testfiles/powerscale-templates/karavi-authorization-config.json

@@ -1,8 +1,8 @@
 [{
    "username":"-",
    "password":"-",
-    "intendedEndpoint":"https://REPLACE_ENDPOINT",
-    "endpoint":"https://REPLACE_AUTH_ENDPOINT:REPLACE_PORT",
+    "intendedEndpoint":"https://REPLACE_ENDPOINT:REPLACE_PORT",


Why is this change required for 1.6.1 and not 1.6.0?

…-operator into patch-1.6.1-no-yamllint

bundle/manifests/dell-csm-operator.clusterserviceversion.yaml

ChristianAtDell · 2024-09-30T15:49:26Z

tests/e2e/testfiles/scenarios.yaml

@@ -478,7 +482,6 @@
    - "authorization"
    - "powerscale"
    - "observability"
-    # - "sanity"


I understand removing a commented-out tag, but should this tag actually be existent? What are the guidelines for a sanity test, and should this be included among them?

That is a great question and the quick answer is, not to my knowledge. This is something that can be improved in future releases.

tests/e2e/testfiles/scenarios.yaml

tests/e2e/testfiles/storage_csm_powerflex_replica.yaml

tests/shared/common.go

samples/storage_csm_powerstore_v2111.yaml

tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml

shefali-malhotra and others added 22 commits August 30, 2024 12:16

porting back the changes done for posting and certification back in r…

2f77ed6

…elease branch (#669) Signed-off-by: shefali-malhotra <[email protected]>

changes of patch 1.6.1

0773fbb

missing changes of patch 1.6.1

6f68f5e

added common changes of patch 1.6.1

2e9672b

added unity changes for patch 1.6.1

0468765

added pfx changes for patch 1.6.1

57fe3e5

Merge branch 'release-v1.6.1' into patch-1.6.1

0056804

fix gosec issues

aece62c

formatting fixes

8f88b95

yamllint fixes

d919c70

yamllint fixes

8591919

yamllint fixes

e783973

Update storage_csm_unity_v2111.yaml

7e96b33

Added necessary YAML and added scenario flags (#704)

44e03f1

Powerscale E2E Test Fixes (#705)

7d0ba03

* Add Powerscale port variable * Template auth variables * Update go files * Add Powerscale port variable handling * Fix scenarios for PowerScale * Update powerscale template files

Update storage_csm_powerflex_replica.yaml

39e15ab

fixed yaml lint errors

ca89db9

Fix pmaxCreds not set correctly in e2e (#706)

5029b0e

* Fix pmaxCreds not set correctly in e2e * Update scenarios.yaml

Revert "fixed yaml lint errors"

40c0013

This reverts commit ca89db9.

Revert "yamllint fixes"

ff9f050

This reverts commit e783973.

Revert "yamllint fixes"

8817b28

This reverts commit 8591919.

Revert "yamllint fixes"

7c0ad3f

This reverts commit d919c70.

JacobGros changed the title ~~Patch 1.6.1 no yamllint~~ Patch 1.6.1 Without yaml lint fixes Sep 26, 2024

JacobGros mentioned this pull request Sep 26, 2024

Patch 1.6.1 #699

Closed

8 tasks

JacobGros marked this pull request as ready for review September 26, 2024 21:45

JacobGros requested review from abhi16394, mbasha-dell, alikdell, bharathsreekanth and chimanjain as code owners September 26, 2024 21:45

gallacher reviewed Sep 27, 2024

View reviewed changes

ChristianAtDell added 2 commits September 27, 2024 16:34

Some auth test fixes - pflex

20b796c

Merge branch 'patch-1.6.1-no-yamllint' of https://github.com/dell/csm…

7fcad2a

…-operator into patch-1.6.1-no-yamllint

rajendraindukuri reviewed Sep 30, 2024

View reviewed changes

bundle/manifests/dell-csm-operator.clusterserviceversion.yaml Show resolved Hide resolved