run: Remove viper.GetBool("download-only") checks

Add run.CommandOptions.DownloadOnly option and replace
viper.GetBool("download-only") calls in minikube packages.

Author: nirs

cmd/minikube/cmd/flags/flags.go

@@ -23,7 +23,8 @@ import (
 
 // Flag names passed to minikube via run.CommandOptions.
 const (
-	Interactive = "interactive"
+	Interactive  = "interactive"
+	DownloadOnly = "download-only"
 )
 
 // CommandOptions returns minikube runtime options from command line flags.
@@ -32,5 +33,6 @@ const (
 func CommandOptions() *run.CommandOptions {
 	return &run.CommandOptions{
 		NonInteractive: !viper.GetBool(Interactive),
+		DownloadOnly:   viper.GetBool(DownloadOnly),
 	}
 }

cmd/minikube/cmd/start.go

@@ -933,7 +933,7 @@ func validateDriver(ds registry.DriverState, existing *config.ClusterConfig) {
 	}
 
 	// if we are only downloading artifacts for a driver, we can stop validation here
-	if viper.GetBool("download-only") {
+	if viper.GetBool(flags.DownloadOnly) {
 		return
 	}
 

cmd/minikube/cmd/start_flags.go

@@ -102,7 +102,6 @@ const (
 	vsockPorts              = "hyperkit-vsock-ports"
 	embedCerts              = "embed-certs"
 	noVTXCheck              = "no-vtx-check"
-	downloadOnly            = "download-only"
 	dnsProxy                = "dns-proxy"
 	hostDNSResolver         = "host-dns-resolver"
 	waitComponents          = "wait"
@@ -167,7 +166,7 @@ func initMinikubeFlags() {
 	startCmd.Flags().String(cpus, "2", fmt.Sprintf("Number of CPUs allocated to Kubernetes. Use %q to use the maximum number of CPUs. Use %q to not specify a limit (Docker/Podman only)", constants.MaxResources, constants.NoLimit))
 	startCmd.Flags().StringP(memory, "m", "", fmt.Sprintf("Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g). Use %q to use the maximum amount of memory. Use %q to not specify a limit (Docker/Podman only)", constants.MaxResources, constants.NoLimit))
 	startCmd.Flags().String(humanReadableDiskSize, defaultDiskSize, "Disk size allocated to the minikube VM (format: <number>[<unit>], where unit = b, k, m or g).")
-	startCmd.Flags().Bool(downloadOnly, false, "If true, only download and cache files for later use - don't install or start anything.")
+	startCmd.Flags().Bool(flags.DownloadOnly, false, "If true, only download and cache files for later use - don't install or start anything.")
 	startCmd.Flags().Bool(cacheImages, true, "If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none.")
 	startCmd.Flags().StringSlice(isoURL, download.DefaultISOURLs(), "Locations to fetch the minikube ISO from.")
 	startCmd.Flags().String(kicBaseImage, kic.BaseImage, "The base image to use for docker/podman drivers. Intended for local development.")

pkg/drivers/common/vmnet/vmnet.go

@@ -32,7 +32,6 @@ import (
 
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/state"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/process"
 	"k8s.io/minikube/pkg/minikube/reason"
@@ -76,7 +75,7 @@ func ValidateHelper(options *run.CommandOptions) error {
 	// Ideally minikube will not try to validate in download-only mode, but this
 	// is called from different places in different drivers, so the easier way
 	// to skip validation is to skip it here.
-	if viper.GetBool("download-only") {
+	if options.DownloadOnly {
 		log.Debug("Skipping vmnet-helper validation in download-only mode")
 		return nil
 	}

pkg/minikube/node/cache.go

@@ -75,9 +75,9 @@ func beginCacheKubernetesImages(g *errgroup.Group, imageRepository string, k8sVe
 }
 
 // handleDownloadOnly caches appropariate binaries and images
-func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion, containerRuntime, driverName string) {
+func handleDownloadOnly(cacheGroup, kicGroup *errgroup.Group, k8sVersion, containerRuntime, driverName string, options *run.CommandOptions) {
 	// If --download-only, complete the remaining downloads and exit.
-	if !viper.GetBool("download-only") {
+	if !options.DownloadOnly {
 		return
 	}
 

pkg/minikube/node/start.go

@@ -387,7 +387,7 @@ func Provision(cc *config.ClusterConfig, n *config.Node, delOnFail bool, options
 	}
 
 	if driver.IsKIC(cc.Driver) {
-		beginDownloadKicBaseImage(&kicGroup, cc, viper.GetBool("download-only"))
+		beginDownloadKicBaseImage(&kicGroup, cc, options.DownloadOnly)
 	}
 
 	if !driver.BareMetal(cc.Driver) {
@@ -400,7 +400,7 @@ func Provision(cc *config.ClusterConfig, n *config.Node, delOnFail bool, options
 		return nil, false, nil, nil, errors.Wrap(err, "Failed to save config")
 	}
 
-	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime, cc.Driver)
+	handleDownloadOnly(&cacheGroup, &kicGroup, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime, cc.Driver, options)
 	if driver.IsKIC(cc.Driver) {
 		waitDownloadKicBaseImage(&kicGroup)
 	}

pkg/minikube/run/options.go

@@ -21,4 +21,9 @@ type CommandOptions struct {
 	// NonInteractive is true if the minikube command run with the
 	// --interactive=false flag and we can not interact with the user.
 	NonInteractive bool
+
+	// DownloadOnly is true if the minikube command run with the --download-only
+	// flag and we should If only download and cache files for later use and
+	// don't install or start anything.
+	DownloadOnly bool
 }