Check backwords compatibility with older clusters

sadlil · sadlil · commit a0b82486a3cc · 2021-02-23T18:54:44.000Z
diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go
@@ -330,7 +330,7 @@ func deleteProfile(ctx context.Context, profile *config.Profile) error {
 		return DeletionError{Err: delErr, Errtype: MissingProfile}
 	}
 
-	if err == nil && (driver.IsNative(cc.Driver) || driver.IsSSH(cc.Driver)) {
+	if err == nil && (driver.BareMetal(cc.Driver) || driver.IsSSH(cc.Driver)) {
 		if err := uninstallKubernetes(api, *cc, cc.Nodes[0], viper.GetString(cmdcfg.Bootstrapper)); err != nil {
 			deletionError, ok := err.(DeletionError)
 			if ok {
diff --git a/cmd/minikube/cmd/node_add.go b/cmd/minikube/cmd/node_add.go
@@ -43,7 +43,7 @@ var nodeAddCmd = &cobra.Command{
 		co := mustload.Healthy(ClusterFlagValue())
 		cc := co.Config
 
-		if driver.IsNative(cc.Driver) {
+		if driver.BareMetal(cc.Driver) {
 			out.FailureT("native driver does not support multi-node clusters")
 		}
 
diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
@@ -182,6 +182,14 @@ func runStart(cmd *cobra.Command, args []string) {
 		validateProfileName()
 	}
 
+	if existing.Driver == driver.AliasNone || existing.VMDriver == driver.AliasNone {
+		// If a cluster was created before or with minikube v1.17.1 the driver
+		// name is stored as `none` in the config. We need to change that to
+		// `native` for future processing.
+		existing.Driver = driver.Native
+		existing.VMDriver = driver.Native
+	}
+
 	validateSpecifiedDriver(existing)
 	validateKubernetesVersion(existing)
 
@@ -355,7 +363,7 @@ func startWithDriver(cmd *cobra.Command, starter node.Starter, existing *config.
 		numNodes = len(existing.Nodes)
 	}
 	if numNodes > 1 {
-		if driver.IsNative(starter.Cfg.Driver) {
+		if driver.BareMetal(starter.Cfg.Driver) {
 			exit.Message(reason.DrvUnsupportedMulti, "The native driver is not compatible with multi-node clusters.")
 		} else {
 			if existing == nil {
@@ -989,7 +997,7 @@ func validateRequestedMemorySize(req int, drvName string) {
 // validateCPUCount validates the cpu count matches the minimum recommended & not exceeding the available cpu count
 func validateCPUCount(drvName string) {
 	var cpuCount int
-	if driver.IsNative(drvName) {
+	if driver.BareMetal(drvName) {
 
 		// Uses the gopsutil cpu package to count the number of logical cpu cores
 		ci, err := cpu.Counts(true)
@@ -1106,7 +1114,7 @@ func validateFlags(cmd *cobra.Command, drvName string) {
 		}
 	}
 
-	if driver.IsNative(drvName) {
+	if driver.BareMetal(drvName) {
 		if ClusterFlagValue() != constants.DefaultClusterName {
 			exit.Message(reason.DrvUnsupportedProfile, "The '{{.name}} driver does not support multiple profiles: https://minikube.sigs.k8s.io/docs/reference/drivers/none/", out.V{"name": drvName})
 		}
diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go
@@ -401,7 +401,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
 	}
 
 	var kubeNodeName string
-	if driver.IsNative(cc.Driver) {
+	if driver.BareMetal(cc.Driver) {
 		kubeNodeName = "m01"
 	}
 	return createNode(cc, kubeNodeName, existing)
diff --git a/go.sum b/go.sum
@@ -1026,6 +1026,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1257,6 +1258,7 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818 h1:u2ssHESKr0HP2d1wlnjMKH+V/22Vg1lGCVuXmOYU1qA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go
@@ -208,7 +208,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {
 		klog.Infof("ignoring SystemVerification for kubeadm because of old Kubernetes version %v", version)
 		skipSystemVerification = true
 	}
-	if driver.IsNative(cfg.Driver) && r.Name() == "Docker" {
+	if driver.BareMetal(cfg.Driver) && r.Name() == "Docker" {
 		if v, err := r.Version(); err == nil && strings.Contains(v, "azure") {
 			klog.Infof("ignoring SystemVerification for kubeadm because of unknown docker version %s", v)
 			skipSystemVerification = true
diff --git a/pkg/minikube/cni/cni.go b/pkg/minikube/cni/cni.go
@@ -125,7 +125,7 @@ func chooseDefault(cc config.ClusterConfig) Manager {
 		return Bridge{cc: cc}
 	}
 
-	if driver.IsNative(cc.Driver) {
+	if driver.BareMetal(cc.Driver) {
 		klog.Infof("Driver %s used, CNI unnecessary in this configuration, recommending no CNI", cc.Driver)
 		return Disabled{cc: cc}
 	}
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
@@ -142,14 +142,14 @@ func IsMock(name string) bool {
 
 // IsVM checks if the driver is a VM
 func IsVM(name string) bool {
-	if IsKIC(name) || IsNative(name) {
+	if IsKIC(name) || BareMetal(name) {
 		return false
 	}
 	return true
 }
 
-// IsNative returns if this driver is unisolated
-func IsNative(name string) bool {
+// BareMetal returns if this driver is unisolated
+func BareMetal(name string) bool {
 	return name == Native || name == Mock
 }
 
diff --git a/pkg/minikube/driver/driver_test.go b/pkg/minikube/driver/driver_test.go
@@ -51,10 +51,10 @@ func TestSupported(t *testing.T) {
 }
 
 func TestBareMetal(t *testing.T) {
-	if !IsNative(Native) {
+	if !BareMetal(Native) {
 		t.Errorf("Supported(%s) is false", Native)
 	}
-	if IsNative(VirtualBox) {
+	if BareMetal(VirtualBox) {
 		t.Errorf("Supported(%s) is true", VirtualBox)
 	}
 }
diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go
@@ -156,7 +156,7 @@ func CommandRunner(h *host.Host) (command.Runner, error) {
 	if h.DriverName == driver.Mock {
 		return &command.FakeCommandRunner{}, nil
 	}
-	if driver.IsNative(h.Driver.DriverName()) {
+	if driver.BareMetal(h.Driver.DriverName()) {
 		return command.NewExecRunner(true), nil
 	}
 
@@ -220,7 +220,7 @@ func (api *LocalClient) Create(h *host.Host) error {
 		{
 			"waiting",
 			func() error {
-				if driver.IsNative(h.Driver.DriverName()) {
+				if driver.BareMetal(h.Driver.DriverName()) {
 					return nil
 				}
 				return mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Running))
@@ -230,7 +230,7 @@ func (api *LocalClient) Create(h *host.Host) error {
 			"provisioning",
 			func() error {
 				// Skippable because we don't reconfigure Docker?
-				if driver.IsNative(h.Driver.DriverName()) {
+				if driver.BareMetal(h.Driver.DriverName()) {
 					return nil
 				}
 				return provisionDockerMachine(h)
diff --git a/pkg/minikube/machine/fix.go b/pkg/minikube/machine/fix.go
@@ -73,7 +73,7 @@ func fixHost(api libmachine.API, cc *config.ClusterConfig, n *config.Node) (*hos
 	}
 
 	// Avoid reprovisioning "native" driver because provision.Detect requires SSH
-	if !driver.IsNative(h.Driver.DriverName()) {
+	if !driver.BareMetal(h.Driver.DriverName()) {
 		e := engineOptions(*cc)
 		h.HostOptions.EngineOptions.Env = e.Env
 		err = provisionDockerMachine(h)
@@ -90,7 +90,7 @@ func fixHost(api libmachine.API, cc *config.ClusterConfig, n *config.Node) (*hos
 		return h, errors.Wrap(err, "post-start")
 	}
 
-	if driver.IsNative(h.Driver.DriverName()) {
+	if driver.BareMetal(h.Driver.DriverName()) {
 		klog.Infof("%s is local, skipping auth/time setup (requires ssh)", driverName)
 		return h, nil
 	}
diff --git a/pkg/minikube/machine/machine.go b/pkg/minikube/machine/machine.go
@@ -104,7 +104,7 @@ func fastDetectProvisioner(h *host.Host) (libprovision.Provisioner, error) {
 	switch {
 	case driver.IsKIC(d):
 		return provision.NewUbuntuProvisioner(h.Driver), nil
-	case driver.IsNative(d), driver.IsSSH(d):
+	case driver.BareMetal(d), driver.IsSSH(d):
 		return libprovision.DetectProvisioner(h.Driver)
 	default:
 		return provision.NewBuildrootProvisioner(h.Driver), nil
diff --git a/pkg/minikube/machine/start.go b/pkg/minikube/machine/start.go
@@ -286,7 +286,7 @@ func postStartSetup(h *host.Host, mc config.ClusterConfig) error {
 		return errors.Wrapf(err, "sudo mkdir (%s)", h.DriverName)
 	}
 
-	if driver.IsNative(mc.Driver) {
+	if driver.BareMetal(mc.Driver) {
 		showLocalOsRelease()
 	}
 	if driver.IsVM(mc.Driver) || driver.IsKIC(mc.Driver) || driver.IsSSH(mc.Driver) {
@@ -322,7 +322,7 @@ func acquireMachinesLock(name string, drv string) (mutex.Releaser, error) {
 // showHostInfo shows host information
 func showHostInfo(h *host.Host, cfg config.ClusterConfig) {
 	machineType := driver.MachineType(cfg.Driver)
-	if driver.IsNative(cfg.Driver) {
+	if driver.BareMetal(cfg.Driver) {
 		info, cpuErr, memErr, DiskErr := LocalHostInfo()
 		if cpuErr == nil && memErr == nil && DiskErr == nil {
 			register.Reg.SetStep(register.RunningLocalhost)
diff --git a/pkg/minikube/node/node.go b/pkg/minikube/node/node.go
@@ -133,7 +133,7 @@ func Delete(cc config.ClusterConfig, name string) (*config.Node, error) {
 
 // Retrieve finds the node by name in the given cluster
 func Retrieve(cc config.ClusterConfig, name string) (*config.Node, int, error) {
-	if driver.IsNative(cc.Driver) {
+	if driver.BareMetal(cc.Driver) {
 		name = "m01"
 	}
 
diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
@@ -225,7 +225,7 @@ func Provision(cc *config.ClusterConfig, n *config.Node, apiServer bool, delOnFa
 		beginDownloadKicBaseImage(&kicGroup, cc, viper.GetBool("download-only"))
 	}
 
-	if !driver.IsNative(cc.Driver) {
+	if !driver.BareMetal(cc.Driver) {
 		beginCacheKubernetesImages(&cacheGroup, cc.KubernetesConfig.ImageRepository, n.KubernetesVersion, cc.KubernetesConfig.ContainerRuntime)
 	}
 
@@ -257,7 +257,7 @@ func configureRuntimes(runner cruntime.CommandRunner, cc config.ClusterConfig, k
 	}
 
 	disableOthers := true
-	if driver.IsNative(cc.Driver) {
+	if driver.BareMetal(cc.Driver) {
 		disableOthers = false
 	}
 
@@ -487,7 +487,7 @@ func validateNetwork(h *host.Host, r command.Runner, imageRepository string) (st
 		}
 	}
 
-	if !driver.IsNative(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
+	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
 		if err := trySSH(h, ip); err != nil {
 			return ip, err
 		}
diff --git a/pkg/minikube/registry/global.go b/pkg/minikube/registry/global.go
@@ -48,14 +48,14 @@ func IsMock(name string) bool {
 
 // IsVM checks if the driver is a VM
 func IsVM(name string) bool {
-	if IsKIC(name) || IsMock(name) || IsNative(name) {
+	if IsKIC(name) || IsMock(name) || BareMetal(name) {
 		return false
 	}
 	return true
 }
 
-// IsNative returns if this driver is unisolated
-func IsNative(name string) bool {
+// BareMetal returns if this driver is unisolated
+func BareMetal(name string) bool {
 	return name == Native || name == Mock
 }
 
diff --git a/pkg/minikube/schedule/schedule.go b/pkg/minikube/schedule/schedule.go
@@ -36,7 +36,7 @@ func Daemonize(profiles []string, duration time.Duration) error {
 	var daemonizeProfiles []string
 	for _, p := range profiles {
 		_, cc := mustload.Partial(p)
-		if driver.IsNative(cc.Driver) {
+		if driver.BareMetal(cc.Driver) {
 			out.WarningT("scheduled stop is not supported on the native driver, skipping scheduling")
 			continue
 		}

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ func deleteProfile(ctx context.Context, profile *config.Profile) error {`
`330`	`330`	`return DeletionError{Err: delErr, Errtype: MissingProfile}`
`331`	`331`	`}`
`332`	`332`
`333`		`- if err == nil && (driver.IsNative(cc.Driver) \|\| driver.IsSSH(cc.Driver)) {`
	`333`	`+ if err == nil && (driver.BareMetal(cc.Driver) \|\| driver.IsSSH(cc.Driver)) {`
`334`	`334`	`if err := uninstallKubernetes(api, *cc, cc.Nodes[0], viper.GetString(cmdcfg.Bootstrapper)); err != nil {`
`335`	`335`	`deletionError, ok := err.(DeletionError)`
`336`	`336`	`if ok {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ var nodeAddCmd = &cobra.Command{`
`43`	`43`	`co := mustload.Healthy(ClusterFlagValue())`
`44`	`44`	`cc := co.Config`
`45`	`45`
`46`		`- if driver.IsNative(cc.Driver) {`
	`46`	`+ if driver.BareMetal(cc.Driver) {`
`47`	`47`	`out.FailureT("native driver does not support multi-node clusters")`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ func generateClusterConfig(cmd cobra.Command, existing config.ClusterConfig, k`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`var kubeNodeName string`
`404`		`- if driver.IsNative(cc.Driver) {`
	`404`	`+ if driver.BareMetal(cc.Driver) {`
`405`	`405`	`kubeNodeName = "m01"`
`406`	`406`	`}`
`407`	`407`	`return createNode(cc, kubeNodeName, existing)`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func (k *Bootstrapper) init(cfg config.ClusterConfig) error {`
`208`	`208`	`klog.Infof("ignoring SystemVerification for kubeadm because of old Kubernetes version %v", version)`
`209`	`209`	`skipSystemVerification = true`
`210`	`210`	`}`
`211`		`- if driver.IsNative(cfg.Driver) && r.Name() == "Docker" {`
	`211`	`+ if driver.BareMetal(cfg.Driver) && r.Name() == "Docker" {`
`212`	`212`	`if v, err := r.Version(); err == nil && strings.Contains(v, "azure") {`
`213`	`213`	`klog.Infof("ignoring SystemVerification for kubeadm because of unknown docker version %s", v)`
`214`	`214`	`skipSystemVerification = true`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func chooseDefault(cc config.ClusterConfig) Manager {`
`125`	`125`	`return Bridge{cc: cc}`
`126`	`126`	`}`
`127`	`127`
`128`		`- if driver.IsNative(cc.Driver) {`
	`128`	`+ if driver.BareMetal(cc.Driver) {`
`129`	`129`	`klog.Infof("Driver %s used, CNI unnecessary in this configuration, recommending no CNI", cc.Driver)`
`130`	`130`	`return Disabled{cc: cc}`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,14 @@ func IsMock(name string) bool {`
`142`	`142`
`143`	`143`	`// IsVM checks if the driver is a VM`
`144`	`144`	`func IsVM(name string) bool {`
`145`		`- if IsKIC(name) \|\| IsNative(name) {`
	`145`	`+ if IsKIC(name) \|\| BareMetal(name) {`
`146`	`146`	`return false`
`147`	`147`	`}`
`148`	`148`	`return true`
`149`	`149`	`}`
`150`	`150`
`151`		`-// IsNative returns if this driver is unisolated`
`152`		`-func IsNative(name string) bool {`
	`151`	`+// BareMetal returns if this driver is unisolated`
	`152`	`+func BareMetal(name string) bool {`
`153`	`153`	`return name == Native \|\| name == Mock`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,10 @@ func TestSupported(t *testing.T) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func TestBareMetal(t *testing.T) {`
`54`		`- if !IsNative(Native) {`
	`54`	`+ if !BareMetal(Native) {`
`55`	`55`	`t.Errorf("Supported(%s) is false", Native)`
`56`	`56`	`}`
`57`		`- if IsNative(VirtualBox) {`
	`57`	`+ if BareMetal(VirtualBox) {`
`58`	`58`	`t.Errorf("Supported(%s) is true", VirtualBox)`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func CommandRunner(h *host.Host) (command.Runner, error) {`
`156`	`156`	`if h.DriverName == driver.Mock {`
`157`	`157`	`return &command.FakeCommandRunner{}, nil`
`158`	`158`	`}`
`159`		`- if driver.IsNative(h.Driver.DriverName()) {`
	`159`	`+ if driver.BareMetal(h.Driver.DriverName()) {`
`160`	`160`	`return command.NewExecRunner(true), nil`
`161`	`161`	`}`
`162`	`162`
`@@ -220,7 +220,7 @@ func (api LocalClient) Create(h host.Host) error {`
`220`	`220`	`{`
`221`	`221`	`"waiting",`
`222`	`222`	`func() error {`
`223`		`- if driver.IsNative(h.Driver.DriverName()) {`
	`223`	`+ if driver.BareMetal(h.Driver.DriverName()) {`
`224`	`224`	`return nil`
`225`	`225`	`}`
`226`	`226`	`return mcnutils.WaitFor(drivers.MachineInState(h.Driver, state.Running))`
`@@ -230,7 +230,7 @@ func (api LocalClient) Create(h host.Host) error {`
`230`	`230`	`"provisioning",`
`231`	`231`	`func() error {`
`232`	`232`	`// Skippable because we don't reconfigure Docker?`
`233`		`- if driver.IsNative(h.Driver.DriverName()) {`
	`233`	`+ if driver.BareMetal(h.Driver.DriverName()) {`
`234`	`234`	`return nil`
`235`	`235`	`}`
`236`	`236`	`return provisionDockerMachine(h)`