fix kubev2v#452: remove DefaultVirtV2vImage

We should never fallback to use hard-coded images but rather fail when an image is missing. Thus, removing DefaultVirtV2vImage that pointed to forklift-virt-v2v:latest in quay.io and returning an error when VIRT_V2V_IMAGE is not specified instead. Signed-off-by: Arik Hadas <[email protected]>
bkhizgiy · Nov 12, 2023 · 07f314c · 07f314c
1 parent 7d3349a
commit 07f314c
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/pkg/settings/migration.go b/pkg/settings/migration.go
@@ -1,6 +1,7 @@
 package settings
 
 import (
+	"fmt"
 	"os"
 	"strings"
 
@@ -21,11 +22,6 @@ const (
 	FileSystemOverhead      = "FILESYSTEM_OVERHEAD"
 )
 
-// Default virt-v2v image.
-const (
-	DefaultVirtV2vImage = "quay.io/kubev2v/forklift-virt-v2v:latest"
-)
-
 // Migration settings
 type Migration struct {
 	// Max VMs in-flight.
@@ -79,9 +75,8 @@ func (r *Migration) Load() (err error) {
 			r.VirtV2vImageCold = virtV2vImage
 			r.VirtV2vImageWarm = virtV2vImage
 		}
-	} else {
-		r.VirtV2vImageCold = DefaultVirtV2vImage
-		r.VirtV2vImageWarm = DefaultVirtV2vImage
+	} else if Settings.Role.Has(MainRole) {
+		return liberr.Wrap(fmt.Errorf("failed to find environment variable %s", VirtV2vImage))
 	}
 	r.VirtV2vDontRequestKVM = getEnvBool(VirtV2vDontRequestKVM, false)
 	if r.CDIExportTokenTTL, err = getPositiveEnvLimit(CDIExportTokenTTL, 0); err != nil {