Start removing viper calls in minikube

Pass --interactive, --download-only, and --delete-on-failure via new
run.Options struct so minikube code can stop accessing the flags via
viper.

There are many more viper calls in the minikube package. Removing all of
them requires adding mode options and modifying more code to accept
options argument.

To pass options to driver we keep Options in
drivers.common.CommonDriver. Options are not persisted so un-marshalling
drivers from config.json use the default options.

Author: nirs

cmd/minikube/cmd/config/profile_list.go

@@ -31,6 +31,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/notify"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/reason"
+	"k8s.io/minikube/pkg/minikube/run"
 	"k8s.io/minikube/pkg/minikube/style"
 
 	"github.com/docker/machine/libmachine"
@@ -54,7 +55,7 @@ var profileListCmd = &cobra.Command{
 	Run: func(_ *cobra.Command, _ []string) {
 		output := strings.ToLower(profileOutput)
 		out.SetJSON(output == "json")
-		go notify.MaybePrintUpdateTextFromGithub()
+		go notify.MaybePrintUpdateTextFromGithub(run.Options{})
 
 		switch output {
 		case "json":

cmd/minikube/cmd/config/set.go

@@ -56,7 +56,7 @@ func Set(name string, value string) error {
 		return errors.Wrapf(err, "find settings for %q value of %q", name, value)
 	}
 	// Validate the new value
-	err = run(name, value, s.validations)
+	err = invoke(name, value, s.validations)
 	if err != nil {
 		return errors.Wrapf(err, "run validations for %q with value of %q", name, value)
 	}
@@ -71,8 +71,8 @@ func Set(name string, value string) error {
 		return errors.Wrapf(err, "set")
 	}
 
-	// Run any callbacks for this property
-	err = run(name, value, s.callbacks)
+	// Invoke any callbacks for this property
+	err = invoke(name, value, s.callbacks)
 	if err != nil {
 		return errors.Wrapf(err, "run callbacks for %q with value of %q", name, value)
 	}

cmd/minikube/cmd/config/util.go

@@ -25,8 +25,8 @@ import (
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
-// Runs all the validation or callback functions and collects errors
-func run(name string, value string, fns []setFn) error {
+// Invoke all the validation or callback functions and collects errors
+func invoke(name string, value string, fns []setFn) error {
 	var errors []error
 	for _, fn := range fns {
 		err := fn(name, value)

cmd/minikube/cmd/node_add.go

@@ -90,7 +90,9 @@ var nodeAddCmd = &cobra.Command{
 		}
 
 		register.Reg.SetStep(register.InitialSetup)
-		if err := node.Add(cc, n, deleteNodeOnFailure); err != nil {
+		options := commandOptions()
+		options.DeleteOnFailure = deleteNodeOnFailure
+		if err := node.Add(cc, n, options); err != nil {
 			_, err := maybeDeleteAndRetry(cmd, *cc, n, nil, err)
 			if err != nil {
 				exit.Error(reason.GuestNodeAdd, "failed to add node", err)

cmd/minikube/cmd/node_start.go

@@ -20,7 +20,6 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -56,7 +55,8 @@ var nodeStartCmd = &cobra.Command{
 		}
 
 		register.Reg.SetStep(register.InitialSetup)
-		r, p, m, h, err := node.Provision(cc, n, viper.GetBool(deleteOnFailure))
+		options := commandOptions()
+		r, p, m, h, err := node.Provision(cc, n, options)
 		if err != nil {
 			exit.Error(reason.GuestNodeProvision, "provisioning host for node", err)
 		}
@@ -71,7 +71,7 @@ var nodeStartCmd = &cobra.Command{
 			ExistingAddons: cc.Addons,
 		}
 
-		if _, err = node.Start(s); err != nil {
+		if _, err = node.Start(s, options); err != nil {
 			if _, err := maybeDeleteAndRetry(cmd, *cc, *n, nil, err); err != nil {
 				node.ExitIfFatal(err, false)
 				exit.Error(reason.GuestNodeStart, "failed to start node", err)

cmd/minikube/cmd/root.go

@@ -40,6 +40,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/notify"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/reason"
+	"k8s.io/minikube/pkg/minikube/run"
 	"k8s.io/minikube/pkg/minikube/translate"
 	"k8s.io/minikube/pkg/version"
 )
@@ -352,3 +353,11 @@ func applyToAllCommands(cmd *cobra.Command, f func(subCmd *cobra.Command)) {
 		}
 	}
 }
+
+func commandOptions() run.Options {
+	return run.Options{
+		NonInteractive:  !viper.GetBool(interactive),
+		DownloadOnly:    viper.GetBool(downloadOnly),
+		DeleteOnFailure: viper.GetBool(deleteOnFailure),
+	}
+}

cmd/minikube/cmd/start.go

@@ -165,7 +165,7 @@ func runStart(cmd *cobra.Command, _ []string) {
 	go download.CleanUpOlderPreloads()
 
 	// Avoid blocking execution on optional HTTP fetches
-	go notify.MaybePrintUpdateTextFromGithub()
+	go notify.MaybePrintUpdateTextFromGithub(commandOptions())
 
 	displayEnviron(os.Environ())
 	if viper.GetBool(force) {
@@ -300,6 +300,8 @@ func runStart(cmd *cobra.Command, _ []string) {
 }
 
 func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *config.ClusterConfig) (node.Starter, error) {
+	options := commandOptions()
+
 	driverName := ds.Name
 	klog.Infof("selected driver: %s", driverName)
 	validateDriver(ds, existing)
@@ -348,7 +350,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 	klog.Infof("cluster config:\n%+v", cc)
 
 	if firewall.IsBootpdBlocked(cc) {
-		if err := firewall.UnblockBootpd(); err != nil {
+		if err := firewall.UnblockBootpd(options); err != nil {
 			klog.Warningf("failed unblocking bootpd from firewall: %v", err)
 		}
 	}
@@ -385,7 +387,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 		ssh.SetDefaultClient(ssh.External)
 	}
 
-	mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, viper.GetBool(deleteOnFailure))
+	mRunner, preExists, mAPI, host, err := node.Provision(&cc, &n, options)
 	if err != nil {
 		return node.Starter{}, err
 	}
@@ -471,8 +473,10 @@ func imageMatchesBinaryVersion(imageVersion, binaryVersion string) bool {
 }
 
 func startWithDriver(cmd *cobra.Command, starter node.Starter, existing *config.ClusterConfig) (*kubeconfig.Settings, error) {
+	options := commandOptions()
+
 	// start primary control-plane node
-	configInfo, err := node.Start(starter)
+	configInfo, err := node.Start(starter, options)
 	if err != nil {
 		configInfo, err = maybeDeleteAndRetry(cmd, *starter.Cfg, *starter.Node, starter.ExistingAddons, err)
 		if err != nil {
@@ -515,7 +519,7 @@ func startWithDriver(cmd *cobra.Command, starter node.Starter, existing *config.
 		}
 
 		out.Ln("") // extra newline for clarity on the command line
-		if err := node.Add(starter.Cfg, n, viper.GetBool(deleteOnFailure)); err != nil {
+		if err := node.Add(starter.Cfg, n, options); err != nil {
 			return nil, errors.Wrap(err, "adding node")
 		}
 	}
@@ -648,8 +652,13 @@ func maybeDeleteAndRetry(cmd *cobra.Command, existing config.ClusterConfig, n co
 		// Re-generate the cluster config, just in case the failure was related to an old config format
 		cc := updateExistingConfigFromFlags(cmd, &existing)
 		var configInfo *kubeconfig.Settings
+
+		options := commandOptions()
+		provisionOptions := commandOptions()
+		provisionOptions.DeleteOnFailure = false
+
 		for _, n := range cc.Nodes {
-			r, p, m, h, err := node.Provision(&cc, &n, false)
+			r, p, m, h, err := node.Provision(&cc, &n, provisionOptions)
 			s := node.Starter{
 				Runner:         r,
 				PreExists:      p,
@@ -664,7 +673,7 @@ func maybeDeleteAndRetry(cmd *cobra.Command, existing config.ClusterConfig, n co
 				return nil, err
 			}
 
-			k, err := node.Start(s)
+			k, err := node.Start(s, options)
 			if n.ControlPlane {
 				configInfo = k
 			}
@@ -706,13 +715,16 @@ func kubectlVersion(path string) (string, error) {
 
 // returns (current_driver, suggested_drivers, "true, if the driver is set by command line arg or in the config file")
 func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []registry.DriverState, bool) {
+	options := commandOptions()
+
 	// Technically unrelated, but important to perform before detection
 	driver.SetLibvirtURI(viper.GetString(kvmQemuURI))
 	register.Reg.SetStep(register.SelectingDriver)
+
 	// By default, the driver is whatever we used last time
 	if existing != nil {
 		old := hostDriver(existing)
-		ds := driver.Status(old)
+		ds := driver.Status(old, options)
 		out.Step(style.Sparkle, `Using the {{.driver}} driver based on existing profile`, out.V{"driver": ds.String()})
 		return ds, nil, true
 	}
@@ -729,7 +741,7 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 			`
 			out.WarningT(warning, out.V{"driver": d, "vmd": vmd})
 		}
-		ds := driver.Status(d)
+		ds := driver.Status(d, options)
 		if ds.Name == "" {
 			exit.Message(reason.DrvUnsupportedOS, "The driver '{{.driver}}' is not supported on {{.os}}/{{.arch}}", out.V{"driver": d, "os": runtime.GOOS, "arch": runtime.GOARCH})
 		}
@@ -739,15 +751,15 @@ func selectDriver(existing *config.ClusterConfig) (registry.DriverState, []regis
 
 	// Fallback to old driver parameter
 	if d := viper.GetString("vm-driver"); d != "" {
-		ds := driver.Status(viper.GetString("vm-driver"))
+		ds := driver.Status(viper.GetString("vm-driver"), options)
 		if ds.Name == "" {
 			exit.Message(reason.DrvUnsupportedOS, "The driver '{{.driver}}' is not supported on {{.os}}/{{.arch}}", out.V{"driver": d, "os": runtime.GOOS, "arch": runtime.GOARCH})
 		}
 		out.Step(style.Sparkle, `Using the {{.driver}} driver based on user configuration`, out.V{"driver": ds.String()})
 		return ds, nil, true
 	}
 
-	choices := driver.Choices(viper.GetBool("vm"))
+	choices := driver.Choices(viper.GetBool("vm"), options)
 	pick, alts, rejects := driver.Suggest(choices)
 	if pick.Name == "" {
 		out.Step(style.ThumbsDown, "Unable to pick a default driver. Here is what was considered, in preference order:")

cmd/minikube/cmd/start_flags.go

@@ -535,7 +535,7 @@ func validateVfkitNetwork(n string) string {
 		// always available
 	case "vmnet-shared":
 		// "vment-shared" provides access between machines, with lower performance compared to "nat".
-		if err := vmnet.ValidateHelper(); err != nil {
+		if err := vmnet.ValidateHelper(commandOptions()); err != nil {
 			vmnetErr := err.(*vmnet.Error)
 			exit.Message(vmnetErr.Kind, "failed to validate {{.network}} network: {{.reason}}", out.V{"network": n, "reason": err})
 		}

cmd/minikube/cmd/status.go

@@ -38,6 +38,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/notify"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/reason"
+	"k8s.io/minikube/pkg/minikube/run"
 )
 
 var (
@@ -90,7 +91,7 @@ var statusCmd = &cobra.Command{
 		}
 
 		out.SetJSON(output == "json")
-		go notify.MaybePrintUpdateTextFromGithub()
+		go notify.MaybePrintUpdateTextFromGithub(run.Options{})
 
 		cname := ClusterFlagValue()
 		api, cc := mustload.Partial(cname)

pkg/drivers/common/common.go

@@ -35,6 +35,7 @@ import (
 	"github.com/pkg/errors"
 
 	"k8s.io/klog/v2"
+	"k8s.io/minikube/pkg/minikube/run"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -85,7 +86,9 @@ func CreateRawDisk(diskPath string, sizeMB int) error {
 }
 
 // CommonDriver is the common driver base class
-type CommonDriver struct{}
+type CommonDriver struct {
+	Options run.Options `json:"-"`
+}
 
 // GetCreateFlags is not implemented yet
 func (d *CommonDriver) GetCreateFlags() []mcnflag.Flag {