Addressing review comments.

dell · Dec 19, 2024 · af9f31a · af9f31a
1 parent 326523d
commit af9f31a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go
@@ -1529,10 +1529,11 @@ func (r *ContainerStorageModuleReconciler) GetK8sClient() kubernetes.Interface {
 	return r.K8sClient
 }
 
+// ZoneValidation - If zones are configured performs validation and returns an error if the zone validation fails
 func (r *ContainerStorageModuleReconciler) ZoneValidation(ctx context.Context, cr *csmv1.ContainerStorageModule) error {
 	err := drivers.ValidateZones(ctx, cr, r.Client)
 	if err != nil {
-		return fmt.Errorf("ZoneValidation failed with error: %v", err)
+		return fmt.Errorf("zone validation failed with error: %v", err)
 	}
 
 	return err

diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go
@@ -585,7 +585,6 @@ func (suite *CSMControllerTestSuite) TestCsmDowngrade() {
 	if err != nil {
 		panic(err)
 	}
-	// sec := shared.MakeSecret(csmName+"-config", suite.namespace, pFlexConfigVersion)
 	sec := shared.MakeSecretPowerFlex(csmName+"-config", suite.namespace, pFlexConfigVersion)
 	err = suite.fakeClient.Create(ctx, sec)
 	if err != nil {
@@ -654,7 +653,6 @@ func (suite *CSMControllerTestSuite) TestCsmDowngradeSkipVersion() {
 	if err != nil {
 		panic(err)
 	}
-	// sec := shared.MakeSecret(csmName+"-config", suite.namespace, pFlexConfigVersion)
 	sec := shared.MakeSecretPowerFlex(csmName+"-config", suite.namespace, pFlexConfigVersion)
 	err = suite.fakeClient.Create(ctx, sec)
 	if err != nil {

diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go
@@ -347,12 +347,14 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT
 	return yamlString
 }
 
+// ValidateZones - zone validation for topology aware clusters
 func ValidateZones(ctx context.Context, cr *csmv1.ContainerStorageModule, ct client.Client) error {
 	secretName := cr.Name + "-config"
 	err := ValidateZonesInSecret(ctx, ct, cr.Namespace, secretName)
 	return err
 }
 
+// ValidateZonesInSecret - inspects incoming secret for zone validity
 func ValidateZonesInSecret(ctx context.Context, kube client.Client, namespace string, secret string) error {
 	log := logger.GetLogger(ctx)
 

diff --git a/tests/shared/common.go b/tests/shared/common.go
@@ -144,6 +144,7 @@ func MakeModule(configVersion string) csmv1.Module {
 	return moduleObj
 }
 
+// MakeSecretPowerFlexWithZone  returns a driver pre-req secret with zoning specified
 func MakeSecretPowerFlexWithZone(name, ns, _ string) *corev1.Secret {
 	dataWithZone := `
 - username: "admin"
@@ -168,7 +169,7 @@ func MakeSecretPowerFlexWithZone(name, ns, _ string) *corev1.Secret {
 	return secret
 }
 
-// MakeSecret  returns a driver pre-req secret array-config
+// MakeSecretPowerFlex  returns a pflex driver pre-req secret
 func MakeSecretPowerFlex(name, ns, _ string) *corev1.Secret {
 	dataWithoutZone := `
 - username: "admin"
@@ -191,6 +192,7 @@ func MakeSecretPowerFlex(name, ns, _ string) *corev1.Secret {
 	return secret
 }
 
+// MakeSecretPowerFlexMultiZoneInvalid  returns a pflex driver pre-req secret with invalid zone config
 func MakeSecretPowerFlexMultiZoneInvalid(name, ns, _ string) *corev1.Secret {
 	dataWithInvalidZone := `
 - username: "admin"