Merge pull request #117286 from humblec/e2e-improvements

remove `expansionFailed` const in volume expansion and avoid var name collision
This commit is contained in:
Kubernetes Prow Robot 2023-04-26 06:16:13 -07:00 committed by GitHub
commit 0b53923a7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -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 // Delete the created file. This step is mandatory, as the mock driver
// won't clean up the contents automatically. // won't clean up the contents automatically.
defer func() { defer func() {
delete := fmt.Sprintf("rm -fr %s", dirName) deleteDir := fmt.Sprintf("rm -fr %s", dirName)
_, _, err = e2evolume.PodExec(f, pod, delete) _, _, err = e2evolume.PodExec(f, pod, deleteDir)
framework.ExpectNoError(err, "failed: deleting the directory: %s", err) framework.ExpectNoError(err, "failed: deleting the directory: %s", err)
}() }()

View File

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