Image: pass image uri to pull the bundle image

It will be consumed when user specify the container image to pull.
crc-org · Sep 19, 2022 · c9c2aaf · c9c2aaf
1 parent 9510982
commit c9c2aaf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/crc/image/image.go b/pkg/crc/image/image.go
@@ -26,7 +26,7 @@ type imageHandler struct {
 	imageURI string
 }
 
-func uri(preset crcpreset.Preset) string {
+func defaultURI(preset crcpreset.Preset) string {
 	return fmt.Sprintf("//%s/%s:%s", constants.RegistryURI, getImageName(preset), version.GetCRCVersion())
 }
 
@@ -95,9 +95,12 @@ func getImageName(preset crcpreset.Preset) string {
 	}
 }
 
-func PullBundle(preset crcpreset.Preset) error {
+func PullBundle(preset crcpreset.Preset, imageURI string) error {
+	if imageURI == "" {
+		imageURI = defaultURI(preset)
+	}
 	imgHandler := imageHandler{
-		imageURI: uri(preset),
+		imageURI: strings.TrimPrefix(imageURI, "docker:"),
 	}
 	destDir, err := os.MkdirTemp(constants.MachineCacheDir, "tmpBundleImage")
 	if err != nil {

diff --git a/pkg/crc/preflight/preflight_checks_common.go b/pkg/crc/preflight/preflight_checks_common.go
@@ -102,7 +102,7 @@ func fixBundleExtracted(bundlePath string, preset crcpreset.Preset) func() error
 			// In case of OKD or podman bundle then pull the bundle image from quay
 			// otherwise use mirror location to download the bundle.
 			if preset == crcpreset.OKD || preset == crcpreset.Podman {
-				if err := image.PullBundle(preset); err != nil {
+				if err := image.PullBundle(preset, ""); err != nil {
 					return err
 				}
 			} else {