force: Remove viper force checks outside cmd

Add run.CommandOptions.Force option and use it to replace calls to
viper.GetBool("force") outside the cmd package, and call to
viper.GetBool(force) in the cmd package.

Author: nirs

cmd/minikube/cmd/flags/flags.go

@@ -26,6 +26,7 @@ import (
 const (
 	Interactive  = "interactive"
 	DownloadOnly = "download-only"
+	Force        = "force"
 )
 
 // CommandOptions returns minikube runtime options from command line flags.
@@ -36,5 +37,6 @@ func CommandOptions() *run.CommandOptions {
 		NonInteractive: !viper.GetBool(Interactive),
 		DownloadOnly:   viper.GetBool(DownloadOnly),
 		ProfileName:    viper.GetString(config.ProfileName),
+		Force:          viper.GetBool(Force),
 	}
 }

cmd/minikube/cmd/start.go

@@ -105,7 +105,6 @@ const (
 	dnsProxy                = "dns-proxy"
 	hostDNSResolver         = "host-dns-resolver"
 	waitComponents          = "wait"
-	force                   = "force"
 	dryRun                  = "dry-run"
 	waitTimeout             = "wait-timeout"
 	nativeSSH               = "native-ssh"
@@ -159,7 +158,7 @@ func initMinikubeFlags() {
 	// e.g. iso-url => $ENVPREFIX_ISO_URL
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
 	viper.AutomaticEnv()
-	startCmd.Flags().Bool(force, false, "Force minikube to perform possibly dangerous operations")
+	startCmd.Flags().Bool(flags.Force, false, "Force minikube to perform possibly dangerous operations")
 	startCmd.Flags().Bool(flags.Interactive, true, "Allow user prompts for more information")
 	startCmd.Flags().Bool(dryRun, false, "dry-run mode. Validates configuration, but does not mutate system state")
 
@@ -317,7 +316,7 @@ func ClusterFlagValue() string {
 func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, rtime string, drvName string, options *run.CommandOptions) (config.ClusterConfig, config.Node, error) {
 	var cc config.ClusterConfig
 	if existing != nil {
-		cc = updateExistingConfigFromFlags(cmd, existing)
+		cc = updateExistingConfigFromFlags(cmd, existing, options)
 
 		// identify appropriate cni then configure cruntime accordingly
 		if _, err := cni.New(&cc); err != nil {
@@ -382,7 +381,7 @@ func getCPUCount(drvName string) int {
 	return si.CPUs
 }
 
-func getMemorySize(cmd *cobra.Command, drvName string) int {
+func getMemorySize(cmd *cobra.Command, drvName string, options *run.CommandOptions) int {
 	sysLimit, containerLimit, err := memoryLimits(drvName)
 	if err != nil {
 		klog.Warningf("Unable to query memory limits: %+v", err)
@@ -406,7 +405,7 @@ func getMemorySize(cmd *cobra.Command, drvName string) int {
 			exit.Message(reason.Usage, "{{.driver_name}} has only {{.container_limit}}MB memory but you specified {{.specified_memory}}MB", out.V{"container_limit": containerLimit, "specified_memory": mem, "driver_name": driver.FullName(drvName)})
 		}
 	} else {
-		validateRequestedMemorySize(mem, drvName)
+		validateRequestedMemorySize(mem, drvName, options)
 		klog.Infof("Using suggested %dMB memory alloc based on sys=%dMB, container=%dMB", mem, sysLimit, containerLimit)
 	}
 
@@ -576,7 +575,7 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
 		KicBaseImage:            viper.GetString(kicBaseImage),
 		Network:                 getNetwork(drvName, options),
 		Subnet:                  viper.GetString(subnet),
-		Memory:                  getMemorySize(cmd, drvName),
+		Memory:                  getMemorySize(cmd, drvName, options),
 		CPUs:                    getCPUCount(drvName),
 		DiskSize:                getDiskSize(),
 		Driver:                  drvName,
@@ -749,7 +748,7 @@ func checkNumaCount(k8sVersion string) {
 }
 
 // upgradeExistingConfig upgrades legacy configuration files
-func upgradeExistingConfig(cmd *cobra.Command, cc *config.ClusterConfig) {
+func upgradeExistingConfig(cmd *cobra.Command, cc *config.ClusterConfig, options *run.CommandOptions) {
 	if cc == nil {
 		return
 	}
@@ -772,7 +771,7 @@ func upgradeExistingConfig(cmd *cobra.Command, cc *config.ClusterConfig) {
 
 	if cc.Memory == 0 && !driver.IsKIC(cc.Driver) {
 		klog.Info("Existing config file was missing memory. (could be an old minikube config), will use the default value")
-		memInMB := getMemorySize(cmd, cc.Driver)
+		memInMB := getMemorySize(cmd, cc.Driver, options)
 		cc.Memory = memInMB
 	}
 
@@ -783,8 +782,8 @@ func upgradeExistingConfig(cmd *cobra.Command, cc *config.ClusterConfig) {
 
 // updateExistingConfigFromFlags will update the existing config from the flags - used on a second start
 // skipping updating existing docker env, docker opt, InsecureRegistry, registryMirror, extra-config, apiserver-ips
-func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig) config.ClusterConfig { //nolint to suppress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
-	validateFlags(cmd, existing.Driver)
+func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterConfig, options *run.CommandOptions) config.ClusterConfig { //nolint to suppress cyclomatic complexity 45 of func `updateExistingConfigFromFlags` is high (> 30)
+	validateFlags(cmd, existing.Driver, options)
 
 	cc := *existing
 
@@ -802,7 +801,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 		updateIntFromFlag(cmd, &cc.APIServerPort, apiServerPort)
 	}
 
-	if cmd.Flags().Changed(memory) && getMemorySize(cmd, cc.Driver) != cc.Memory {
+	if cmd.Flags().Changed(memory) && getMemorySize(cmd, cc.Driver, options) != cc.Memory {
 		out.WarningT("You cannot change the memory size for an existing minikube cluster. Please first delete the cluster.")
 	}
 
@@ -811,7 +810,7 @@ func updateExistingConfigFromFlags(cmd *cobra.Command, existing *config.ClusterC
 	}
 
 	// validate the memory size in case user changed their system memory limits (example change docker desktop or upgraded memory.)
-	validateRequestedMemorySize(cc.Memory, cc.Driver)
+	validateRequestedMemorySize(cc.Memory, cc.Driver, options)
 
 	if cmd.Flags().Changed(humanReadableDiskSize) && getDiskSize() != existing.DiskSize {
 		out.WarningT("You cannot change the disk size for an existing minikube cluster. Please first delete the cluster.")

cmd/minikube/cmd/start_flags.go

@@ -61,7 +61,7 @@ func fixHost(api libmachine.API, cc *config.ClusterConfig, n *config.Node, optio
 	if err != nil {
 		return h, errors.Wrap(err, "error loading existing host. Please try running [minikube delete], then run [minikube start] again")
 	}
-	defer postStartValidations(h, cc.Driver)
+	defer postStartValidations(h, cc.Driver, options)
 
 	driverName := h.Driver.DriverName()
 

pkg/minikube/machine/fix.go

@@ -35,7 +35,6 @@ import (
 	"github.com/docker/machine/libmachine/host"
 	"github.com/juju/mutex/v2"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/command"
@@ -150,7 +149,7 @@ func createHost(api libmachine.API, cfg *config.ClusterConfig, n *config.Node, o
 	if err != nil {
 		return nil, errors.Wrap(err, "new host")
 	}
-	defer postStartValidations(h, cfg.Driver)
+	defer postStartValidations(h, cfg.Driver, options)
 
 	h.HostOptions.AuthOptions.CertDir = localpath.MiniPath()
 	h.HostOptions.AuthOptions.StorePath = localpath.MiniPath()
@@ -202,7 +201,7 @@ func timedCreateHost(h *host.Host, api libmachine.API, t time.Duration) error {
 
 // postStartValidations are validations against the host after it is created
 // TODO: Add validations for VM drivers as well, see issue #9035
-func postStartValidations(h *host.Host, drvName string) {
+func postStartValidations(h *host.Host, drvName string, options *run.CommandOptions) {
 	if !driver.IsKIC(drvName) {
 		return
 	}
@@ -226,7 +225,7 @@ func postStartValidations(h *host.Host, drvName string) {
 		return
 	}
 
-	if viper.GetBool("force") {
+	if options.Force {
 		return
 	}
 

pkg/minikube/machine/start.go

@@ -211,7 +211,7 @@ func Start(starter Starter, options *run.CommandOptions) (*kubeconfig.Settings,
 	addonList := viper.GetStringSlice(config.AddonListFlag)
 	enabledAddons := make(chan []string, 1)
 	if starter.ExistingAddons != nil {
-		if viper.GetBool("force") {
+		if options.Force {
 			addons.Force = true
 		}
 		list := addons.ToEnable(starter.Cfg, starter.ExistingAddons, addonList)
@@ -669,7 +669,7 @@ func startMachine(cfg *config.ClusterConfig, node *config.Node, delOnFail bool,
 		return runner, preExists, m, hostInfo, errors.Wrap(err, "Failed to get command runner")
 	}
 
-	ip, err := validateNetwork(hostInfo, runner, cfg.KubernetesConfig.ImageRepository)
+	ip, err := validateNetwork(hostInfo, runner, cfg.KubernetesConfig.ImageRepository, options)
 	if err != nil {
 		return runner, preExists, m, hostInfo, errors.Wrap(err, "Failed to validate network")
 	}
@@ -752,7 +752,7 @@ func startHostInternal(api libmachine.API, cc *config.ClusterConfig, n *config.N
 }
 
 // validateNetwork tries to catch network problems as soon as possible
-func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (string, error) {
+func validateNetwork(h *host.Host, r command.Runner, imageRepository string, options *run.CommandOptions) (string, error) {
 	ip, err := h.Driver.GetIP()
 	if err != nil {
 		return ip, err
@@ -783,7 +783,7 @@ func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (st
 	}
 
 	if shouldTrySSH(h.Driver.DriverName(), ip) {
-		if err := trySSH(h, ip); err != nil {
+		if err := trySSH(h, ip, options); err != nil {
 			return ip, err
 		}
 	}
@@ -804,8 +804,8 @@ func shouldTrySSH(driverName, ip string) bool {
 	return true
 }
 
-func trySSH(h *host.Host, ip string) error {
-	if viper.GetBool("force") {
+func trySSH(h *host.Host, ip string, options *run.CommandOptions) error {
+	if options.Force {
 		return nil
 	}
 

pkg/minikube/node/start.go

@@ -28,7 +28,6 @@ import (
 	"github.com/blang/semver/v4"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
 	"k8s.io/klog/v2"
 	"k8s.io/minikube/pkg/drivers/kic"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
@@ -96,7 +95,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
 	}), nil
 }
 
-func status(_ *run.CommandOptions) (retState registry.State) {
+func status(options *run.CommandOptions) (retState registry.State) {
 	version, state := dockerVersionOrState()
 	if state.Error != nil {
 		return state
@@ -122,7 +121,7 @@ func status(_ *run.CommandOptions) (retState registry.State) {
 	dockerEngineVersion := versions[0]
 	dockerPlatformVersion := versions[1]
 	klog.Infof("docker version: %s", version)
-	if !viper.GetBool("force") {
+	if !options.Force {
 		if s := checkDockerDesktopVersion(dockerPlatformVersion); s.Error != nil {
 			return s
 		}

pkg/minikube/registry/drvs/docker/docker.go

@@ -30,4 +30,8 @@ type CommandOptions struct {
 	// ProfileName is set if the minikube command run with the --profile flag, using
 	// specific minikube instance.
 	ProfileName string
+
+	// Force is true if the minikube command run with the --force flag and can
+	// perform possibly dangerous operations.
+	Force bool
 }