Merge pull request #117286 from humblec/e2e-improvements

remove `expansionFailed` const in volume expansion and avoid var name collision

test/e2e/storage/csi_mock/csi_fsgroup_policy.go

@@ -104,8 +104,8 @@ var _ = utils.SIGDescribe("CSI Mock volume fsgroup policies", func() {
 				// Delete the created file. This step is mandatory, as the mock driver
 				// won't clean up the contents automatically.
 				defer func() {
-					delete := fmt.Sprintf("rm -fr %s", dirName)
-					_, _, err = e2evolume.PodExec(f, pod, delete)
+					deleteDir := fmt.Sprintf("rm -fr %s", dirName)
+					_, _, err = e2evolume.PodExec(f, pod, deleteDir)
 					framework.ExpectNoError(err, "failed: deleting the directory: %s", err)
 				}()
 

test/e2e/storage/csi_mock/csi_volume_expansion.go

@@ -43,7 +43,6 @@ type expansionStatus int
 
 const (
 	expansionSuccess = iota
-	expansionFailed
 	expansionFailedOnController
 	expansionFailedOnNode
 	expansionFailedMissingStagingPath