Merge pull request #1343 from sunpa93/fix-dynamic-resize-test

[V2] bug: address dynamic resizing failure and test storageclass setup
kubernetes-sigs · May 19, 2022 · 48ee115 · 48ee115
2 parents 776137e + e53b0d1
commit 48ee115
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/test/e2e/dynamic_provisioning_test.go b/test/e2e/dynamic_provisioning_test.go
@@ -851,7 +851,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool, schedulerNa
 			Volume:                 volume,
 			Pod:                    pod,
 			ResizeOffline:          false,
-			StorageClassParameters: map[string]string{consts.SkuNameField: "Standard_LRS"},
+			StorageClassParameters: map[string]string{consts.SkuNameField: "StandardSSD_LRS"},
 		}
 		test.Run(cs, ns, schedulerName)
 	})
@@ -891,7 +891,7 @@ func (t *dynamicProvisioningTestSuite) defineTests(isMultiZone bool, schedulerNa
 			Volume:                 volume,
 			Pod:                    pod,
 			ResizeOffline:          false,
-			StorageClassParameters: map[string]string{consts.SkuNameField: "Standard_LRS"},
+			StorageClassParameters: map[string]string{consts.SkuNameField: "StandardSSD_LRS"},
 		}
 		test.Run(cs, ns, schedulerName)
 	})

diff --git a/test/resources/resource_setup.go b/test/resources/resource_setup.go
@@ -257,24 +257,24 @@ func (pod *PodDetails) SetupDeploymentWithPreProvisionedVolumes(client clientset
 func (pod *PodDetails) CreateStorageClass(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver, storageClassParameters map[string]string) (storagev1.StorageClass, func()) {
 	ginkgo.By("setting up the StorageClass")
 	var allowedTopologyValues []string
-	var volumeBindingMode storagev1.VolumeBindingMode
+	var volumeBindingMode *storagev1.VolumeBindingMode
 
 	nodes, err := client.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
 	framework.ExpectNoError(err)
 	allowedTopologyValuesMap := make(map[string]bool)
 	for _, node := range nodes.Items {
-		if zone, ok := node.Labels[testconsts.TopologyKey]; ok {
+		if zone, ok := node.Labels[testconsts.TopologyKey]; ok && zone != "" {
 			allowedTopologyValuesMap[zone] = true
 		}
 	}
 	for k := range allowedTopologyValuesMap {
 		allowedTopologyValues = append(allowedTopologyValues, k)
-
-		volumeBindingMode = storagev1.VolumeBindingWaitForFirstConsumer
+		waitForFirstCustomer := storagev1.VolumeBindingWaitForFirstConsumer
+		volumeBindingMode = &waitForFirstCustomer
 	}
 
 	reclaimPolicy := v1.PersistentVolumeReclaimDelete
-	storageClass := csiDriver.GetDynamicProvisionStorageClass(storageClassParameters, []string{}, &reclaimPolicy, &volumeBindingMode, allowedTopologyValues, namespace.Name)
+	storageClass := csiDriver.GetDynamicProvisionStorageClass(storageClassParameters, []string{}, &reclaimPolicy, volumeBindingMode, allowedTopologyValues, namespace.Name)
 	tsc := NewTestStorageClass(client, namespace, storageClass)
 	createdStorageClass := tsc.Create()
 	return createdStorageClass, tsc.Cleanup