Merge pull request kubevirt#6879 from vasiliy-ul/fix-image-upload

Fix image upload with force-bind flag
asheikm · Dec 1, 2021 · 542fe4b · 542fe4b
2 parents 4b57b1d + 7af6234
commit 542fe4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/virtctl/imageupload/imageupload.go b/pkg/virtctl/imageupload/imageupload.go
@@ -445,7 +445,7 @@ func waitDvUploadScheduled(client kubecli.KubevirtClient, namespace, name string
 			return false, err
 		}
 
-		if dv.Status.Phase == cdiv1.WaitForFirstConsumer {
+		if dv.Status.Phase == cdiv1.WaitForFirstConsumer && !forceBind {
 			return false, fmt.Errorf("cannot upload to DataVolume in WaitForFirstConsumer state, make sure the PVC is Bound")
 		}
 		// TODO: can check Condition/Event here to provide user with some error messages

diff --git a/tests/storage/imageupload.go b/tests/storage/imageupload.go
@@ -201,6 +201,9 @@ var _ = SIGDescribe("[Serial]ImageUpload", func() {
 
 	Context("Create upload volume with force-bind flag", func() {
 		DescribeTable("Should succeed", func(resource, targetName string, validateFunc func(string), deleteFunc func(string)) {
+			if !tests.HasBindingModeWaitForFirstConsumer() {
+				Skip("Skip no local wffc storage class available")
+			}
 			defer deleteFunc(targetName)
 
 			By("Upload image")
@@ -209,8 +212,9 @@ var _ = SIGDescribe("[Serial]ImageUpload", func() {
 				"--namespace", util.NamespaceTestDefault,
 				"--image-path", imagePath,
 				"--size", pvcSize,
+				"--storage-class", tests.Config.StorageClassLocal,
+				"--access-mode", "ReadWriteOnce",
 				"--force-bind",
-				"--block-volume",
 				"--insecure")
 
 			Expect(virtctlCmd()).To(Succeed())