Merge branch 'master' into sha256-checksum

CHANGELOG.md

@@ -775,7 +775,7 @@ Thank you to the contributors whose work made v1.1 into something we could all b
 * Add port name to service struct used in minikube service [#4011](https://github.com/kubernetes/minikube/pull/4011)
 * Update Hyper-V daemons [#4030](https://github.com/kubernetes/minikube/pull/4030)
 * Avoid surfacing "error: no objects passed to apply" non-error from addon-manager [#4076](https://github.com/kubernetes/minikube/pull/4076)
-* Don't cache images when --vmdriver=none [#4059](https://github.com/kubernetes/minikube/pull/4059)
+* Don't cache images when --vm-driver=none [#4059](https://github.com/kubernetes/minikube/pull/4059)
 * Enable CONFIG_NF_CONNTRACK_ZONES  [#3755](https://github.com/kubernetes/minikube/pull/3755)
 * Fixed status checking with non-default apiserver-port. [#4058](https://github.com/kubernetes/minikube/pull/4058)
 * Escape systemd special chars in docker-env [#3997](https://github.com/kubernetes/minikube/pull/3997)

Makefile

@@ -32,7 +32,7 @@ KIC_VERSION ?= 0.0.5
 GO_VERSION ?= 1.13.4
 
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
-BUILDROOT_BRANCH ?= 2019.02.8
+BUILDROOT_BRANCH ?= 2019.02.9
 REGISTRY?=gcr.io/k8s-minikube
 
 # Get git commit id
@@ -52,7 +52,7 @@ MINIKUBE_BUCKET ?= minikube/releases
 MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
 MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 
-KERNEL_VERSION ?= 4.19.88
+KERNEL_VERSION ?= 4.19.94
 # latest from https://github.com/golangci/golangci-lint/releases
 GOLINT_VERSION ?= v1.23.2
 # Limit number of default jobs, to avoid the CI builds running out of memory
@@ -60,7 +60,7 @@ GOLINT_JOBS ?= 4
 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
 GOLINT_GOGC ?= 100
 # options for lint (golangci-lint)
-GOLINT_OPTIONS = --timeout 4m \
+GOLINT_OPTIONS = --timeout 7m \
 	  --build-tags "${MINIKUBE_INTEGRATION_BUILD_TAGS}" \
 	  --enable goimports,gocritic,golint,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam,dogsled \
 	  --exclude 'variable on range scope.*in function literal|ifElseChain' \

cmd/minikube/cmd/cache.go

@@ -19,12 +19,10 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 	cmdConfig "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/image"
-	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 )
 
 // cacheImageConfigKey is the config field name used to store which images we have previously cached
@@ -77,54 +75,13 @@ var reloadCacheCmd = &cobra.Command{
 	Short: "reload cached images.",
 	Long:  "reloads images previously added using the 'cache add' subcommand",
 	Run: func(cmd *cobra.Command, args []string) {
-		err := cacheAndLoadImagesInConfig()
+		err := node.CacheAndLoadImagesInConfig()
 		if err != nil {
 			exit.WithError("Failed to reload cached images", err)
 		}
 	},
 }
 
-func imagesInConfigFile() ([]string, error) {
-	configFile, err := config.ReadConfig(localpath.ConfigFile)
-	if err != nil {
-		return nil, err
-	}
-	if values, ok := configFile[cacheImageConfigKey]; ok {
-		var images []string
-		for key := range values.(map[string]interface{}) {
-			images = append(images, key)
-		}
-		return images, nil
-	}
-	return []string{}, nil
-}
-
-// saveImagesToTarFromConfig saves images to tar in cache which specified in config file.
-// currently only used by download-only option
-func saveImagesToTarFromConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return image.SaveToDir(images, constants.ImageCacheDir)
-}
-
-// cacheAndLoadImagesInConfig loads the images currently in the config file
-// called by 'start' and 'cache reload' commands.
-func cacheAndLoadImagesInConfig() error {
-	images, err := imagesInConfigFile()
-	if err != nil {
-		return err
-	}
-	if len(images) == 0 {
-		return nil
-	}
-	return machine.CacheAndLoadImages(images)
-}
-
 func init() {
 	cacheCmd.AddCommand(addCacheCmd)
 	cacheCmd.AddCommand(deleteCacheCmd)

cmd/minikube/cmd/config/open.go

@@ -26,7 +26,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -69,7 +68,7 @@ var addonsOpenCmd = &cobra.Command{
 		defer api.Close()
 
 		profileName := viper.GetString(pkg_config.MachineProfile)
-		if !cluster.IsHostRunning(api, profileName) {
+		if !machine.IsHostRunning(api, profileName) {
 			os.Exit(1)
 		}
 		addon, ok := assets.Addons[addonName] // validate addon input

cmd/minikube/cmd/config/profile_list.go

@@ -23,7 +23,6 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -76,7 +75,7 @@ var printProfilesTable = func() {
 	defer api.Close()
 
 	for _, p := range validProfiles {
-		p.Status, err = cluster.GetHostStatus(api, p.Name)
+		p.Status, err = machine.GetHostStatus(api, p.Name)
 		if err != nil {
 			glog.Warningf("error getting host status for %s: %v", p.Name, err)
 		}
@@ -85,7 +84,7 @@ var printProfilesTable = func() {
 			glog.Errorf("%q has no control plane: %v", p.Name, err)
 			// Print the data we know about anyways
 		}
-		validData = append(validData, []string{p.Name, p.Config.VMDriver, p.Config.KubernetesConfig.ContainerRuntime, cp.IP, strconv.Itoa(cp.Port), p.Config.KubernetesConfig.KubernetesVersion, p.Status})
+		validData = append(validData, []string{p.Name, p.Config.Driver, p.Config.KubernetesConfig.ContainerRuntime, cp.IP, strconv.Itoa(cp.Port), p.Config.KubernetesConfig.KubernetesVersion, p.Status})
 	}
 
 	table.AppendBulk(validData)
@@ -118,7 +117,7 @@ var printProfilesJSON = func() {
 
 	validProfiles, invalidProfiles, err := config.ListProfiles()
 	for _, v := range validProfiles {
-		status, err := cluster.GetHostStatus(api, v.Name)
+		status, err := machine.GetHostStatus(api, v.Name)
 		if err != nil {
 			glog.Warningf("error getting host status for %s: %v", v.Name, err)
 		}

cmd/minikube/cmd/dashboard.go

@@ -35,7 +35,6 @@ import (
 	"github.com/spf13/viper"
 	pkgaddons "k8s.io/minikube/pkg/addons"
 	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -102,7 +101,7 @@ var dashboardCmd = &cobra.Command{
 			exit.WithCodeT(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/")
 		}
 
-		if !cluster.IsHostRunning(api, profileName) {
+		if !machine.IsHostRunning(api, profileName) {
 			os.Exit(1)
 		}
 

cmd/minikube/cmd/delete.go

@@ -32,7 +32,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/config"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/cruntime"
@@ -92,15 +94,13 @@ func runDelete(cmd *cobra.Command, args []string) {
 	if len(args) > 0 {
 		exit.UsageT("Usage: minikube delete")
 	}
-	profileFlag, err := cmd.Flags().GetString("profile")
-	if err != nil {
-		exit.WithError("Could not get profile flag", err)
-	}
+	profileFlag := viper.GetString(config.MachineProfile)
 
 	validProfiles, invalidProfiles, err := pkg_config.ListProfiles()
+	glog.Warningf("Couldn't find any profiles in minikube home %q: %v", localpath.MiniPath(), err)
 	profilesToDelete := append(validProfiles, invalidProfiles...)
-
-	// If the purge flag is set, go ahead and delete the .minikube directory.
+	// in the case user has more than 1 profile and runs --purge
+	// to prevent abandoned VMs/containers, force user to run with delete --all
 	if purge && len(profilesToDelete) > 1 && !deleteAll {
 		out.ErrT(out.Notice, "Multiple minikube profiles were found - ")
 		for _, p := range profilesToDelete {
@@ -114,8 +114,9 @@ func runDelete(cmd *cobra.Command, args []string) {
 			exit.UsageT("usage: minikube delete --all")
 		}
 
-		if err != nil {
-			exit.WithError("Error getting profiles to delete", err)
+		err := oci.DeleteAllVolumesByLabel(oci.Docker, fmt.Sprintf("%s=%s", oci.CreatedByLabelKey, "=true"))
+		if err != nil { // if there is no volume there won't be any error
+			glog.Warningf("error deleting left docker volumes. \n%v:\nfor more information please refer to docker documentation: https://docs.docker.com/engine/reference/commandline/volume_prune/", err)
 		}
 
 		errs := DeleteProfiles(profilesToDelete)
@@ -179,6 +180,10 @@ func DeleteProfiles(profiles []*pkg_config.Profile) []error {
 
 func deleteProfile(profile *pkg_config.Profile) error {
 	viper.Set(pkg_config.MachineProfile, profile.Name)
+	err := oci.DeleteAllVolumesByLabel(oci.Docker, fmt.Sprintf("%s=%s", oci.ProfileLabelKey, profile.Name))
+	if err != nil { // if there is no volume there wont be any error
+		glog.Warningf("error deleting left docker volumes. To see the list of volumes run: 'docker volume ls' \n:%v", err)
+	}
 
 	api, err := machine.NewAPIClient()
 	if err != nil {
@@ -192,7 +197,7 @@ func deleteProfile(profile *pkg_config.Profile) error {
 		return DeletionError{Err: delErr, Errtype: MissingProfile}
 	}
 
-	if err == nil && driver.BareMetal(cc.VMDriver) {
+	if err == nil && driver.BareMetal(cc.Driver) {
 		if err := uninstallKubernetes(api, profile.Name, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil {
 			deletionError, ok := err.(DeletionError)
 			if ok {
@@ -208,7 +213,7 @@ func deleteProfile(profile *pkg_config.Profile) error {
 		out.T(out.FailureType, "Failed to kill mount process: {{.error}}", out.V{"error": err})
 	}
 
-	if err = cluster.DeleteHost(api, profile.Name); err != nil {
+	if err = machine.DeleteHost(api, profile.Name); err != nil {
 		switch errors.Cause(err).(type) {
 		case mcnerror.ErrHostDoesNotExist:
 			glog.Infof("%s cluster does not exist. Proceeding ahead with cleanup.", profile.Name)
@@ -276,12 +281,12 @@ func profileDeletionErr(profileName string, additionalInfo string) error {
 
 func uninstallKubernetes(api libmachine.API, profile string, kc pkg_config.KubernetesConfig, bsName string) error {
 	out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName})
-	clusterBootstrapper, err := getClusterBootstrapper(api, bsName)
+	clusterBootstrapper, err := cluster.Bootstrapper(api, bsName)
 	if err != nil {
 		return DeletionError{Err: fmt.Errorf("unable to get bootstrapper: %v", err), Errtype: Fatal}
 	}
 
-	host, err := cluster.CheckIfHostExistsAndLoad(api, profile)
+	host, err := machine.CheckIfHostExistsAndLoad(api, profile)
 	if err != nil {
 		exit.WithError("Error getting host", err)
 	}

cmd/minikube/cmd/docker-env.go

@@ -32,7 +32,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
@@ -149,7 +148,7 @@ var dockerEnvCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		host, err := cluster.CheckIfHostExistsAndLoad(api, cc.Name)
+		host, err := machine.CheckIfHostExistsAndLoad(api, cc.Name)
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}
@@ -157,7 +156,7 @@ var dockerEnvCmd = &cobra.Command{
 			exit.UsageT(`'none' driver does not support 'minikube docker-env' command`)
 		}
 
-		hostSt, err := cluster.GetHostStatus(api, cc.Name)
+		hostSt, err := machine.GetHostStatus(api, cc.Name)
 		if err != nil {
 			exit.WithError("Error getting host status", err)
 		}

cmd/minikube/cmd/kubectl.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"runtime"
 	"syscall"
 
 	"github.com/golang/glog"
@@ -29,6 +28,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -59,7 +59,7 @@ minikube kubectl -- get pods --namespace kube-system`,
 			version = cc.KubernetesConfig.KubernetesVersion
 		}
 
-		path, err := cacheKubectlBinary(version)
+		path, err := node.CacheKubectlBinary(version)
 		if err != nil {
 			out.ErrLn("Error caching kubectl: %v", err)
 		}
@@ -82,12 +82,3 @@ minikube kubectl -- get pods --namespace kube-system`,
 		}
 	},
 }
-
-func cacheKubectlBinary(k8sVerison string) (string, error) {
-	binary := "kubectl"
-	if runtime.GOOS == "windows" {
-		binary = "kubectl.exe"
-	}
-
-	return machine.CacheBinary(binary, k8sVerison, runtime.GOOS, runtime.GOARCH)
-}

cmd/minikube/cmd/logs.go

@@ -20,6 +20,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -66,7 +67,7 @@ var logsCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("command runner", err)
 		}
-		bs, err := getClusterBootstrapper(api, viper.GetString(cmdcfg.Bootstrapper))
+		bs, err := cluster.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper))
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}

cmd/minikube/cmd/node.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"k8s.io/minikube/pkg/minikube/exit"
+)
+
+// nodeCmd represents the set of node subcommands
+var nodeCmd = &cobra.Command{
+	Use:    "node",
+	Short:  "Node operations",
+	Long:   "Operations on nodes",
+	Hidden: true, // This won't be fully functional and thus should not be documented yet
+	Run: func(cmd *cobra.Command, args []string) {
+		exit.UsageT("Usage: minikube node [add|start|stop|delete]")
+	},
+}

cmd/minikube/cmd/node_add.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"strconv"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/node"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+var (
+	nodeName string
+	cp       bool
+	worker   bool
+)
+var nodeAddCmd = &cobra.Command{
+	Use:   "add",
+	Short: "Adds a node to the given cluster.",
+	Long:  "Adds a node to the given cluster config, and starts it.",
+	Run: func(cmd *cobra.Command, args []string) {
+		profile := viper.GetString(config.MachineProfile)
+		mc, err := config.Load(profile)
+		if err != nil {
+			exit.WithError("Error getting config", err)
+		}
+		name := nodeName
+		if nodeName == "" {
+			name = profile + strconv.Itoa(len(mc.Nodes)+1)
+		}
+		out.T(out.Happy, "Adding node {{.name}} to cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
+
+		n, err := node.Add(mc, name, cp, worker, "", profile)
+		if err != nil {
+			exit.WithError("Error adding node to cluster", err)
+		}
+
+		_, err = node.Start(*mc, *n, false, nil)
+		if err != nil {
+			exit.WithError("Error starting node", err)
+		}
+
+		out.T(out.Ready, "Successfully added {{.name}} to {{.cluster}}!", out.V{"name": name, "cluster": profile})
+	},
+}
+
+func init() {
+	nodeAddCmd.Flags().StringVar(&nodeName, "name", "", "The name of the node to add.")
+	nodeAddCmd.Flags().BoolVar(&cp, "control-plane", false, "If true, the node added will also be a control plane in addition to a worker.")
+	nodeAddCmd.Flags().BoolVar(&worker, "worker", true, "If true, the added node will be marked for work. Defaults to true.")
+	//We should figure out which of these flags to actually import
+	startCmd.Flags().Visit(
+		func(f *pflag.Flag) {
+			nodeAddCmd.Flags().AddFlag(f)
+		},
+	)
+	nodeCmd.AddCommand(nodeAddCmd)
+}

cmd/minikube/cmd/node_delete.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"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/node"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+var nodeDeleteCmd = &cobra.Command{
+	Use:   "delete",
+	Short: "Deletes a node from a cluster.",
+	Long:  "Deletes a node from a cluster.",
+	Run: func(cmd *cobra.Command, args []string) {
+
+		if len(args) == 0 {
+			exit.UsageT("Usage: minikube node delete [name]")
+		}
+		name := args[0]
+
+		profile := viper.GetString(config.MachineProfile)
+		out.T(out.DeletingHost, "Deleting node {{.name}} from cluster {{.cluster}}", out.V{"name": name, "cluster": profile})
+
+		cc, err := config.Load(profile)
+		if err != nil {
+			exit.WithError("loading config", err)
+		}
+
+		err = node.Delete(*cc, name)
+		if err != nil {
+			out.FatalT("Failed to delete node {{.name}}", out.V{"name": name})
+		}
+
+		out.T(out.Deleted, "Node {{.name}} was successfully deleted.", out.V{"name": name})
+	},
+}
+
+func init() {
+	nodeCmd.AddCommand(nodeDeleteCmd)
+}

cmd/minikube/cmd/node_start.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+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"
+	"k8s.io/minikube/pkg/minikube/node"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+var nodeStartCmd = &cobra.Command{
+	Use:   "start",
+	Short: "Starts a node.",
+	Long:  "Starts an existing stopped node in a cluster.",
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) == 0 {
+			exit.UsageT("Usage: minikube node start [name]")
+		}
+
+		name := args[0]
+
+		// Make sure it's not running
+		api, err := machine.NewAPIClient()
+		if err != nil {
+			exit.WithError("creating api client", err)
+		}
+
+		if machine.IsHostRunning(api, name) {
+			out.T(out.Check, "{{.name}} is already running", out.V{"name": name})
+			os.Exit(0)
+		}
+
+		cc, err := config.Load(viper.GetString(config.MachineProfile))
+		if err != nil {
+			exit.WithError("loading config", err)
+		}
+
+		n, _, err := node.Retrieve(cc, name)
+		if err != nil {
+			exit.WithError("retrieving node", err)
+		}
+
+		// Start it up baby
+		_, err = node.Start(*cc, *n, false, nil)
+		if err != nil {
+			out.FatalT("Failed to start node {{.name}}", out.V{"name": name})
+		}
+	},
+}
+
+func init() {
+	nodeStartCmd.Flags().String("name", "", "The name of the node to start")
+	nodeCmd.AddCommand(nodeStartCmd)
+}

pkg/minikube/cluster/ssh.go → cmd/minikube/cmd/node_stop.go

@@ -14,36 +14,39 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package cmd
 
 import (
-	"github.com/docker/machine/libmachine"
-	"github.com/docker/machine/libmachine/state"
-	"github.com/pkg/errors"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
+	"github.com/spf13/cobra"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
 )
 
-// CreateSSHShell creates a new SSH shell / client
-func CreateSSHShell(api libmachine.API, args []string) error {
-	machineName := viper.GetString(config.MachineProfile)
-	host, err := CheckIfHostExistsAndLoad(api, machineName)
-	if err != nil {
-		return errors.Wrap(err, "host exists and load")
-	}
-
-	currentState, err := host.Driver.GetState()
-	if err != nil {
-		return errors.Wrap(err, "state")
-	}
-
-	if currentState != state.Running {
-		return errors.Errorf("%q is not running", machineName)
-	}
-
-	client, err := host.CreateSSHClient()
-	if err != nil {
-		return errors.Wrap(err, "Creating ssh client")
-	}
-	return client.Shell(args...)
+var nodeStopCmd = &cobra.Command{
+	Use:   "stop",
+	Short: "Stops a node in a cluster.",
+	Long:  "Stops a node in a cluster.",
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) == 0 {
+			exit.UsageT("Usage: minikube node stop [name]")
+		}
+
+		name := args[0]
+
+		api, err := machine.NewAPIClient()
+		if err != nil {
+			exit.WithError("creating api client", err)
+		}
+
+		err = machine.StopHost(api, name)
+		if err != nil {
+			out.FatalT("Failed to stop node {{.name}}", out.V{"name": name})
+		}
+	},
+}
+
+func init() {
+	nodeStopCmd.Flags().String("name", "", "The name of the node to delete")
+	nodeCmd.AddCommand(nodeStopCmd)
 }

cmd/minikube/cmd/pause.go

@@ -63,7 +63,7 @@ func runPause(cmd *cobra.Command, args []string) {
 	}
 
 	glog.Infof("config: %+v", cc)
-	host, err := cluster.CheckIfHostExistsAndLoad(api, cname)
+	host, err := machine.CheckIfHostExistsAndLoad(api, cname)
 	if err != nil {
 		exit.WithError("Error getting host", err)
 	}

cmd/minikube/cmd/podman-env.go

@@ -32,7 +32,6 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/driver"
@@ -120,7 +119,7 @@ var podmanEnvCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		host, err := cluster.CheckIfHostExistsAndLoad(api, cc.Name)
+		host, err := machine.CheckIfHostExistsAndLoad(api, cc.Name)
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}
@@ -128,7 +127,7 @@ var podmanEnvCmd = &cobra.Command{
 			exit.UsageT(`'none' driver does not support 'minikube podman-env' command`)
 		}
 
-		hostSt, err := cluster.GetHostStatus(api, cc.Name)
+		hostSt, err := machine.GetHostStatus(api, cc.Name)
 		if err != nil {
 			exit.WithError("Error getting host status", err)
 		}

cmd/minikube/cmd/root.go

@@ -23,16 +23,12 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/docker/machine/libmachine"
 	"github.com/golang/glog"
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 	"k8s.io/kubectl/pkg/util/templates"
 	configCmd "k8s.io/minikube/cmd/minikube/cmd/config"
-	"k8s.io/minikube/pkg/minikube/bootstrapper"
-	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -206,6 +202,7 @@ func init() {
 				mountCmd,
 				sshCmd,
 				kubectlCmd,
+				nodeCmd,
 			},
 		},
 		{
@@ -266,22 +263,6 @@ func setupViper() {
 	setFlagsUsingViper()
 }
 
-// getClusterBootstrapper returns a new bootstrapper for the cluster
-func getClusterBootstrapper(api libmachine.API, bootstrapperName string) (bootstrapper.Bootstrapper, error) {
-	var b bootstrapper.Bootstrapper
-	var err error
-	switch bootstrapperName {
-	case bootstrapper.Kubeadm:
-		b, err = kubeadm.NewBootstrapper(api)
-		if err != nil {
-			return nil, errors.Wrap(err, "getting a new kubeadm bootstrapper")
-		}
-	default:
-		return nil, fmt.Errorf("unknown bootstrapper: %s", bootstrapperName)
-	}
-	return b, nil
-}
-
 func addToPath(dir string) {
 	new := fmt.Sprintf("%s:%s", dir, os.Getenv("PATH"))
 	glog.Infof("Updating PATH: %s", dir)

cmd/minikube/cmd/service.go

@@ -27,7 +27,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"k8s.io/minikube/pkg/minikube/cluster"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/machine"
@@ -74,7 +73,7 @@ var serviceCmd = &cobra.Command{
 		defer api.Close()
 
 		profileName := viper.GetString(pkg_config.MachineProfile)
-		if !cluster.IsHostRunning(api, profileName) {
+		if !machine.IsHostRunning(api, profileName) {
 			os.Exit(1)
 		}
 

cmd/minikube/cmd/ssh.go

@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -46,7 +45,7 @@ var sshCmd = &cobra.Command{
 		if err != nil {
 			exit.WithError("Error getting config", err)
 		}
-		host, err := cluster.CheckIfHostExistsAndLoad(api, cc.Name)
+		host, err := machine.CheckIfHostExistsAndLoad(api, cc.Name)
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}
@@ -59,7 +58,7 @@ var sshCmd = &cobra.Command{
 			ssh.SetDefaultClient(ssh.External)
 		}
 
-		err = cluster.CreateSSHShell(api, args)
+		err = machine.CreateSSHShell(api, args)
 		if err != nil {
 			// This is typically due to a non-zero exit code, so no need for flourish.
 			out.ErrLn("ssh: %v", err)

cmd/minikube/cmd/status.go

@@ -137,7 +137,7 @@ func status(api libmachine.API, name string) (*Status, error) {
 		Kubeconfig: Nonexistent,
 	}
 
-	hs, err := cluster.GetHostStatus(api, name)
+	hs, err := machine.GetHostStatus(api, name)
 	glog.Infof("%s host status = %q (err=%v)", name, hs, err)
 	if err != nil {
 		return st, errors.Wrap(err, "host")
@@ -179,7 +179,7 @@ func status(api libmachine.API, name string) (*Status, error) {
 		st.Kubeconfig = Configured
 	}
 
-	host, err := cluster.CheckIfHostExistsAndLoad(api, name)
+	host, err := machine.CheckIfHostExistsAndLoad(api, name)
 	if err != nil {
 		return st, err
 	}

cmd/minikube/cmd/stop.go

@@ -24,7 +24,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	pkg_config "k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
@@ -53,7 +52,7 @@ func runStop(cmd *cobra.Command, args []string) {
 
 	nonexistent := false
 	stop := func() (err error) {
-		err = cluster.StopHost(api)
+		err = machine.StopHost(api, profile)
 		if err == nil {
 			return nil
 		}
@@ -61,7 +60,7 @@ func runStop(cmd *cobra.Command, args []string) {
 
 		switch err := errors.Cause(err).(type) {
 		case mcnerror.ErrHostDoesNotExist:
-			out.T(out.Meh, `"{{.profile_name}}" VM does not exist, nothing to stop`, out.V{"profile_name": profile})
+			out.T(out.Meh, `"{{.profile_name}}" does not exist, nothing to stop`, out.V{"profile_name": profile})
 			nonexistent = true
 			return nil
 		default:

cmd/minikube/cmd/unpause.go

@@ -54,7 +54,7 @@ var unpauseCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		glog.Infof("config: %+v", cc)
-		host, err := cluster.CheckIfHostExistsAndLoad(api, cname)
+		host, err := machine.CheckIfHostExistsAndLoad(api, cname)
 		if err != nil {
 			exit.WithError("Error getting host", err)
 		}

deploy/iso/minikube-iso/configs/minikube_defconfig

@@ -67,3 +67,4 @@ BR2_PACKAGE_SYSTEMD_TIMESYNCD=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_SYSSTAT=y
 BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_CONNTRACK_TOOLS=y

deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash

@@ -2,3 +2,4 @@
 sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz
 sha256 75fad6e66b43c5039719edbd82ba072723aea6a9d4d8be4e7ac1c245a291ab1b 8455ce1ef385120deb827d0f0588c04357bad4c4.tar.gz
 sha256 6c9bf278ae6e125a39f1ae419e5bd314162a743f6587d70b1b6be095ac32b9af eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6.tar.gz
+sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c336700f2999acf9db07662b4a61355076e64a.tar.gz

deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# HEAD as of 2019-11-11
-CONMON_MASTER_VERSION = eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6
+# HEAD as of 2019-12-11, v2.0.6
+CONMON_MASTER_VERSION = 29c336700f2999acf9db07662b4a61355076e64a
 CONMON_MASTER_SITE = https://github.com/containers/conmon/archive
 CONMON_MASTER_SOURCE = $(CONMON_MASTER_VERSION).tar.gz
 CONMON_MASTER_LICENSE = Apache-2.0

deploy/iso/minikube-iso/package/containerd-bin/config.toml

@@ -66,4 +66,4 @@ oom_score = 0
     deletion_threshold = 0
     mutation_threshold = 100
     schedule_delay = "0s"
-    startup_delay = "100ms"
\ No newline at end of file
+    startup_delay = "100ms"

deploy/iso/minikube-iso/package/containerd-bin/config.toml.default

+root = "/var/lib/containerd"
+state = "/run/containerd"
+oom_score = 0
+
+[grpc]
+  address = "/run/containerd/containerd.sock"
+  uid = 0
+  gid = 0
+  max_recv_message_size = 16777216
+  max_send_message_size = 16777216
+
+[debug]
+  address = ""
+  uid = 0
+  gid = 0
+  level = ""
+
+[metrics]
+  address = ""
+  grpc_histogram = false
+
+[cgroup]
+  path = ""
+
+[plugins]
+  [plugins.cgroups]
+    no_prometheus = false
+  [plugins.cri]
+    stream_server_address = "127.0.0.1"
+    stream_server_port = "0"
+    enable_selinux = false
+    sandbox_image = "k8s.gcr.io/pause:3.1"
+    stats_collect_period = 10
+    systemd_cgroup = false
+    enable_tls_streaming = false
+    max_container_log_line_size = 16384
+    disable_proc_mount = false
+    [plugins.cri.containerd]
+      snapshotter = "overlayfs"
+      no_pivot = false
+      [plugins.cri.containerd.default_runtime]
+        runtime_type = "io.containerd.runtime.v1.linux"
+        runtime_engine = ""
+        runtime_root = ""
+      [plugins.cri.containerd.untrusted_workload_runtime]
+        runtime_type = ""
+        runtime_engine = ""
+        runtime_root = ""
+    [plugins.cri.cni]
+      bin_dir = "/opt/cni/bin"
+      conf_dir = "/etc/cni/net.d"
+      conf_template = ""
+    [plugins.cri.registry]
+      [plugins.cri.registry.mirrors]
+        [plugins.cri.registry.mirrors."docker.io"]
+          endpoint = ["https://registry-1.docker.io"]
+    [plugins.cri.x509_key_pair_streaming]
+      tls_cert_file = ""
+      tls_key_file = ""
+  [plugins.diff-service]
+    default = ["walking"]
+  [plugins.linux]
+    shim = "containerd-shim"
+    runtime = "runc"
+    runtime_root = ""
+    no_shim = false
+    shim_debug = false
+  [plugins.opt]
+    path = "/opt/containerd"
+  [plugins.restart]
+    interval = "10s"
+  [plugins.scheduler]
+    pause_threshold = 0.02
+    deletion_threshold = 0
+    mutation_threshold = 100
+    schedule_delay = "0s"
+    startup_delay = "100ms"

deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash

@@ -3,3 +3,4 @@ sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 v1.2.5.t
 sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 v1.2.6.tar.gz
 sha256 6165ae2ad669d9ec6d317492d30a1511365bd31ad29efae757f19c1828bf75b3 v1.2.8.tar.gz
 sha256 a0965e1492fca558629826f1aa89a9675de3d451cec67540400b30c0bf6ac387 v1.2.10.tar.gz
+sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 v1.2.12.tar.gz

deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk

@@ -3,8 +3,8 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_VERSION = v1.2.10
-CONTAINERD_BIN_COMMIT = b34a5c8af56e510852c35414db4c1f4fa6172339
+CONTAINERD_BIN_VERSION = v1.2.12
+CONTAINERD_BIN_COMMIT = 35bd7a5f69c13e1563af8a93431411cd9ecf5021
 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
 CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
 CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.hash

@@ -2,3 +2,4 @@ sha256 ccf83574556793ceb01717dc91c66b70f183c60c2bbec70283939aae8fdef768  crictl-
 sha256 9bdbea7a2b382494aff2ff014da328a042c5aba9096a7772e57fdf487e5a1d51  crictl-v1.13.0-linux-amd64.tar.gz
 sha256 c3b71be1f363e16078b51334967348aab4f72f46ef64a61fe7754e029779d45a  crictl-v1.15.0-linux-amd64.tar.gz
 sha256 19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1  crictl-v1.16.1-linux-amd64.tar.gz
+sha256 7b72073797f638f099ed19550d52e9b9067672523fc51b746e65d7aa0bafa414  crictl-v1.17.0-linux-amd64.tar.gz

deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CRICTL_BIN_VERSION = v1.16.1
+CRICTL_BIN_VERSION = v1.17.0
 CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION)
 CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-amd64.tar.gz
 CRICTL_BIN_STRIP_COMPONENTS = 0

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

@@ -10,3 +10,4 @@ sha256 6218a99877da9b9895e0088944731f5384803c15628d4b3c6b40ba1ddd39e052 v1.15.1.
 sha256 70d4c746fe207422c78420dc4239768f485eea639a38c993c02872ec6305dd1d v1.15.2.tar.gz
 sha256 05f9614c4d5970b4662499b84c270b0ab953596ee863dcd09c9dc7a2d2f09789 v1.16.0.tar.gz
 sha256 57e1ee990ef2d5af8b32c33a21b4998682608e3556dcf1d3349666f55e7d95b9 v1.16.1.tar.gz
+sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.16.1
-CRIO_BIN_COMMIT = bf8fcf34c942ba973a4f694094b46f914c779c0a
+CRIO_BIN_VERSION = v1.17.0
+CRIO_BIN_COMMIT = 6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme
@@ -43,8 +43,8 @@ define CRIO_BIN_INSTALL_TARGET_CMDS
 		$(@D)/bin/crio \
 		$(TARGET_DIR)/usr/bin/crio
 	$(INSTALL) -Dm755 \
-		$(@D)/bin/pause \
-		$(TARGET_DIR)/usr/libexec/crio/pause
+		$(@D)/bin/pinns \
+		$(TARGET_DIR)/usr/bin/pinns
 	$(INSTALL) -Dm644 \
 		$(CRIO_BIN_PKGDIR)/crio.conf \
 		$(TARGET_DIR)/etc/crio/crio.conf

deploy/iso/minikube-iso/package/crio-bin/crio.conf

-
 # The CRI-O configuration file specifies all of the available configuration
 # options and command-line flags for the crio(8) OCI Kubernetes Container Runtime
 # daemon, but in a TOML format that can be more easily modified and versioned.
@@ -100,7 +99,7 @@ no_pivot = false
 conmon = "/usr/libexec/crio/conmon"
 
 # Cgroup setting for conmon
-conmon_cgroup = "pod"
+conmon_cgroup = "system.slice"
 
 # Environment variable list for the conmon process, used for passing necessary
 # environment variables to conmon or the runtime.
@@ -118,7 +117,7 @@ seccomp_profile = ""
 
 # Used to change the name of the default AppArmor profile of CRI-O. The default
 # profile name is "crio-default-" followed by the version string of CRI-O.
-apparmor_profile = "crio-default-1.16.0"
+apparmor_profile = "crio-default-1.16.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"

deploy/iso/minikube-iso/package/crio-bin/crio.conf.default

@@ -99,7 +99,7 @@ no_pivot = false
 conmon = ""
 
 # Cgroup setting for conmon
-conmon_cgroup = "pod"
+conmon_cgroup = "system.slice"
 
 # Environment variable list for the conmon process, used for passing necessary
 # environment variables to conmon or the runtime.
@@ -117,7 +117,7 @@ seccomp_profile = ""
 
 # Used to change the name of the default AppArmor profile of CRI-O. The default
 # profile name is "crio-default-" followed by the version string of CRI-O.
-apparmor_profile = "crio-default-1.16.0"
+apparmor_profile = "crio-default-1.16.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"

deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash

@@ -14,3 +14,4 @@ sha256 e106ccfa2b1f60794faaa6bae57a2dac9dc4cb33e5541fad6a826ea525d01cc4  docker-
 sha256 12277eff64363f51ba2f20dd258bdc2c3248022996c0251921193ec6fd179e52  docker-18.09.8.tgz
 sha256 82a362af7689038c51573e0fd0554da8703f0d06f4dfe95dd5bda5acf0ae45fb  docker-18.09.9.tgz
 sha256 50cdf38749642ec43d6ac50f4a3f1f7f6ac688e8d8b4e1c5b7be06e1a82f06e9  docker-19.03.5.tgz
+sha256 34ff89ce917796594cd81149b1777d07786d297ffd0fef37a796b5897052f7cc  docker-19.03.6.tgz

deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 19.03.5
+DOCKER_BIN_VERSION = 19.03.6
 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 

deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HYPERV_DAEMONS_VERSION = 4.19.88
+HYPERV_DAEMONS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x
 HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz
 

deploy/iso/minikube-iso/package/podman/podman.hash

@@ -11,3 +11,4 @@ sha256 45eb7bccd81a1431b0c7a0697829c0bcc397048595d143fd91179b31d22a3c63 v1.4.1.t
 sha256 2e027c1b935f3a03f27ef7f17823ccf334607a17d033d4ce53a90b98294e7f68 v1.4.4.tar.gz
 sha256 61b44b739c485125f179044f7aa7dc58c820f771bce4ce495fa555a38dc68b57 v1.6.3.tar.gz
 sha256 6e59821320b435543bc7554e73faa66d5956e4ad3f7e7f4ea03bebd6726758e9 v1.6.4.tar.gz
+sha256 50960293c2019e38ce69e4cf5f0a683e7fea1562b180e38e38c9355fcd7c4f0d v1.6.5.tar.gz

deploy/iso/minikube-iso/package/podman/podman.mk

-PODMAN_VERSION = v1.6.4
-PODMAN_COMMIT = 5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26
+PODMAN_VERSION = v1.6.5
+PODMAN_COMMIT = 45e7be192ef99e870c59a1cd2c1fa7940b0af2d6
 PODMAN_SITE = https://github.com/containers/libpod/archive
 PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz
 PODMAN_LICENSE = Apache-2.0

deploy/iso/minikube-iso/package/runc-master/runc-master.hash

@@ -6,3 +6,4 @@ sha256 ad41ae930059fef18de1926cd78e00474c89290248fecdcc0e431c8aefee1deb 0a012df8
 sha256 e52c5d7365b2b9048f977bac8f06bf626dccb4d816d0947ec8523f543272f4ff 2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz
 sha256 257ac2c2bbc9770998f31b73f587718848ebb09465ce2cd20fbac198ebd5726e 425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz
 sha256 4ffe8323397d85dda7d5875fa6bdaf3f8c93592c1947dfa24a034719dc6f728e d736ef14f0288d6993a1845745d6756cfc9ddd5a.tar.gz
+sha256 defe87a5f15edc54288d3261f5be28219b9b9d904d98c6020eb2e45400a04fb2 dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz

deploy/iso/minikube-iso/package/runc-master/runc-master.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-# As of 2019-10-05
-RUNC_MASTER_VERSION = d736ef14f0288d6993a1845745d6756cfc9ddd5a
+# As of 2020-01-23, v1.0.0-rc10
+RUNC_MASTER_VERSION = dc9208a3303feef5b3839f4323d9beb36df0a9dd
 RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
 RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
 RUNC_MASTER_LICENSE = Apache-2.0

hack/jenkins/linux_integration_tests_none.sh

@@ -46,7 +46,7 @@ sudo rm -rf /data/*
 sudo rm -rf /etc/kubernetes/*
 sudo rm -rf /var/lib/minikube/* 
 
-# Stop any leftover kubelets
+# Stop any leftover kubelet
 systemctl is-active --quiet kubelet \
   && echo "stopping kubelet" \
   && sudo systemctl stop kubelet

pkg/addons/addons.go

@@ -28,7 +28,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
 	"k8s.io/minikube/pkg/minikube/assets"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
@@ -143,8 +142,8 @@ func enableOrDisableAddon(name, val, profile string) error {
 		exit.WithCodeT(exit.Data, "Unable to load config: {{.error}}", out.V{"error": err})
 	}
 
-	host, err := cluster.CheckIfHostExistsAndLoad(api, profile)
-	if err != nil || !cluster.IsHostRunning(api, profile) {
+	host, err := machine.CheckIfHostExistsAndLoad(api, profile)
+	if err != nil || !machine.IsHostRunning(api, profile) {
 		glog.Warningf("%q is not running, writing %s=%v to disk and skipping enablement (err=%v)", profile, addon.Name(), enable, err)
 		return nil
 	}
@@ -244,7 +243,7 @@ func enableOrDisableStorageClasses(name, val, profile string) error {
 	}
 	defer api.Close()
 
-	if !cluster.IsHostRunning(api, profile) {
+	if !machine.IsHostRunning(api, profile) {
 		glog.Warningf("%q is not running, writing %s=%v to disk and skipping enablement", profile, name, val)
 		return enableOrDisableAddon(name, val, profile)
 	}

pkg/drivers/kic/kic.go

@@ -65,7 +65,7 @@ func (d *Driver) Create() error {
 	params := oci.CreateParams{
 		Name:          d.NodeConfig.MachineName,
 		Image:         d.NodeConfig.ImageDigest,
-		ClusterLabel:  oci.ClusterLabelKey + "=" + d.MachineName,
+		ClusterLabel:  oci.ProfileLabelKey + "=" + d.MachineName,
 		CPUs:          strconv.Itoa(d.NodeConfig.CPU),
 		Memory:        strconv.Itoa(d.NodeConfig.Memory) + "mb",
 		Envs:          d.NodeConfig.Envs,

pkg/drivers/kic/oci/oci.go

@@ -57,24 +57,28 @@ func CreateContainerNode(p CreateParams) error {
 		"-v", "/lib/modules:/lib/modules:ro",
 		"--hostname", p.Name, // make hostname match container name
 		"--name", p.Name, // ... and set the container name
+		"--label", fmt.Sprintf("%s=%s", CreatedByLabelKey, "true"),
 		// label the node with the cluster ID
 		"--label", p.ClusterLabel,
 		// label the node with the role ID
-		"--label", fmt.Sprintf("%s=%s", nodeRoleKey, p.Role),
-	}
-
-	// volume path in minikube home folder to mount to /var
-	hostVarVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name, "var")
-	if err := os.MkdirAll(hostVarVolPath, 0711); err != nil {
-		return errors.Wrapf(err, "create var dir %s", hostVarVolPath)
+		"--label", fmt.Sprintf("%s=%s", nodeRoleLabelKey, p.Role),
 	}
 
 	if p.OCIBinary == Podman { // enable execing in /var
+		// volume path in minikube home folder to mount to /var
+		hostVarVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name, "var")
+		if err := os.MkdirAll(hostVarVolPath, 0711); err != nil {
+			return errors.Wrapf(err, "create var dir %s", hostVarVolPath)
+		}
 		// podman mounts var/lib with no-exec by default  https://github.com/containers/libpod/issues/5103
 		runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", hostVarVolPath))
 	}
 	if p.OCIBinary == Docker {
-		runArgs = append(runArgs, "--volume", "/var")
+		if err := createDockerVolume(p.Name); err != nil {
+			return errors.Wrapf(err, "creating volume for %s container", p.Name)
+		}
+		glog.Infof("Successfully created a docker volume %s", p.Name)
+		runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var", p.Name))
 		// setting resource limit in privileged mode is only supported by docker
 		// podman error: "Error: invalid configuration, cannot set resources with rootless containers not using cgroups v2 unified mode"
 		runArgs = append(runArgs, fmt.Sprintf("--cpus=%s", p.CPUs), fmt.Sprintf("--memory=%s", p.Memory))
@@ -264,7 +268,7 @@ func ContainerID(ociBinary string, nameOrID string) (string, error) {
 
 // ListOwnedContainers lists all the containres that kic driver created on user's machine using a label
 func ListOwnedContainers(ociBinary string) ([]string, error) {
-	return listContainersByLabel(ociBinary, ClusterLabelKey)
+	return listContainersByLabel(ociBinary, ProfileLabelKey)
 }
 
 // inspect return low-level information on containers

pkg/drivers/kic/oci/types.go

@@ -21,12 +21,15 @@ const (
 	DefaultBindIPV4 = "127.0.0.1"
 	Docker          = "docker"
 	Podman          = "podman"
-	// ClusterLabelKey is applied to each node docker container for identification
-	ClusterLabelKey = "io.x-k8s.kic.cluster"
+	// ProfileLabelKey is applied to any container or volume created by a specific minikube profile name.minikube.sigs.k8s.io=PROFILE_NAME
+	ProfileLabelKey = "name.minikube.sigs.k8s.io"
 	// NodeRoleKey is used to identify if it is control plane or worker
-	nodeRoleKey = "io.k8s.sigs.kic.role"
+	nodeRoleLabelKey = "role.minikube.sigs.k8s.io"
+	// CreatedByLabelKey is applied to any container/volume that is created by minikube created_by.minikube.sigs.k8s.io=true
+	CreatedByLabelKey = "created_by.minikube.sigs.k8s.io"
 )
 
+// CreateParams are parameters needed to create a container
 type CreateParams struct {
 	Name          string            // used for container name and hostname
 	Image         string            // container image to use to create the node.

pkg/drivers/kic/oci/volumes.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package oci
+
+import (
+	"os/exec"
+
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+)
+
+// DeleteAllVolumesByLabel deletes all volumes that have a specific label
+// if there is no volume to delete it will return nil
+// example: docker volume prune -f --filter label=name.minikube.sigs.k8s.io=minikube
+func DeleteAllVolumesByLabel(ociBin string, label string) error {
+	glog.Infof("trying to prune all %s volumes with label %s", ociBin, label)
+	if ociBin == Docker {
+		if err := PointToHostDockerDaemon(); err != nil {
+			return errors.Wrap(err, "point host docker-daemon")
+		}
+	}
+	cmd := exec.Command(ociBin, "volume", "prune", "-f", "--filter", label)
+	if out, err := cmd.CombinedOutput(); err != nil {
+		return errors.Wrapf(err, "output %s", string(out))
+	}
+	return nil
+}
+
+// createDockerVolume creates a docker volume to be attached to the container with correct labels and prefixes based on profile name
+// Caution ! if volume already exists does NOT return an error and will not apply the minikube labels on it.
+// TODO: this should be fixed as a part of https://github.com/kubernetes/minikube/issues/6530
+func createDockerVolume(name string) error {
+	if err := PointToHostDockerDaemon(); err != nil {
+		return errors.Wrap(err, "point host docker-daemon")
+	}
+	cmd := exec.Command(Docker, "volume", "create", name, "--label", "name.minikube.sigs.k8s.io="+name, "--label", "craeted_by_minikube.minikube.sigs.k8s.io=true")
+	if out, err := cmd.CombinedOutput(); err != nil {
+		return errors.Wrapf(err, "output %s", string(out))
+	}
+	return nil
+}

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

@@ -194,12 +194,12 @@ func (k *Bootstrapper) StartCluster(cfg config.MachineConfig) error {
 
 	// Allow older kubeadm versions to function with newer Docker releases.
 	// For kic on linux example error: "modprobe: FATAL: Module configs not found in directory /lib/modules/5.2.17-1rodete3-amd64"
-	if version.LT(semver.MustParse("1.13.0")) || driver.IsKIC(cfg.VMDriver) {
+	if version.LT(semver.MustParse("1.13.0")) || driver.IsKIC(cfg.Driver) {
 		glog.Infof("Older Kubernetes release detected (%s), disabling SystemVerification check.", version)
 		ignore = append(ignore, "SystemVerification")
 	}
 
-	if driver.IsKIC(cfg.VMDriver) { // to bypass this error: /proc/sys/net/bridge/bridge-nf-call-iptables does not exist
+	if driver.IsKIC(cfg.Driver) { // to bypass this error: /proc/sys/net/bridge/bridge-nf-call-iptables does not exist
 		ignore = append(ignore, "FileContent--proc-sys-net-bridge-bridge-nf-call-iptables")
 
 	}
@@ -210,13 +210,13 @@ func (k *Bootstrapper) StartCluster(cfg config.MachineConfig) error {
 		return errors.Wrapf(err, "init failed. output: %q", rr.Output())
 	}
 
-	if cfg.VMDriver == driver.Docker {
+	if cfg.Driver == driver.Docker {
 		if err := k.applyKicOverlay(cfg); err != nil {
 			return errors.Wrap(err, "apply kic overlay")
 		}
 	}
 
-	if !driver.IsKIC(cfg.VMDriver) { // TODO: skip for both after verifications https://github.com/kubernetes/minikube/issues/6239
+	if !driver.IsKIC(cfg.Driver) { // TODO: skip for both after verifications https://github.com/kubernetes/minikube/issues/6239
 		glog.Infof("Configuring cluster permissions ...")
 		elevate := func() error {
 			client, err := k.client(cp.IP, cp.Port)
@@ -275,9 +275,9 @@ func (k *Bootstrapper) WaitForCluster(cfg config.MachineConfig, timeout time.Dur
 
 	ip := cp.IP
 	port := cp.Port
-	if driver.IsKIC(cfg.VMDriver) {
+	if driver.IsKIC(cfg.Driver) {
 		ip = oci.DefaultBindIPV4
-		port, err = oci.HostPortBinding(cfg.VMDriver, cfg.Name, port)
+		port, err = oci.HostPortBinding(cfg.Driver, cfg.Name, port)
 		if err != nil {
 			return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 		}
@@ -343,9 +343,9 @@ func (k *Bootstrapper) restartCluster(cfg config.MachineConfig) error {
 	for _, n := range cfg.Nodes {
 		ip := n.IP
 		port := n.Port
-		if driver.IsKIC(cfg.VMDriver) {
+		if driver.IsKIC(cfg.Driver) {
 			ip = oci.DefaultBindIPV4
-			port, err = oci.HostPortBinding(cfg.VMDriver, cfg.Name, port)
+			port, err = oci.HostPortBinding(cfg.Driver, cfg.Name, port)
 			if err != nil {
 				return errors.Wrapf(err, "get host-bind port %d for container %s", port, cfg.Name)
 			}

pkg/minikube/cluster/cluster.go

@@ -18,9 +18,14 @@ package cluster
 
 import (
 	"flag"
+	"fmt"
 
+	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/ssh"
+	"github.com/pkg/errors"
 
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/kubeadm"
 	"k8s.io/minikube/pkg/minikube/exit"
 )
 
@@ -35,3 +40,19 @@ func init() {
 	// Setting the default client to native gives much better performance.
 	ssh.SetDefaultClient(ssh.Native)
 }
+
+// Bootstrapper returns a new bootstrapper for the cluster
+func Bootstrapper(api libmachine.API, bootstrapperName string) (bootstrapper.Bootstrapper, error) {
+	var b bootstrapper.Bootstrapper
+	var err error
+	switch bootstrapperName {
+	case bootstrapper.Kubeadm:
+		b, err = kubeadm.NewBootstrapper(api)
+		if err != nil {
+			return nil, errors.Wrap(err, "getting a new kubeadm bootstrapper")
+		}
+	default:
+		return nil, fmt.Errorf("unknown bootstrapper: %s", bootstrapperName)
+	}
+	return b, nil
+}

pkg/minikube/cluster/ip.go

@@ -27,6 +27,7 @@ import (
 	"github.com/pkg/errors"
 	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/machine"
 )
 
 // GetVMHostIP gets the ip address to be used for mapping host -> VM and VM -> host
@@ -74,7 +75,7 @@ func GetVMHostIP(host *host.Host) (net.IP, error) {
 
 // GetHostDriverIP gets the ip address of the current minikube cluster
 func GetHostDriverIP(api libmachine.API, machineName string) (net.IP, error) {
-	host, err := CheckIfHostExistsAndLoad(api, machineName)
+	host, err := machine.CheckIfHostExistsAndLoad(api, machineName)
 	if err != nil {
 		return nil, err
 	}

pkg/minikube/cluster/iso.go

@@ -23,7 +23,7 @@ import (
 
 // CacheISO downloads and caches ISO.
 func CacheISO(cfg config.MachineConfig) error {
-	if driver.BareMetal(cfg.VMDriver) {
+	if driver.BareMetal(cfg.Driver) {
 		return nil
 	}
 	return cfg.Downloader.CacheMinikubeISOFromURL(cfg.MinikubeISO)

pkg/minikube/config/config.go

@@ -54,6 +54,7 @@ var (
 	ErrKeyNotFound = errors.New("specified key could not be found in config")
 )
 
+// ErrNotExist is the error returned when a config does not exist
 type ErrNotExist struct {
 	s string
 }

pkg/minikube/config/profile.go

@@ -40,7 +40,7 @@ func (p *Profile) IsValid() bool {
 	if p.Config == nil {
 		return false
 	}
-	if p.Config.VMDriver == "" {
+	if p.Config.Driver == "" {
 		return false
 	}
 	for _, n := range p.Config.Nodes {

pkg/minikube/config/profile_test.go

@@ -54,8 +54,8 @@ func TestListProfiles(t *testing.T) {
 		if val[tt.index].Name != tt.expectName {
 			t.Errorf("expected %s got %v", tt.expectName, val[tt.index].Name)
 		}
-		if val[tt.index].Config.VMDriver != tt.vmDriver {
-			t.Errorf("expected %s got %v", tt.vmDriver, val[tt.index].Config.VMDriver)
+		if val[tt.index].Config.Driver != tt.vmDriver {
+			t.Errorf("expected %s got %v", tt.vmDriver, val[tt.index].Config.Driver)
 		}
 
 	}

pkg/minikube/config/testdata/.minikube2/profiles/p1/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/.minikube2/profiles/p2/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "virtualbox",
+        "Driver": "virtualbox",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json

@@ -5,7 +5,7 @@
         "Memory": 2000,
         "CPUs": 2,
         "DiskSize": 20000,
-        "VMDriver": "hyperkit",
+        "Driver": "hyperkit",
         "ContainerRuntime": "docker",
         "HyperkitVpnKitSock": "",
         "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json

@@ -5,7 +5,7 @@
     "Memory": 2000,
     "CPUs": 2,
     "DiskSize": 20000,
-    "VMDriver": "hyperkit",
+    "Driver": "hyperkit",
     "ContainerRuntime": "docker",
     "HyperkitVpnKitSock": "",
     "HyperkitVSockPorts": [],

pkg/minikube/config/testdata/profile/.minikube/profiles/p2/config.json

@@ -5,7 +5,7 @@
     "Memory": 2000,
     "CPUs": 2,
     "DiskSize": 20000,
-    "VMDriver": "virtualbox",
+    "Driver": "virtualbox",
     "ContainerRuntime": "docker",
     "HyperkitVpnKitSock": "",
     "HyperkitVSockPorts": [],

pkg/minikube/config/types.go

@@ -39,7 +39,7 @@ type MachineConfig struct {
 	Memory                  int
 	CPUs                    int
 	DiskSize                int
-	VMDriver                string
+	Driver                  string
 	HyperkitVpnKitSock      string   // Only used by the Hyperkit driver
 	HyperkitVSockPorts      []string // Only used by the Hyperkit driver
 	DockerEnv               []string // Each entry is formatted as KEY=VALUE.

pkg/minikube/driver/install.go

@@ -124,17 +124,17 @@ func validateDriver(executable string, v semver.Version) (string, error) {
 		return path, err
 	}
 
-	ev := extractVMDriverVersion(string(output))
+	ev := extractDriverVersion(string(output))
 	if len(ev) == 0 {
 		return path, fmt.Errorf("%s: unable to extract version from %q", executable, output)
 	}
 
-	vmDriverVersion, err := semver.Make(ev)
+	driverVersion, err := semver.Make(ev)
 	if err != nil {
 		return path, errors.Wrap(err, "can't parse driver version")
 	}
-	if vmDriverVersion.LT(v) {
-		return path, fmt.Errorf("%s is version %s, want %s", executable, vmDriverVersion, v)
+	if driverVersion.LT(v) {
+		return path, fmt.Errorf("%s is version %s, want %s", executable, driverVersion, v)
 	}
 	return path, nil
 }
@@ -164,12 +164,12 @@ func download(name string, destination string, v semver.Version) error {
 	return os.Chmod(destination, 0755)
 }
 
-// extractVMDriverVersion extracts the driver version.
+// extractDriverVersion extracts the driver version.
 // KVM and Hyperkit drivers support the 'version' command, that display the information as:
 // version: vX.X.X
 // commit: XXXX
 // This method returns the version 'vX.X.X' or empty if the version isn't found.
-func extractVMDriverVersion(s string) string {
+func extractDriverVersion(s string) string {
 	versionRegex := regexp.MustCompile(`version:(.*)`)
 	matches := versionRegex.FindStringSubmatch(s)
 

pkg/minikube/driver/install_test.go

@@ -20,25 +20,25 @@ import (
 	"testing"
 )
 
-func TestExtractVMDriverVersion(t *testing.T) {
-	v := extractVMDriverVersion("")
+func TestExtractDriverVersion(t *testing.T) {
+	v := extractDriverVersion("")
 	if len(v) != 0 {
 		t.Error("Expected empty string")
 	}
 
-	v = extractVMDriverVersion("random text")
+	v = extractDriverVersion("random text")
 	if len(v) != 0 {
 		t.Error("Expected empty string")
 	}
 
 	expectedVersion := "1.2.3"
 
-	v = extractVMDriverVersion("version: v1.2.3")
+	v = extractDriverVersion("version: v1.2.3")
 	if expectedVersion != v {
 		t.Errorf("Expected version: %s, got: %s", expectedVersion, v)
 	}
 
-	v = extractVMDriverVersion("version: 1.2.3")
+	v = extractDriverVersion("version: 1.2.3")
 	if expectedVersion != v {
 		t.Errorf("Expected version: %s, got: %s", expectedVersion, v)
 	}

pkg/minikube/machine/cache_images.go

@@ -31,7 +31,6 @@ import (
 	"golang.org/x/sync/errgroup"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/bootstrapper"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/constants"
@@ -139,7 +138,7 @@ func CacheAndLoadImages(images []string) error {
 	}
 	for _, p := range profiles { // loading images to all running profiles
 		pName := p.Name // capture the loop variable
-		status, err := cluster.GetHostStatus(api, pName)
+		status, err := GetHostStatus(api, pName)
 		if err != nil {
 			glog.Warningf("skipping loading cache for profile %s", pName)
 			glog.Errorf("error getting status for %s: %v", pName, err)

pkg/minikube/cluster/cluster_test.go → pkg/minikube/machine/cluster_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"fmt"
@@ -61,7 +61,7 @@ func RegisterMockDriver(t *testing.T) {
 }
 
 var defaultMachineConfig = config.MachineConfig{
-	VMDriver:    driver.Mock,
+	Driver:      driver.Mock,
 	MinikubeISO: constants.DefaultISOURL,
 	Downloader:  MockDownloader{},
 	DockerEnv:   []string{"MOCK_MAKE_IT_PROVISION=true"},
@@ -262,7 +262,7 @@ func TestStartHostConfig(t *testing.T) {
 	provision.SetDetector(md)
 
 	config := config.MachineConfig{
-		VMDriver:   driver.Mock,
+		Driver:     driver.Mock,
 		DockerEnv:  []string{"FOO=BAR"},
 		DockerOpt:  []string{"param=value"},
 		Downloader: MockDownloader{},
@@ -290,7 +290,7 @@ func TestStartHostConfig(t *testing.T) {
 func TestStopHostError(t *testing.T) {
 	RegisterMockDriver(t)
 	api := tests.NewMockAPI(t)
-	if err := StopHost(api); err == nil {
+	if err := StopHost(api, viper.GetString("profile")); err == nil {
 		t.Fatal("An error should be thrown when stopping non-existing machine.")
 	}
 }
@@ -303,7 +303,7 @@ func TestStopHost(t *testing.T) {
 		t.Errorf("createHost failed: %v", err)
 	}
 
-	if err := StopHost(api); err != nil {
+	if err := StopHost(api, viper.GetString("profile")); err != nil {
 		t.Fatal("An error should be thrown when stopping non-existing machine.")
 	}
 	if s, _ := h.Driver.GetState(); s != state.Stopped {
@@ -389,7 +389,7 @@ func TestGetHostStatus(t *testing.T) {
 
 	checkState(state.Running.String())
 
-	if err := StopHost(api); err != nil {
+	if err := StopHost(api, viper.GetString("profile")); err != nil {
 		t.Errorf("StopHost failed: %v", err)
 	}
 	checkState(state.Stopped.String())

pkg/minikube/cluster/delete.go → pkg/minikube/machine/delete.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"os/exec"
@@ -43,7 +43,7 @@ func DeleteHost(api libmachine.API, machineName string) error {
 	host, err := api.Load(machineName)
 	if err != nil && host == nil {
 		deleteOrphanedKIC(machineName)
-		// keep going even if minikube  does not know about the host
+		// Keep going even if minikube does not know about the host
 	}
 
 	// Get the status of the host. Ensure that it exists before proceeding ahead.

pkg/minikube/cluster/filesync.go → pkg/minikube/machine/filesync.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"fmt"
@@ -31,6 +31,15 @@ import (
 	"k8s.io/minikube/pkg/minikube/vmpath"
 )
 
+// guaranteed are directories we don't need to attempt recreation of
+var guaranteed = map[string]bool{
+	"/":    true,
+	"":     true,
+	"/etc": true,
+	"/var": true,
+	"/tmp": true,
+}
+
 // syncLocalAssets syncs files from MINIKUBE_HOME into the cluster
 func syncLocalAssets(cr command.Runner) error {
 	fs, err := localAssets()
@@ -38,20 +47,30 @@ func syncLocalAssets(cr command.Runner) error {
 		return err
 	}
 
-	dirs := map[string]bool{}
-	for _, f := range fs {
-		dirs[f.GetTargetDir()] = true
+	if len(fs) == 0 {
+		return nil
 	}
 
-	args := []string{"mkdir", "-p"}
-	for k := range dirs {
-		args = append(args, k)
+	// Deduplicate the list of directories to create
+	seen := map[string]bool{}
+	create := []string{}
+	for _, f := range fs {
+		dir := f.GetTargetDir()
+		if guaranteed[dir] || seen[dir] {
+			continue
+		}
+		create = append(create, dir)
 	}
-	cmd := exec.Command("sudo", args...)
-	if _, err := cr.RunCmd(cmd); err != nil {
-		return err
+
+	// Create directories that are not guaranteed to exist
+	if len(create) > 0 {
+		args := append([]string{"mkdir", "-p"}, create...)
+		if _, err := cr.RunCmd(exec.Command("sudo", args...)); err != nil {
+			return err
+		}
 	}
 
+	// Copy the files into place
 	for _, f := range fs {
 		err := cr.Copy(f)
 		if err != nil {

pkg/minikube/cluster/filesync_test.go → pkg/minikube/machine/filesync_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"io/ioutil"

pkg/minikube/cluster/fix.go → pkg/minikube/machine/fix.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"fmt"
@@ -101,9 +101,9 @@ func fixHost(api libmachine.API, mc config.MachineConfig) (*host.Host, error) {
 	}
 
 	if s == state.Running {
-		out.T(out.Running, `Using the running {{.driver_name}} "{{.profile_name}}" VM ...`, out.V{"driver_name": mc.VMDriver, "profile_name": mc.Name})
+		out.T(out.Running, `Using the running {{.driver_name}} "{{.profile_name}}" VM ...`, out.V{"driver_name": mc.Driver, "profile_name": mc.Name})
 	} else {
-		out.T(out.Restarting, `Starting existing {{.driver_name}} VM for "{{.profile_name}}" ...`, out.V{"driver_name": mc.VMDriver, "profile_name": mc.Name})
+		out.T(out.Restarting, `Starting existing {{.driver_name}} VM for "{{.profile_name}}" ...`, out.V{"driver_name": mc.Driver, "profile_name": mc.Name})
 		if err := h.Driver.Start(); err != nil {
 			return h, errors.Wrap(err, "driver start")
 		}
@@ -142,7 +142,7 @@ func fixHost(api libmachine.API, mc config.MachineConfig) (*host.Host, error) {
 	if err := h.ConfigureAuth(); err != nil {
 		return h, &retry.RetriableError{Err: errors.Wrap(err, "Error configuring auth on host")}
 	}
-	return h, ensureSyncedGuestClock(h, mc.VMDriver)
+	return h, ensureSyncedGuestClock(h, mc.Driver)
 }
 
 // ensureGuestClockSync ensures that the guest system clock is relatively in-sync
@@ -198,10 +198,13 @@ func adjustGuestClock(h hostRunner, t time.Time) error {
 
 // machineExists checks if virtual machine does not exist
 // if the virtual machine exists, return true
-func machineExists(vmDriver string, s state.State, err error) (bool, error) {
-	switch vmDriver {
+func machineExists(d string, s state.State, err error) (bool, error) {
+	if s == state.Running || s == state.Stopped {
+		return true, nil
+	}
+	switch d {
 	case driver.HyperKit:
-		if s == state.Stopped || err.Error() == "connection is shut down" {
+		if s == state.None || (err != nil && err.Error() == "connection is shut down") {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
@@ -211,17 +214,17 @@ func machineExists(vmDriver string, s state.State, err error) (bool, error) {
 		}
 		return true, err
 	case driver.KVM2:
-		if s == state.None || s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.None:
-		if s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.Parallels:
-		if err.Error() == "machine does not exist" {
+		if err != nil && err.Error() == "machine does not exist" {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
@@ -231,12 +234,12 @@ func machineExists(vmDriver string, s state.State, err error) (bool, error) {
 		}
 		return true, err
 	case driver.VMware:
-		if s == state.None || s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err
 	case driver.VMwareFusion:
-		if s == state.Stopped {
+		if s == state.None {
 			return false, ErrorMachineNotExist
 		}
 		return true, err

pkg/minikube/cluster/info.go → pkg/minikube/machine/info.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"io/ioutil"
@@ -25,8 +25,6 @@ import (
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/mem"
-	"k8s.io/minikube/pkg/minikube/config"
-	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -97,22 +95,3 @@ func logRemoteOsRelease(drv drivers.Driver) {
 
 	glog.Infof("Provisioned with %s", osReleaseInfo.PrettyName)
 }
-
-// showHostInfo shows host information
-func showHostInfo(cfg config.MachineConfig) {
-	if driver.BareMetal(cfg.VMDriver) {
-		info, err := getHostInfo()
-		if err == nil {
-			out.T(out.StartingNone, "Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", out.V{"number_of_cpus": info.CPUs, "memory_size": info.Memory, "disk_size": info.DiskSize})
-		}
-		return
-	}
-	if driver.IsKIC(cfg.VMDriver) {
-		info, err := getHostInfo() // TODO medyagh: get docker-machine info for non linux
-		if err == nil {
-			out.T(out.StartingVM, "Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...", out.V{"driver_name": cfg.VMDriver, "number_of_cpus": cfg.CPUs, "number_of_host_cpus": info.CPUs, "memory_size": cfg.Memory, "host_memory_size": info.Memory})
-		}
-		return
-	}
-	out.T(out.StartingVM, "Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", out.V{"driver_name": cfg.VMDriver, "number_of_cpus": cfg.CPUs, "memory_size": cfg.Memory, "disk_size": cfg.DiskSize})
-}

pkg/minikube/machine/machine.go

@@ -20,10 +20,13 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/host"
+	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/minikube/cluster"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/localpath"
 )
 
@@ -90,7 +93,7 @@ func Load(name string) (*Machine, error) {
 		return nil, err
 	}
 
-	h, err := cluster.CheckIfHostExistsAndLoad(api, name)
+	h, err := CheckIfHostExistsAndLoad(api, name)
 	if err != nil {
 		return nil, err
 	}
@@ -119,3 +122,27 @@ func machineDirs(miniHome ...string) (dirs []string, err error) {
 	}
 	return dirs, err
 }
+
+// CreateSSHShell creates a new SSH shell / client
+func CreateSSHShell(api libmachine.API, args []string) error {
+	machineName := viper.GetString(config.MachineProfile)
+	host, err := CheckIfHostExistsAndLoad(api, machineName)
+	if err != nil {
+		return errors.Wrap(err, "host exists and load")
+	}
+
+	currentState, err := host.Driver.GetState()
+	if err != nil {
+		return errors.Wrap(err, "state")
+	}
+
+	if currentState != state.Running {
+		return errors.Errorf("%q is not running", machineName)
+	}
+
+	client, err := host.CreateSSHClient()
+	if err != nil {
+		return errors.Wrap(err, "Creating ssh client")
+	}
+	return client.Shell(args...)
+}

pkg/minikube/cluster/start.go → pkg/minikube/machine/start.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"encoding/json"
@@ -97,22 +97,22 @@ func engineOptions(cfg config.MachineConfig) *engine.Options {
 }
 
 func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error) {
-	glog.Infof("createHost starting for %q (driver=%q)", cfg.Name, cfg.VMDriver)
+	glog.Infof("createHost starting for %q (driver=%q)", cfg.Name, cfg.Driver)
 	start := time.Now()
 	defer func() {
 		glog.Infof("createHost completed in %s", time.Since(start))
 	}()
 
-	if cfg.VMDriver == driver.VMwareFusion && viper.GetBool(config.ShowDriverDeprecationNotification) {
+	if cfg.Driver == driver.VMwareFusion && viper.GetBool(config.ShowDriverDeprecationNotification) {
 		out.WarningT(`The vmwarefusion driver is deprecated and support for it will be removed in a future release.
 			Please consider switching to the new vmware unified driver, which is intended to replace the vmwarefusion driver.
 			See https://minikube.sigs.k8s.io/docs/reference/drivers/vmware/ for more information.
 			To disable this message, run [minikube config set ShowDriverDeprecationNotification false]`)
 	}
 	showHostInfo(cfg)
-	def := registry.Driver(cfg.VMDriver)
+	def := registry.Driver(cfg.Driver)
 	if def.Empty() {
-		return nil, fmt.Errorf("unsupported/missing driver: %s", cfg.VMDriver)
+		return nil, fmt.Errorf("unsupported/missing driver: %s", cfg.Driver)
 	}
 	dd, err := def.Config(cfg)
 	if err != nil {
@@ -123,7 +123,7 @@ func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error
 		return nil, errors.Wrap(err, "marshal")
 	}
 
-	h, err := api.NewHost(cfg.VMDriver, data)
+	h, err := api.NewHost(cfg.Driver, data)
 	if err != nil {
 		return nil, errors.Wrap(err, "new host")
 	}
@@ -133,11 +133,10 @@ func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error
 	h.HostOptions.EngineOptions = engineOptions(cfg)
 
 	cstart := time.Now()
-	glog.Infof("libmachine.API.Create for %q (driver=%q)", cfg.Name, cfg.VMDriver)
-	if err := api.Create(h); err != nil {
-		// Wait for all the logs to reach the client
-		time.Sleep(2 * time.Second)
-		return nil, errors.Wrap(err, "create")
+	glog.Infof("libmachine.API.Create for %q (driver=%q)", cfg.Name, cfg.Driver)
+	// Allow two minutes to create host before failing fast
+	if err := timedCreateHost(h, api, 2*time.Minute); err != nil {
+		return nil, errors.Wrap(err, "creating host")
 	}
 	glog.Infof("libmachine.API.Create for %q took %s", cfg.Name, time.Since(cstart))
 
@@ -151,6 +150,33 @@ func createHost(api libmachine.API, cfg config.MachineConfig) (*host.Host, error
 	return h, nil
 }
 
+func timedCreateHost(h *host.Host, api libmachine.API, t time.Duration) error {
+	timeout := make(chan bool, 1)
+	go func() {
+		time.Sleep(t)
+		timeout <- true
+	}()
+
+	createFinished := make(chan bool, 1)
+	var err error
+	go func() {
+		err = api.Create(h)
+		createFinished <- true
+	}()
+
+	select {
+	case <-createFinished:
+		if err != nil {
+			// Wait for all the logs to reach the client
+			time.Sleep(2 * time.Second)
+			return errors.Wrap(err, "create")
+		}
+		return nil
+	case <-timeout:
+		return fmt.Errorf("create host timed out in %f seconds", t.Seconds())
+	}
+}
+
 // postStart are functions shared between startHost and fixHost
 func postStartSetup(h *host.Host, mc config.MachineConfig) error {
 	glog.Infof("post-start starting for %q (driver=%q)", h.Name, h.DriverName)
@@ -174,10 +200,10 @@ func postStartSetup(h *host.Host, mc config.MachineConfig) error {
 		return errors.Wrapf(err, "sudo mkdir (%s)", h.DriverName)
 	}
 
-	if driver.BareMetal(mc.VMDriver) {
+	if driver.BareMetal(mc.Driver) {
 		showLocalOsRelease()
 	}
-	if driver.IsVM(mc.VMDriver) {
+	if driver.IsVM(mc.Driver) {
 		logRemoteOsRelease(h.Driver)
 	}
 	return syncLocalAssets(r)
@@ -223,3 +249,22 @@ func acquireMachinesLock(name string) (mutex.Releaser, error) {
 	}
 	return r, err
 }
+
+// showHostInfo shows host information
+func showHostInfo(cfg config.MachineConfig) {
+	if driver.BareMetal(cfg.Driver) {
+		info, err := getHostInfo()
+		if err == nil {
+			out.T(out.StartingNone, "Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", out.V{"number_of_cpus": info.CPUs, "memory_size": info.Memory, "disk_size": info.DiskSize})
+		}
+		return
+	}
+	if driver.IsKIC(cfg.Driver) {
+		info, err := getHostInfo() // TODO medyagh: get docker-machine info for non linux
+		if err == nil {
+			out.T(out.StartingVM, "Creating Kubernetes in {{.driver_name}} container with (CPUs={{.number_of_cpus}}), Memory={{.memory_size}}MB ({{.host_memory_size}}MB available) ...", out.V{"driver_name": cfg.Driver, "number_of_cpus": cfg.CPUs, "number_of_host_cpus": info.CPUs, "memory_size": cfg.Memory, "host_memory_size": info.Memory})
+		}
+		return
+	}
+	out.T(out.StartingVM, "Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...", out.V{"driver_name": cfg.Driver, "number_of_cpus": cfg.CPUs, "memory_size": cfg.Memory, "disk_size": cfg.DiskSize})
+}

pkg/minikube/cluster/status.go → pkg/minikube/machine/status.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"github.com/docker/machine/libmachine"

pkg/minikube/cluster/stop.go → pkg/minikube/machine/stop.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cluster
+package machine
 
 import (
 	"github.com/docker/machine/libmachine"
@@ -23,16 +23,13 @@ import (
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
-	"github.com/spf13/viper"
-	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/driver"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/util/retry"
 )
 
 // StopHost stops the host VM, saving state to disk.
-func StopHost(api libmachine.API) error {
-	machineName := viper.GetString(config.MachineProfile)
+func StopHost(api libmachine.API, machineName string) error {
 	host, err := api.Load(machineName)
 	if err != nil {
 		return errors.Wrapf(err, "load")

pkg/minikube/node/cache.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"os"
+	"runtime"
+
+	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	"golang.org/x/sync/errgroup"
+	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/image"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
+)
+
+// beginCacheRequiredImages caches images required for kubernetes version in the background
+func beginCacheRequiredImages(g *errgroup.Group, imageRepository string, k8sVersion string) {
+	if !viper.GetBool("cache-images") {
+		return
+	}
+
+	g.Go(func() error {
+		return machine.CacheImagesForBootstrapper(imageRepository, k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
+	})
+}
+
+func handleDownloadOnly(cacheGroup *errgroup.Group, k8sVersion string) {
+	// If --download-only, complete the remaining downloads and exit.
+	if !viper.GetBool("download-only") {
+		return
+	}
+	if err := doCacheBinaries(k8sVersion); err != nil {
+		exit.WithError("Failed to cache binaries", err)
+	}
+	if _, err := CacheKubectlBinary(k8sVersion); err != nil {
+		exit.WithError("Failed to cache kubectl", err)
+	}
+	waitCacheRequiredImages(cacheGroup)
+	if err := saveImagesToTarFromConfig(); err != nil {
+		exit.WithError("Failed to cache images to tar", err)
+	}
+	out.T(out.Check, "Download complete!")
+	os.Exit(0)
+
+}
+
+// CacheKubectlBinary caches the kubectl binary
+func CacheKubectlBinary(k8sVerison string) (string, error) {
+	binary := "kubectl"
+	if runtime.GOOS == "windows" {
+		binary = "kubectl.exe"
+	}
+
+	return machine.CacheBinary(binary, k8sVerison, runtime.GOOS, runtime.GOARCH)
+}
+
+// doCacheBinaries caches Kubernetes binaries in the foreground
+func doCacheBinaries(k8sVersion string) error {
+	return machine.CacheBinariesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
+}
+
+// waitCacheRequiredImages blocks until the required images are all cached.
+func waitCacheRequiredImages(g *errgroup.Group) {
+	if !viper.GetBool(cacheImages) {
+		return
+	}
+	if err := g.Wait(); err != nil {
+		glog.Errorln("Error caching images: ", err)
+	}
+}
+
+// saveImagesToTarFromConfig saves images to tar in cache which specified in config file.
+// currently only used by download-only option
+func saveImagesToTarFromConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return image.SaveToDir(images, constants.ImageCacheDir)
+}
+
+func imagesInConfigFile() ([]string, error) {
+	configFile, err := config.ReadConfig(localpath.ConfigFile)
+	if err != nil {
+		return nil, err
+	}
+	if values, ok := configFile[cacheImageConfigKey]; ok {
+		var images []string
+		for key := range values.(map[string]interface{}) {
+			images = append(images, key)
+		}
+		return images, nil
+	}
+	return []string{}, nil
+}
+
+// CacheAndLoadImagesInConfig loads the images currently in the config file
+// called by 'start' and 'cache reload' commands.
+func CacheAndLoadImagesInConfig() error {
+	images, err := imagesInConfigFile()
+	if err != nil {
+		return err
+	}
+	if len(images) == 0 {
+		return nil
+	}
+	return machine.CacheAndLoadImages(images)
+}

pkg/minikube/node/config.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
+	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
+	"k8s.io/minikube/pkg/minikube/bootstrapper"
+	"k8s.io/minikube/pkg/minikube/cluster"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/constants"
+	"k8s.io/minikube/pkg/minikube/cruntime"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/util/lock"
+)
+
+var (
+	DockerEnv    []string
+	DockerOpt    []string
+	ExtraOptions config.ExtraOptionSlice
+	AddonList    []string
+)
+
+// configureRuntimes does what needs to happen to get a runtime going.
+func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config.KubernetesConfig) cruntime.Manager {
+	config := cruntime.Config{Type: viper.GetString(containerRuntime), Runner: runner, ImageRepository: k8s.ImageRepository, KubernetesVersion: k8s.KubernetesVersion}
+	cr, err := cruntime.New(config)
+	if err != nil {
+		exit.WithError("Failed runtime", err)
+	}
+
+	disableOthers := true
+	if driver.BareMetal(drvName) {
+		disableOthers = false
+	}
+	err = cr.Enable(disableOthers)
+	if err != nil {
+		exit.WithError("Failed to enable container runtime", err)
+	}
+
+	return cr
+}
+
+func showVersionInfo(k8sVersion string, cr cruntime.Manager) {
+	version, _ := cr.Version()
+	out.T(cr.Style(), "Preparing Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}} ...", out.V{"k8sVersion": k8sVersion, "runtime": cr.Name(), "runtimeVersion": version})
+	for _, v := range DockerOpt {
+		out.T(out.Option, "opt {{.docker_option}}", out.V{"docker_option": v})
+	}
+	for _, v := range DockerEnv {
+		out.T(out.Option, "env {{.docker_env}}", out.V{"docker_env": v})
+	}
+}
+
+// setupKubeAdm adds any requested files into the VM before Kubernetes is started
+func setupKubeAdm(mAPI libmachine.API, cfg config.MachineConfig, node config.Node) bootstrapper.Bootstrapper {
+	bs, err := cluster.Bootstrapper(mAPI, viper.GetString(cmdcfg.Bootstrapper))
+	if err != nil {
+		exit.WithError("Failed to get bootstrapper", err)
+	}
+	for _, eo := range ExtraOptions {
+		out.T(out.Option, "{{.extra_option_component_name}}.{{.key}}={{.value}}", out.V{"extra_option_component_name": eo.Component, "key": eo.Key, "value": eo.Value})
+	}
+	// Loads cached images, generates config files, download binaries
+	if err := bs.UpdateCluster(cfg); err != nil {
+		exit.WithError("Failed to update cluster", err)
+	}
+	if err := bs.SetupCerts(cfg.KubernetesConfig, node); err != nil {
+		exit.WithError("Failed to setup certs", err)
+	}
+	return bs
+}
+
+func setupKubeconfig(h *host.Host, c *config.MachineConfig, n *config.Node, clusterName string) (*kubeconfig.Settings, error) {
+	addr, err := h.Driver.GetURL()
+	if err != nil {
+		exit.WithError("Failed to get driver URL", err)
+	}
+	if !driver.IsKIC(h.DriverName) {
+		addr = strings.Replace(addr, "tcp://", "https://", -1)
+		addr = strings.Replace(addr, ":2376", ":"+strconv.Itoa(n.Port), -1)
+	}
+
+	if c.KubernetesConfig.APIServerName != constants.APIServerName {
+		addr = strings.Replace(addr, n.IP, c.KubernetesConfig.APIServerName, -1)
+	}
+	kcs := &kubeconfig.Settings{
+		ClusterName:          clusterName,
+		ClusterServerAddress: addr,
+		ClientCertificate:    localpath.MakeMiniPath("client.crt"),
+		ClientKey:            localpath.MakeMiniPath("client.key"),
+		CertificateAuthority: localpath.MakeMiniPath("ca.crt"),
+		KeepContext:          viper.GetBool(keepContext),
+		EmbedCerts:           viper.GetBool(embedCerts),
+	}
+
+	kcs.SetPath(kubeconfig.PathFromEnv())
+	if err := kubeconfig.Update(kcs); err != nil {
+		return kcs, err
+	}
+	return kcs, nil
+}
+
+// configureMounts configures any requested filesystem mounts
+func configureMounts() {
+	if !viper.GetBool(createMount) {
+		return
+	}
+
+	out.T(out.Mounting, "Creating mount {{.name}} ...", out.V{"name": viper.GetString(mountString)})
+	path := os.Args[0]
+	mountDebugVal := 0
+	if glog.V(8) {
+		mountDebugVal = 1
+	}
+	mountCmd := exec.Command(path, "mount", fmt.Sprintf("--v=%d", mountDebugVal), viper.GetString(mountString))
+	mountCmd.Env = append(os.Environ(), constants.IsMinikubeChildProcess+"=true")
+	if glog.V(8) {
+		mountCmd.Stdout = os.Stdout
+		mountCmd.Stderr = os.Stderr
+	}
+	if err := mountCmd.Start(); err != nil {
+		exit.WithError("Error starting mount", err)
+	}
+	if err := lock.WriteFile(filepath.Join(localpath.MiniPath(), constants.MountProcessFileName), []byte(strconv.Itoa(mountCmd.Process.Pid)), 0644); err != nil {
+		exit.WithError("Error writing mount pid", err)
+	}
+}

pkg/minikube/node/machine.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+
+	"github.com/docker/machine/libmachine"
+	"github.com/docker/machine/libmachine/host"
+	"github.com/golang/glog"
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/bootstrapper/images"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/minikube/proxy"
+	"k8s.io/minikube/pkg/util/retry"
+)
+
+func startMachine(cfg *config.MachineConfig, node *config.Node) (runner command.Runner, preExists bool, machineAPI libmachine.API, host *host.Host) {
+	m, err := machine.NewAPIClient()
+	if err != nil {
+		exit.WithError("Failed to get machine client", err)
+	}
+	host, preExists = startHost(m, *cfg)
+	runner, err = machine.CommandRunner(host)
+	if err != nil {
+		exit.WithError("Failed to get command runner", err)
+	}
+
+	ip := validateNetwork(host, runner)
+
+	// Bypass proxy for minikube's vm host ip
+	err = proxy.ExcludeIP(ip)
+	if err != nil {
+		out.ErrT(out.FailureType, "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.", out.V{"ip": ip})
+	}
+	// Save IP to configuration file for subsequent use
+	node.IP = ip
+
+	if err := Save(cfg, node); err != nil {
+		exit.WithError("Failed to save config", err)
+	}
+
+	return runner, preExists, m, host
+}
+
+// startHost starts a new minikube host using a VM or None
+func startHost(api libmachine.API, mc config.MachineConfig) (*host.Host, bool) {
+	exists, err := api.Exists(mc.Name)
+	if err != nil {
+		exit.WithError("Failed to check if machine exists", err)
+	}
+
+	host, err := machine.StartHost(api, mc)
+	if err != nil {
+		exit.WithError("Unable to start VM. Please investigate and run 'minikube delete' if possible", err)
+	}
+	return host, exists
+}
+
+// validateNetwork tries to catch network problems as soon as possible
+func validateNetwork(h *host.Host, r command.Runner) string {
+	ip, err := h.Driver.GetIP()
+	if err != nil {
+		exit.WithError("Unable to get VM IP address", err)
+	}
+
+	optSeen := false
+	warnedOnce := false
+	for _, k := range proxy.EnvVars {
+		if v := os.Getenv(k); v != "" {
+			if !optSeen {
+				out.T(out.Internet, "Found network options:")
+				optSeen = true
+			}
+			out.T(out.Option, "{{.key}}={{.value}}", out.V{"key": k, "value": v})
+			ipExcluded := proxy.IsIPExcluded(ip) // Skip warning if minikube ip is already in NO_PROXY
+			k = strings.ToUpper(k)               // for http_proxy & https_proxy
+			if (k == "HTTP_PROXY" || k == "HTTPS_PROXY") && !ipExcluded && !warnedOnce {
+				out.WarningT("You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details", out.V{"ip_address": ip, "documentation_url": "https://minikube.sigs.k8s.io/docs/reference/networking/proxy/"})
+				warnedOnce = true
+			}
+		}
+	}
+
+	if !driver.BareMetal(h.Driver.DriverName()) && !driver.IsKIC(h.Driver.DriverName()) {
+		trySSH(h, ip)
+	}
+
+	tryLookup(r)
+	tryRegistry(r)
+	return ip
+}
+
+func trySSH(h *host.Host, ip string) {
+	if viper.GetBool("force") {
+		return
+	}
+
+	sshAddr := net.JoinHostPort(ip, "22")
+
+	dial := func() (err error) {
+		d := net.Dialer{Timeout: 3 * time.Second}
+		conn, err := d.Dial("tcp", sshAddr)
+		if err != nil {
+			out.WarningT("Unable to verify SSH connectivity: {{.error}}. Will retry...", out.V{"error": err})
+			return err
+		}
+		_ = conn.Close()
+		return nil
+	}
+
+	if err := retry.Expo(dial, time.Second, 13*time.Second); err != nil {
+		exit.WithCodeT(exit.IO, `minikube is unable to connect to the VM: {{.error}}
+
+	This is likely due to one of two reasons:
+
+	- VPN or firewall interference
+	- {{.hypervisor}} network configuration issue
+
+	Suggested workarounds:
+
+	- Disable your local VPN or firewall software
+	- Configure your local VPN or firewall to allow access to {{.ip}}
+	- Restart or reinstall {{.hypervisor}}
+	- Use an alternative --vm-driver
+	- Use --force to override this connectivity check
+	`, out.V{"error": err, "hypervisor": h.Driver.DriverName(), "ip": ip})
+	}
+}
+
+func tryLookup(r command.Runner) {
+	// DNS check
+	if rr, err := r.RunCmd(exec.Command("nslookup", "kubernetes.io", "-type=ns")); err != nil {
+		glog.Infof("%s failed: %v which might be okay will retry nslookup without query type", rr.Args, err)
+		// will try with without query type for ISOs with different busybox versions.
+		if _, err = r.RunCmd(exec.Command("nslookup", "kubernetes.io")); err != nil {
+			glog.Warningf("nslookup failed: %v", err)
+			out.WarningT("Node may be unable to resolve external DNS records")
+		}
+	}
+}
+func tryRegistry(r command.Runner) {
+	// Try an HTTPS connection to the image repository
+	proxy := os.Getenv("HTTPS_PROXY")
+	opts := []string{"-sS"}
+	if proxy != "" && !strings.HasPrefix(proxy, "localhost") && !strings.HasPrefix(proxy, "127.0") {
+		opts = append([]string{"-x", proxy}, opts...)
+	}
+
+	repo := viper.GetString(imageRepository)
+	if repo == "" {
+		repo = images.DefaultKubernetesRepo
+	}
+
+	opts = append(opts, fmt.Sprintf("https://%s/", repo))
+	if rr, err := r.RunCmd(exec.Command("curl", opts...)); err != nil {
+		glog.Warningf("%s failed: %v", rr.Args, err)
+		out.WarningT("VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository", out.V{"repository": repo})
+	}
+}

pkg/minikube/node/node.go

+/*
+Copyright 2019 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"errors"
+
+	"github.com/spf13/viper"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/machine"
+)
+
+const (
+	imageRepository     = "image-repository"
+	cacheImages         = "cache-images"
+	waitUntilHealthy    = "wait"
+	cacheImageConfigKey = "cache"
+	containerRuntime    = "container-runtime"
+	embedCerts          = "embed-certs"
+	keepContext         = "keep-context"
+	mountString         = "mount-string"
+	createMount         = "mount"
+	waitTimeout         = "wait-timeout"
+)
+
+// Add adds a new node config to an existing cluster.
+func Add(cc *config.MachineConfig, name string, controlPlane bool, worker bool, k8sVersion string, profileName string) (*config.Node, error) {
+	n := config.Node{
+		Name:   name,
+		Worker: true,
+	}
+
+	if controlPlane {
+		n.ControlPlane = true
+	}
+
+	if worker {
+		n.Worker = true
+	}
+
+	if k8sVersion != "" {
+		n.KubernetesVersion = k8sVersion
+	} else {
+		n.KubernetesVersion = cc.KubernetesConfig.KubernetesVersion
+	}
+
+	cc.Nodes = append(cc.Nodes, n)
+	err := config.SaveProfile(profileName, cc)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = Start(*cc, n, false, nil)
+	return &n, err
+}
+
+// Delete stops and deletes the given node from the given cluster
+func Delete(cc config.MachineConfig, name string) error {
+	_, index, err := Retrieve(&cc, name)
+	if err != nil {
+		return err
+	}
+
+	/*err = Stop(cc, nd)
+	if err != nil {
+		glog.Warningf("Failed to stop node %s. Will still try to delete.", name)
+	}*/
+
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		return err
+	}
+
+	err = machine.DeleteHost(api, name)
+	if err != nil {
+		return err
+	}
+
+	cc.Nodes = append(cc.Nodes[:index], cc.Nodes[index+1:]...)
+	return config.SaveProfile(viper.GetString(config.MachineProfile), &cc)
+}
+
+// Retrieve finds the node by name in the given cluster
+func Retrieve(cc *config.MachineConfig, name string) (*config.Node, int, error) {
+	for i, n := range cc.Nodes {
+		if n.Name == name {
+			return &n, i, nil
+		}
+	}
+
+	return nil, -1, errors.New("Could not find node " + name)
+}
+
+// Save saves a node to a cluster
+func Save(cfg *config.MachineConfig, node *config.Node) error {
+	update := false
+	for i, n := range cfg.Nodes {
+		if n.Name == node.Name {
+			cfg.Nodes[i] = *node
+			update = true
+			break
+		}
+	}
+
+	if !update {
+		cfg.Nodes = append(cfg.Nodes, *node)
+	}
+	return config.SaveProfile(viper.GetString(config.MachineProfile), cfg)
+}

pkg/minikube/node/start.go

+/*
+Copyright 2020 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package node
+
+import (
+	"os"
+
+	"github.com/spf13/viper"
+	"golang.org/x/sync/errgroup"
+	"k8s.io/minikube/pkg/addons"
+	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/driver"
+	"k8s.io/minikube/pkg/minikube/exit"
+	"k8s.io/minikube/pkg/minikube/kubeconfig"
+	"k8s.io/minikube/pkg/minikube/localpath"
+	"k8s.io/minikube/pkg/minikube/logs"
+	"k8s.io/minikube/pkg/minikube/out"
+	"k8s.io/minikube/pkg/util"
+)
+
+// Start spins up a guest and starts the kubernetes node.
+func Start(mc config.MachineConfig, n config.Node, primary bool, existingAddons map[string]bool) (*kubeconfig.Settings, error) {
+	// Now that the ISO is downloaded, pull images in the background while the VM boots.
+	var cacheGroup errgroup.Group
+	beginCacheRequiredImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, n.KubernetesVersion)
+
+	// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
+	// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
+	if err := config.SaveProfile(viper.GetString(config.MachineProfile), &mc); err != nil {
+		exit.WithError("Failed to save config", err)
+	}
+
+	k8sVersion := mc.KubernetesConfig.KubernetesVersion
+	driverName := mc.Driver
+	// exits here in case of --download-only option.
+	handleDownloadOnly(&cacheGroup, k8sVersion)
+	mRunner, preExists, machineAPI, host := startMachine(&mc, &n)
+	defer machineAPI.Close()
+	// configure the runtime (docker, containerd, crio)
+	cr := configureRuntimes(mRunner, driverName, mc.KubernetesConfig)
+	showVersionInfo(k8sVersion, cr)
+	waitCacheRequiredImages(&cacheGroup)
+
+	//TODO(sharifelgamal): Part out the cluster-wide operations, perhaps using the "primary" param
+
+	// Must be written before bootstrap, otherwise health checks may flake due to stale IP
+	kubeconfig, err := setupKubeconfig(host, &mc, &n, mc.Name)
+	if err != nil {
+		exit.WithError("Failed to setup kubeconfig", err)
+	}
+
+	// setup kubeadm (must come after setupKubeconfig)
+	bs := setupKubeAdm(machineAPI, mc, n)
+
+	// pull images or restart cluster
+	out.T(out.Launch, "Launching Kubernetes ... ")
+	if err := bs.StartCluster(mc); err != nil {
+		exit.WithLogEntries("Error starting cluster", err, logs.FindProblems(cr, bs, mRunner))
+	}
+	configureMounts()
+
+	// enable addons, both old and new!
+	ea := map[string]bool{}
+	if existingAddons != nil {
+		ea = existingAddons
+	}
+	addons.Start(viper.GetString(config.MachineProfile), ea, AddonList)
+
+	if err = CacheAndLoadImagesInConfig(); err != nil {
+		out.T(out.FailureType, "Unable to load cached images from config file.")
+	}
+
+	// special ops for none , like change minikube directory.
+	if driverName == driver.None {
+		prepareNone()
+	}
+
+	// Skip pre-existing, because we already waited for health
+	if viper.GetBool(waitUntilHealthy) && !preExists {
+		if err := bs.WaitForCluster(mc, viper.GetDuration(waitTimeout)); err != nil {
+			exit.WithError("Wait failed", err)
+		}
+	}
+
+	return kubeconfig, nil
+}
+
+// prepareNone prepares the user and host for the joy of the "none" driver
+func prepareNone() {
+	out.T(out.StartingNone, "Configuring local host environment ...")
+	if viper.GetBool(config.WantNoneDriverWarning) {
+		out.T(out.Empty, "")
+		out.WarningT("The 'none' driver provides limited isolation and may reduce system security and reliability.")
+		out.WarningT("For more information, see:")
+		out.T(out.URL, "https://minikube.sigs.k8s.io/docs/reference/drivers/none/")
+		out.T(out.Empty, "")
+	}
+
+	if os.Getenv("CHANGE_MINIKUBE_NONE_USER") == "" {
+		home := os.Getenv("HOME")
+		out.WarningT("kubectl and minikube configuration will be stored in {{.home_folder}}", out.V{"home_folder": home})
+		out.WarningT("To use kubectl or minikube commands as your own user, you may need to relocate them. For example, to overwrite your own settings, run:")
+
+		out.T(out.Empty, "")
+		out.T(out.Command, "sudo mv {{.home_folder}}/.kube {{.home_folder}}/.minikube $HOME", out.V{"home_folder": home})
+		out.T(out.Command, "sudo chown -R $USER $HOME/.kube $HOME/.minikube")
+		out.T(out.Empty, "")
+
+		out.T(out.Tip, "This can also be done automatically by setting the env var CHANGE_MINIKUBE_NONE_USER=true")
+	}
+
+	if err := util.MaybeChownDirRecursiveToMinikubeUser(localpath.MiniPath()); err != nil {
+		exit.WithCodeT(exit.Permissions, "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}", out.V{"minikube_dir_path": localpath.MiniPath(), "error": err})
+	}
+}

pkg/minikube/service/service.go

@@ -38,8 +38,8 @@ import (
 	typed_core "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/minikube/out"
 	"k8s.io/minikube/pkg/minikube/proxy"
 	"k8s.io/minikube/pkg/util/retry"
@@ -119,7 +119,7 @@ type URLs []SvcURL
 // GetServiceURLs returns a SvcURL object for every service in a particular namespace.
 // Accepts a template for formatting
 func GetServiceURLs(api libmachine.API, namespace string, t *template.Template) (URLs, error) {
-	host, err := cluster.CheckIfHostExistsAndLoad(api, viper.GetString(config.MachineProfile))
+	host, err := machine.CheckIfHostExistsAndLoad(api, viper.GetString(config.MachineProfile))
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +155,7 @@ func GetServiceURLs(api libmachine.API, namespace string, t *template.Template)
 
 // GetServiceURLsForService returns a SvcUrl object for a service in a namespace. Supports optional formatting.
 func GetServiceURLsForService(api libmachine.API, namespace, service string, t *template.Template) (SvcURL, error) {
-	host, err := cluster.CheckIfHostExistsAndLoad(api, viper.GetString(config.MachineProfile))
+	host, err := machine.CheckIfHostExistsAndLoad(api, viper.GetString(config.MachineProfile))
 	if err != nil {
 		return SvcURL{}, errors.Wrap(err, "Error checking if api exist and loading it")
 	}

pkg/minikube/tunnel/cluster_inspector.go

@@ -24,8 +24,8 @@ import (
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/pkg/errors"
-	"k8s.io/minikube/pkg/minikube/cluster"
 	"k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/machine"
 	"k8s.io/minikube/pkg/util"
 )
 
@@ -37,7 +37,7 @@ type clusterInspector struct {
 
 func (m *clusterInspector) getStateAndHost() (HostState, *host.Host, error) {
 
-	h, err := cluster.CheckIfHostExistsAndLoad(m.machineAPI, m.machineName)
+	h, err := machine.CheckIfHostExistsAndLoad(m.machineAPI, m.machineName)
 
 	if err != nil {
 		err = errors.Wrapf(err, "error loading docker-machine host for: %s", m.machineName)

test/integration/aaa_download_only_test.go

@@ -126,7 +126,7 @@ func TestDownloadOnly(t *testing.T) {
 			got := ""
 			for _, p := range ps["valid"] {
 				if p.Name == profile {
-					got = p.Config.VMDriver
+					got = p.Config.Driver
 				}
 			}
 

test/integration/functional_test.go

@@ -70,11 +70,12 @@ func TestFunctional(t *testing.T) {
 			name      string
 			validator validateFunc
 		}{
-			{"CopySyncFile", setupFileSync},            // Set file for the file sync test case
-			{"StartWithProxy", validateStartWithProxy}, // Set everything else up for success
-			{"KubeContext", validateKubeContext},       // Racy: must come immediately after "minikube start"
-			{"KubectlGetPods", validateKubectlGetPods}, // Make sure apiserver is up
-			{"CacheCmd", validateCacheCmd},             // Caches images needed for subsequent tests because of proxy
+			{"CopySyncFile", setupFileSync},                 // Set file for the file sync test case
+			{"StartWithProxy", validateStartWithProxy},      // Set everything else up for success
+			{"KubeContext", validateKubeContext},            // Racy: must come immediately after "minikube start"
+			{"KubectlGetPods", validateKubectlGetPods},      // Make sure apiserver is up
+			{"CacheCmd", validateCacheCmd},                  // Caches images needed for subsequent tests because of proxy
+			{"MinikubeKubectlCmd", validateMinikubeKubectl}, // Make sure `minikube kubectl` works
 		}
 		for _, tc := range tests {
 			tc := tc
@@ -206,6 +207,15 @@ func validateKubectlGetPods(ctx context.Context, t *testing.T, profile string) {
 	}
 }
 
+// validateMinikubeKubectl validates that the `minikube kubectl` command returns content
+func validateMinikubeKubectl(ctx context.Context, t *testing.T, profile string) {
+	kubectlArgs := []string{"kubectl", "--", "get", "pods"}
+	rr, err := Run(t, exec.CommandContext(ctx, Target(), kubectlArgs...))
+	if err != nil {
+		t.Fatalf("%s failed: %v", rr.Args, err)
+	}
+}
+
 // validateComponentHealth asserts that all Kubernetes components are healthy
 func validateComponentHealth(ctx context.Context, t *testing.T, profile string) {
 	rr, err := Run(t, exec.CommandContext(ctx, "kubectl", "--context", profile, "get", "cs", "-o=json"))

test/integration/version_upgrade_test.go

@@ -37,9 +37,9 @@ import (
 	pkgutil "k8s.io/minikube/pkg/util"
 )
 
-// TestVersionUpgrade downloads latest version of minikube and runs with
-// the odlest supported k8s version and then runs the current head minikube
-// and it tries to upgrade from the older supported k8s to news supported k8s
+// TestVersionUpgrade downloads the latest version of minikube and runs with
+// the oldest supported k8s version and then runs the current head minikube
+// and tries to upgrade from the oldest supported k8s to newest supported k8s
 func TestVersionUpgrade(t *testing.T) {
 	MaybeParallel(t)
 	profile := UniqueProfileName("vupgrade")

translations/de.json

@@ -7,8 +7,10 @@
 	"\"{{.profile_name}}\" stopped.": "",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
+	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
+	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -24,8 +26,11 @@
 	"Add an image to local cache.": "",
 	"Add machine IP to NO_PROXY environment variable": "",
 	"Add or delete an image from the local cache.": "",
+	"Adding node {{.name}} to cluster {{.profile}}": "",
 	"Additional help topics": "",
 	"Additional mount options, such as cache=fscache": "",
+	"Adds a node to the given cluster config, and starts it.": "",
+	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
@@ -35,8 +40,8 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --vm-driver to switch to it.": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver (alternates: {{.alternates}})": "",
+	"Automatically selected the {{.driver}} driver": "",
+	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "",
 	"Basic Commands:": "",
 	"Block until the apiserver is servicing API requests": "",
@@ -70,6 +75,7 @@
 	"Deletes a local kubernetes cluster": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "Damit wird ein lokaler Kubernetes-Cluster gelöscht. Mit diesem Befehl wird die VM entfernt und alle zugehörigen Dateien gelöscht.",
+	"Deletes a node from a cluster.": "",
 	"Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "{{.profile_name}}\" in {{.driver_name}} wird gelöscht...",
 	"Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)": "Deaktivieren Sie die Überprüfung der Verfügbarkeit der Hardwarevirtualisierung vor dem Starten der VM (nur Virtualbox-Treiber)",
 	"Disable dynamic memory in your VM manager, or pass in a larger --memory value": "",
@@ -92,6 +98,7 @@
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
 	"Downloading {{.name}} {{.version}}": "",
+	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
 	"ERROR creating `registry-creds-gcr` secret: {{.error}}": "",
@@ -112,12 +119,15 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Umgebungsvariablen, die an den Docker-Daemon übergeben werden. (Format: Schlüssel = Wert)",
+	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "Fehler beim Prüfen der Treiberversion: {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
-	"Error executing template": "",
+	"Error detecting shell": "",
 	"Error executing view template": "",
 	"Error finding port for mount": "",
+	"Error generating set output": "",
+	"Error generating unset output": "",
 	"Error getting IP": "",
 	"Error getting client": "",
 	"Error getting client: {{.error}}": "",
@@ -125,11 +135,13 @@
 	"Error getting cluster bootstrapper": "",
 	"Error getting config": "",
 	"Error getting host": "",
+	"Error getting host IP": "",
 	"Error getting host status": "",
 	"Error getting machine logs": "",
 	"Error getting profiles to delete": "",
 	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
+	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
 	"Error host driver ip status": "",
 	"Error killing mount process": "",
@@ -138,13 +150,12 @@
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "Fehler beim Laden des Profils {{.name}}: {{.error}}",
 	"Error opening service": "",
+	"Error parsing Driver version: {{.error}}": "Fehler beim Parsen der Driver-Version: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "Fehler beim Parsen der minikube-Version: {{.error}}",
-	"Error parsing vmDriver version: {{.error}}": "Fehler beim Parsen der vmDriver-Version: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error setting shell variables": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error unsetting shell variables": "",
+	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
@@ -153,6 +164,7 @@
 	"Examples": "",
 	"Exiting": "Wird beendet",
 	"Exiting.": "",
+	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
 	"Failed runtime": "",
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
@@ -212,11 +224,14 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
 	"If the above advice does not help, please let us know:": "",
 	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "Wenn true, speichern Sie Docker-Images für den aktuellen Bootstrapper zwischen und laden Sie sie auf den Computer. Immer falsch mit --vm-driver = none.",
 	"If true, only download and cache files for later use - don't install or start anything.": "Wenn true, laden Sie nur Dateien für die spätere Verwendung herunter und speichern Sie sie – installieren oder starten Sie nichts.",
+	"If true, the added node will be marked for work. Defaults to true.": "",
+	"If true, the node added will also be a control plane in addition to a worker.": "",
 	"If using the none driver, ensure that systemctl is installed": "",
 	"If you are running minikube within a VM, consider using --vm-driver=none:": "",
 	"Images Commands:": "",
@@ -259,6 +274,7 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node may be unable to resolve external DNS records": "",
+	"Node operations": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "Keines der bekannten Repositories an Ihrem Standort ist zugänglich. {{.image_repository_name}} wird als Fallback verwendet.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "Keines der bekannten Repositories ist zugänglich. Erwägen Sie, ein alternatives Image-Repository mit der Kennzeichnung --image-repository anzugeben",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
@@ -272,6 +288,7 @@
 	"Opening service {{.namespace_name}}/{{.service_name}} in default browser...": "",
 	"Opening {{.url}} in your default browser...": "",
 	"Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list": "",
+	"Operations on nodes": "",
 	"Options:      {{.options}}": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)\n\n\tThis depends on the bash-completion binary.  Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion  # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion  # for zsh users\n\t\t$ source ~/.minikube-completion\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash-completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2": "",
@@ -296,7 +313,6 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Geben Sie die VM-UUID an, um die MAC-Adresse wiederherzustellen (nur Hyperkit-Treiber)",
-	"Pulling images ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
@@ -326,8 +342,6 @@
 	"Run the minikube command as an Administrator": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from existing profile (alternates: {{.alternates}})": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -335,6 +349,8 @@
 	"Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'.": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'.": "",
 	"Setting profile failed": "",
 	"Show a list of global command-line options (applies to all commands).": "",
 	"Show only log entries which point to known problems": "",
@@ -352,9 +368,13 @@
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
+	"Starting node": "",
 	"Starts a local kubernetes cluster": "Startet einen lokalen Kubernetes-Cluster",
+	"Starts a node.": "",
+	"Starts an existing stopped node in a cluster.": "",
 	"Stopping \"{{.profile_name}}\" in {{.driver_name}} ...": "",
 	"Stops a local kubernetes cluster running in Virtualbox. This command stops the VM\nitself, leaving all files intact. The cluster can be started again with the \"start\" command.": "",
+	"Stops a node in a cluster.": "",
 	"Stops a running local kubernetes cluster": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
@@ -392,8 +412,7 @@
 	"The container runtime to be used (docker, crio, containerd).": "",
 	"The cri socket path to be used": "Der zu verwendende Cri-Socket-Pfad",
 	"The cri socket path to be used.": "",
-	"The docker host is currently not running": "",
-	"The docker service is currently not active": "",
+	"The docker service within '{{.profile}}' is not active": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "Der Treiber '{{.driver}}' wird auf {{.os}} nicht unterstützt",
 	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
 	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
@@ -405,9 +424,12 @@
 	"The minikube VM is offline. Please run 'minikube start' to start it again.": "",
 	"The name of the network plugin": "Der Name des Netzwerk-Plugins",
 	"The name of the network plugin.": "",
+	"The name of the node to add.": "",
+	"The name of the node to delete": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
+	"The podman service within '{{.profile}}' is not active": "",
 	"The service namespace": "",
 	"The services namespace": "",
 	"The time interval for each check that wait performs in seconds": "",
@@ -471,6 +493,7 @@
 	"Usage: minikube completion SHELL": "",
 	"Usage: minikube delete": "",
 	"Usage: minikube delete --all --purge": "",
+	"Usage: minikube node [add|start|stop|delete]": "",
 	"Use \"{{.CommandPath}} [command] --help\" for more information about a command.": "",
 	"Use 'kubect get po -A' to find the correct and namespace name": "",
 	"Use -A to specify all namespaces": "",
@@ -482,6 +505,8 @@
 	"Using image repository {{.name}}": "Verwenden des Image-Repositorys {{.name}}",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
 	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
+	"Using the {{.driver}} driver based on existing profile": "",
+	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "VM-Treiber ist einer von: %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
@@ -500,6 +525,7 @@
 	"Wait until Kubernetes core services are healthy before exiting": "Warten Sie vor dem Beenden, bis die Kerndienste von Kubernetes fehlerfrei arbeiten",
 	"Waiting for cluster to come online ...": "",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Als Root für die NFS-Freigaben wird standardmäßig /nfsshares verwendet (nur Hyperkit-Treiber)",
+	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Sie scheinen einen Proxy zu verwenden, aber Ihre NO_PROXY-Umgebung enthält keine minikube-IP ({{.ip_address}}). Weitere Informationen finden Sie unter {{.documentation_url}}",
 	"You can delete them using the following command(s):": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Möglicherweise müssen Sie die VM \"{{.name}}\" manuell von Ihrem Hypervisor entfernen",
@@ -518,6 +544,7 @@
 	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set vm-driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
+	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
@@ -533,18 +560,21 @@
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Konfiguration von Kubectl und minikube wird in {{.home_folder}} gespeichert",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
+	"loading config": "",
 	"logdir set failed": "",
+	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\nThis is likely due to one of two reasons:\n\n- VPN or firewall interference\n- {{.hypervisor}} network configuration issue\n\nSuggested workarounds:\n\n- Disable your local VPN or firewall software\n- Configure your local VPN or firewall to allow access to {{.ip}}\n- Restart or reinstall {{.hypervisor}}\n- Use an alternative --vm-driver": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
 	"mount failed": "",
+	"name is required": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
@@ -552,6 +582,7 @@
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
+	"retrieving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
 	"stat failed": "",
 	"status json failure": "",
@@ -585,6 +616,8 @@
 	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
 	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
+	"{{.name}} is already running": "",
+	"{{.name}} is already stopped": "",
 	"{{.name}} was successfully configured": "",
 	"{{.name}}\" profile does not exist": "Profil \"{{.name}}\" existiert nicht",
 	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",

translations/es.json

@@ -7,8 +7,10 @@
 	"\"{{.profile_name}}\" stopped.": "",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
+	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
+	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -24,8 +26,11 @@
 	"Add an image to local cache.": "",
 	"Add machine IP to NO_PROXY environment variable": "",
 	"Add or delete an image from the local cache.": "",
+	"Adding node {{.name}} to cluster {{.profile}}": "",
 	"Additional help topics": "",
 	"Additional mount options, such as cache=fscache": "",
+	"Adds a node to the given cluster config, and starts it.": "",
+	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
@@ -35,8 +40,8 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --vm-driver to switch to it.": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver (alternates: {{.alternates}})": "",
+	"Automatically selected the {{.driver}} driver": "",
+	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "",
 	"Basic Commands:": "",
 	"Block until the apiserver is servicing API requests": "",
@@ -70,6 +75,7 @@
 	"Deletes a local kubernetes cluster": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "Elimina un clúster local de Kubernetes. Este comando borra la VM y todos los archivos asociados.",
+	"Deletes a node from a cluster.": "",
 	"Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "Eliminando \"{{.profile_name}}\" en {{.driver_name}}...",
 	"Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)": "Permite inhabilitar la comprobación de disponibilidad de la virtualización de hardware antes de iniciar la VM (solo con el controlador de Virtualbox)",
 	"Disable dynamic memory in your VM manager, or pass in a larger --memory value": "",
@@ -92,6 +98,7 @@
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
 	"Downloading {{.name}} {{.version}}": "",
+	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
 	"ERROR creating `registry-creds-gcr` secret: {{.error}}": "",
@@ -112,12 +119,15 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Variables de entorno que se transferirán al daemon de Docker. Formato: clave=valor",
+	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "No se ha podido comprobar la versión del controlador: {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
-	"Error executing template": "",
+	"Error detecting shell": "",
 	"Error executing view template": "",
 	"Error finding port for mount": "",
+	"Error generating set output": "",
+	"Error generating unset output": "",
 	"Error getting IP": "",
 	"Error getting client": "",
 	"Error getting client: {{.error}}": "",
@@ -125,11 +135,13 @@
 	"Error getting cluster bootstrapper": "",
 	"Error getting config": "",
 	"Error getting host": "",
+	"Error getting host IP": "",
 	"Error getting host status": "",
 	"Error getting machine logs": "",
 	"Error getting profiles to delete": "",
 	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
+	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
 	"Error host driver ip status": "",
 	"Error killing mount process": "",
@@ -138,13 +150,12 @@
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "No se ha podido cargar el perfil {{.name}}: {{.error}}",
 	"Error opening service": "",
+	"Error parsing Driver version: {{.error}}": "No se ha podido analizar la versión de Driver: {{.error}}",
 	"Error parsing minikube version: {{.error}}": "No se ha podido analizar la versión de minikube: {{.error}}",
-	"Error parsing vmDriver version: {{.error}}": "No se ha podido analizar la versión de vmDriver: {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error setting shell variables": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error unsetting shell variables": "",
+	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
@@ -153,6 +164,7 @@
 	"Examples": "",
 	"Exiting": "Saliendo",
 	"Exiting.": "",
+	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
 	"Failed runtime": "",
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
@@ -212,11 +224,14 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
 	"If the above advice does not help, please let us know:": "",
 	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "Si el valor es \"true\", las imágenes de Docker del programa previo actual se almacenan en caché y se cargan en la máquina. Siempre es \"false\" si se especifica --vm-driver=none.",
 	"If true, only download and cache files for later use - don't install or start anything.": "Si el valor es \"true\", los archivos solo se descargan y almacenan en caché (no se instala ni inicia nada).",
+	"If true, the added node will be marked for work. Defaults to true.": "",
+	"If true, the node added will also be a control plane in addition to a worker.": "",
 	"If using the none driver, ensure that systemctl is installed": "",
 	"If you are running minikube within a VM, consider using --vm-driver=none:": "",
 	"Images Commands:": "",
@@ -259,6 +274,7 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node may be unable to resolve external DNS records": "",
+	"Node operations": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "No se puede acceder a ninguno de los repositorios conocidos de tu ubicación. Se utilizará {{.image_repository_name}} como alternativa.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "No se puede acceder a ninguno de los repositorios conocidos. Plantéate indicar un repositorio de imágenes alternativo con la marca --image-repository.",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
@@ -272,6 +288,7 @@
 	"Opening service {{.namespace_name}}/{{.service_name}} in default browser...": "",
 	"Opening {{.url}} in your default browser...": "",
 	"Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list": "",
+	"Operations on nodes": "",
 	"Options:      {{.options}}": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)\n\n\tThis depends on the bash-completion binary.  Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion  # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion  # for zsh users\n\t\t$ source ~/.minikube-completion\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash-completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2": "",
@@ -296,7 +313,6 @@
 	"Profile gets or sets the current minikube profile": "",
 	"Profile name \"{{.profilename}}\" is minikube keyword. To delete profile use command minikube delete -p \u003cprofile name\u003e": "",
 	"Provide VM UUID to restore MAC address (hyperkit driver only)": "Permite especificar un UUID de VM para restaurar la dirección MAC (solo con el controlador de hyperkit)",
-	"Pulling images ...": "",
 	"Reboot to complete VirtualBox installation, verify that VirtualBox is not blocked by your system, and/or use another hypervisor": "",
 	"Rebuild libvirt with virt-network support": "",
 	"Received {{.name}} signal": "",
@@ -326,8 +342,6 @@
 	"Run the minikube command as an Administrator": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from existing profile (alternates: {{.alternates}})": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -335,6 +349,8 @@
 	"Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'.": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'.": "",
 	"Setting profile failed": "",
 	"Show a list of global command-line options (applies to all commands).": "",
 	"Show only log entries which point to known problems": "",
@@ -352,9 +368,13 @@
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
+	"Starting node": "",
 	"Starts a local kubernetes cluster": "Inicia un clúster de Kubernetes local",
+	"Starts a node.": "",
+	"Starts an existing stopped node in a cluster.": "",
 	"Stopping \"{{.profile_name}}\" in {{.driver_name}} ...": "",
 	"Stops a local kubernetes cluster running in Virtualbox. This command stops the VM\nitself, leaving all files intact. The cluster can be started again with the \"start\" command.": "",
+	"Stops a node in a cluster.": "",
 	"Stops a running local kubernetes cluster": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
@@ -392,8 +412,7 @@
 	"The container runtime to be used (docker, crio, containerd).": "",
 	"The cri socket path to be used": "La ruta del socket de cri",
 	"The cri socket path to be used.": "",
-	"The docker host is currently not running": "",
-	"The docker service is currently not active": "",
+	"The docker service within '{{.profile}}' is not active": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "El controlador \"{{.driver}}\" no se puede utilizar en {{.os}}",
 	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
 	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
@@ -405,9 +424,12 @@
 	"The minikube VM is offline. Please run 'minikube start' to start it again.": "",
 	"The name of the network plugin": "El nombre del complemento de red",
 	"The name of the network plugin.": "",
+	"The name of the node to add.": "",
+	"The name of the node to delete": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
+	"The podman service within '{{.profile}}' is not active": "",
 	"The service namespace": "",
 	"The services namespace": "",
 	"The time interval for each check that wait performs in seconds": "",
@@ -471,6 +493,7 @@
 	"Usage: minikube completion SHELL": "",
 	"Usage: minikube delete": "",
 	"Usage: minikube delete --all --purge": "",
+	"Usage: minikube node [add|start|stop|delete]": "",
 	"Use \"{{.CommandPath}} [command] --help\" for more information about a command.": "",
 	"Use 'kubect get po -A' to find the correct and namespace name": "",
 	"Use -A to specify all namespaces": "",
@@ -482,6 +505,8 @@
 	"Using image repository {{.name}}": "Utilizando el repositorio de imágenes {{.name}}",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
 	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
+	"Using the {{.driver}} driver based on existing profile": "",
+	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "El controlador de la VM es uno de los siguientes: %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
@@ -500,6 +525,7 @@
 	"Wait until Kubernetes core services are healthy before exiting": "Espera hasta que los servicios principales de Kubernetes se encuentren en buen estado antes de salir",
 	"Waiting for cluster to come online ...": "",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Ruta en la raíz de los recursos compartidos de NFS. Su valor predeterminado es /nfsshares (solo con el controlador de hyperkit)",
+	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Parece que estás usando un proxy, pero tu entorno NO_PROXY no incluye la dirección IP de minikube ({{.ip_address}}). Consulta {{.documentation_url}} para obtener más información",
 	"You can delete them using the following command(s):": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Puede que tengas que retirar manualmente la VM \"{{.name}}\" de tu hipervisor",
@@ -518,6 +544,7 @@
 	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set vm-driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
+	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
@@ -533,18 +560,21 @@
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "La configuración de kubectl y de minikube se almacenará en {{.home_folder}}",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
+	"loading config": "",
 	"logdir set failed": "",
+	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\nThis is likely due to one of two reasons:\n\n- VPN or firewall interference\n- {{.hypervisor}} network configuration issue\n\nSuggested workarounds:\n\n- Disable your local VPN or firewall software\n- Configure your local VPN or firewall to allow access to {{.ip}}\n- Restart or reinstall {{.hypervisor}}\n- Use an alternative --vm-driver": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
 	"mount failed": "",
+	"name is required": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
@@ -552,6 +582,7 @@
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
+	"retrieving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
 	"stat failed": "",
 	"status json failure": "",
@@ -585,6 +616,8 @@
 	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
 	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
+	"{{.name}} is already running": "",
+	"{{.name}} is already stopped": "",
 	"{{.name}} was successfully configured": "",
 	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} en {{.platform}}",

translations/fr.json

@@ -7,8 +7,10 @@
 	"\"{{.profile_name}}\" stopped.": "\"{{.profile_name}}\" est arrêté.",
 	"'none' driver does not support 'minikube docker-env' command": "",
 	"'none' driver does not support 'minikube mount' command": "",
+	"'none' driver does not support 'minikube podman-env' command": "",
 	"'none' driver does not support 'minikube ssh' command": "",
 	"'{{.driver}}' driver reported an issue: {{.error}}": "",
+	"'{{.profile}}' is not running": "",
 	"- {{.profile}}": "",
 	"A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "",
 	"A firewall is blocking Docker the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "",
@@ -24,8 +26,11 @@
 	"Add an image to local cache.": "",
 	"Add machine IP to NO_PROXY environment variable": "",
 	"Add or delete an image from the local cache.": "",
+	"Adding node {{.name}} to cluster {{.profile}}": "",
 	"Additional help topics": "",
 	"Additional mount options, such as cache=fscache": "",
+	"Adds a node to the given cluster config, and starts it.": "",
+	"Adds a node to the given cluster.": "",
 	"Advanced Commands:": "",
 	"Aliases": "",
 	"Allow user prompts for more information": "",
@@ -35,8 +40,8 @@
 	"Amount of time to wait for a service in seconds": "",
 	"Amount of time to wait for service in seconds": "",
 	"Another hypervisor, such as VirtualBox, is conflicting with KVM. Please stop the other hypervisor, or use --vm-driver to switch to it.": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver": "",
-	"Automatically selected the {{.experimental}}'{{.driver}}' driver (alternates: {{.alternates}})": "",
+	"Automatically selected the {{.driver}} driver": "",
+	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "",
 	"Available Commands": "",
 	"Basic Commands:": "",
 	"Block until the apiserver is servicing API requests": "",
@@ -71,6 +76,7 @@
 	"Deletes a local kubernetes cluster": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "",
 	"Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "Supprime le cluster Kubernetes local. Cette commande supprime la VM ainsi que tous les fichiers associés.",
+	"Deletes a node from a cluster.": "",
 	"Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "Suppression de \"{{.profile_name}}\" dans {{.driver_name}}...",
 	"Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)": "Désactive la vérification de la disponibilité de la virtualisation du matériel avant le démarrage de la VM (pilote virtualbox uniquement).",
 	"Disable dynamic memory in your VM manager, or pass in a larger --memory value": "",
@@ -92,6 +98,7 @@
 	"Downloading VM boot image ...": "",
 	"Downloading driver {{.driver}}:": "",
 	"Downloading {{.name}} {{.version}}": "",
+	"ERROR creating `registry-creds-acr` secret": "",
 	"ERROR creating `registry-creds-dpr` secret": "",
 	"ERROR creating `registry-creds-ecr` secret: {{.error}}": "",
 	"ERROR creating `registry-creds-gcr` secret: {{.error}}": "",
@@ -112,12 +119,15 @@
 	"Ensure that the user listed in /etc/libvirt/qemu.conf has access to your home directory": "",
 	"Ensure that your value for HTTPS_PROXY points to an HTTPS proxy rather than an HTTP proxy": "",
 	"Environment variables to pass to the Docker daemon. (format: key=value)": "Variables d'environment à transmettre au daemon Docker (format : clé = valeur).",
+	"Error adding node to cluster": "",
 	"Error checking driver version: {{.error}}": "Erreur lors de la vérification de la version du driver : {{.error}}",
 	"Error creating minikube directory": "",
 	"Error creating view template": "",
-	"Error executing template": "",
+	"Error detecting shell": "",
 	"Error executing view template": "",
 	"Error finding port for mount": "",
+	"Error generating set output": "",
+	"Error generating unset output": "",
 	"Error getting IP": "",
 	"Error getting client": "",
 	"Error getting client: {{.error}}": "",
@@ -125,11 +135,13 @@
 	"Error getting cluster bootstrapper": "",
 	"Error getting config": "",
 	"Error getting host": "",
+	"Error getting host IP": "",
 	"Error getting host status": "",
 	"Error getting machine logs": "",
 	"Error getting profiles to delete": "",
 	"Error getting service status": "",
 	"Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "",
+	"Error getting ssh client": "",
 	"Error getting the host IP address to use from within the VM": "",
 	"Error host driver ip status": "",
 	"Error killing mount process": "",
@@ -138,13 +150,12 @@
 	"Error loading profile config: {{.error}}": "",
 	"Error loading profile {{.name}}: {{.error}}": "Erreur lors du chargement du profil {{.name}} : {{.error}}",
 	"Error opening service": "",
+	"Error parsing Driver version: {{.error}}": "Erreur lors de l'analyse de la version du pilote de la VM : {{.error}}",
 	"Error parsing minikube version: {{.error}}": "Erreur lors de l'analyse de la version de minikube : {{.error}}",
-	"Error parsing vmDriver version: {{.error}}": "Erreur lors de l'analyse de la version du pilote de la VM : {{.error}}",
 	"Error reading {{.path}}: {{.error}}": "",
-	"Error setting shell variables": "",
 	"Error starting cluster": "",
 	"Error starting mount": "",
-	"Error unsetting shell variables": "",
+	"Error starting node": "",
 	"Error while setting kubectl current context :  {{.error}}": "",
 	"Error writing mount pid": "",
 	"Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "",
@@ -153,6 +164,7 @@
 	"Examples": "",
 	"Exiting": "Fermeture…",
 	"Exiting.": "",
+	"External Adapter on which external switch will be created if no external switch is found. (hyperv driver only)": "",
 	"Failed runtime": "",
 	"Failed to cache ISO": "",
 	"Failed to cache and load images": "",
@@ -212,11 +224,14 @@
 	"Hyperkit is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"Hyperkit networking is broken. Upgrade to the latest hyperkit version and/or Docker for Desktop. Alternatively, you may choose an alternate --vm-driver": "",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "",
+	"If set, install addons. Defaults to true.": "",
 	"If set, pause all namespaces": "",
 	"If set, unpause all namespaces": "",
 	"If the above advice does not help, please let us know:": "",
 	"If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --vm-driver=none.": "Si la valeur est \"true\", mettez les images Docker en cache pour l'amorceur actuel et chargez-les dans la machine. La valeur est toujours \"false\" avec --vm-driver=none.",
 	"If true, only download and cache files for later use - don't install or start anything.": "Si la valeur est \"true\", téléchargez les fichiers et mettez-les en cache uniquement pour une utilisation future. Ne lancez pas d'installation et ne commencez aucun processus.",
+	"If true, the added node will be marked for work. Defaults to true.": "",
+	"If true, the node added will also be a control plane in addition to a worker.": "",
 	"If using the none driver, ensure that systemctl is installed": "",
 	"If you are running minikube within a VM, consider using --vm-driver=none:": "",
 	"Images Commands:": "",
@@ -259,6 +274,7 @@
 	"Networking and Connectivity Commands:": "",
 	"No minikube profile was found. You can create one using `minikube start`.": "",
 	"Node may be unable to resolve external DNS records": "",
+	"Node operations": "",
 	"None of the known repositories in your location are accessible. Using {{.image_repository_name}} as fallback.": "Aucun dépôt connu dans votre emplacement n'est accessible. {{.image_repository_name}} est utilisé comme dépôt de remplacement.",
 	"None of the known repositories is accessible. Consider specifying an alternative image repository with --image-repository flag": "Aucun dépôt connu n'est accessible. Pensez à spécifier un autre dépôt d'images à l'aide de l'indicateur \"--image-repository\".",
 	"Not passing {{.name}}={{.value}} to docker env.": "",
@@ -272,6 +288,7 @@
 	"Opening service {{.namespace_name}}/{{.service_name}} in default browser...": "",
 	"Opening {{.url}} in your default browser...": "",
 	"Opens the addon w/ADDON_NAME within minikube (example: minikube addons open dashboard). For a list of available addons use: minikube addons list": "",
+	"Operations on nodes": "",
 	"Options:      {{.options}}": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)": "",
 	"Outputs minikube shell completion for the given shell (bash or zsh)\n\n\tThis depends on the bash-completion binary.  Example installation instructions:\n\tOS X:\n\t\t$ brew install bash-completion\n\t\t$ source $(brew --prefix)/etc/bash_completion\n\t\t$ minikube completion bash \u003e ~/.minikube-completion  # for bash users\n\t\t$ minikube completion zsh \u003e ~/.minikube-completion  # for zsh users\n\t\t$ source ~/.minikube-completion\n\tUbuntu:\n\t\t$ apt-get install bash-completion\n\t\t$ source /etc/bash-completion\n\t\t$ source \u003c(minikube completion bash) # for bash users\n\t\t$ source \u003c(minikube completion zsh) # for zsh users\n\n\tAdditionally, you may want to output the completion to a file and source in your .bashrc\n\n\tNote for zsh users: [1] zsh completions are only supported in versions of zsh \u003e= 5.2": "",
@@ -326,8 +343,6 @@
 	"Run the minikube command as an Administrator": "",
 	"Run: 'chmod 600 $HOME/.kube/config'": "",
 	"Running on localhost (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from existing profile (alternates: {{.alternates}})": "",
-	"Selecting {{.experimental}}'{{.driver}}' driver from user configuration (alternates: {{.alternates}})": "",
 	"Set failed": "",
 	"Set flag to delete all profiles": "",
 	"Set this flag to delete the '.minikube' folder from your user directory.": "",
@@ -335,6 +350,8 @@
 	"Sets the PROPERTY_NAME config value to PROPERTY_VALUE\n\tThese values can be overwritten by flags or environment variables at runtime.": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'": "",
 	"Sets up docker env variables; similar to '$(docker-machine env)'.": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'": "",
+	"Sets up podman env variables; similar to '$(podman-machine env)'.": "",
 	"Setting profile failed": "",
 	"Show a list of global command-line options (applies to all commands).": "",
 	"Show only log entries which point to known problems": "",
@@ -352,9 +369,13 @@
 	"Specify the ip that the mount should be setup on": "",
 	"Specify the mount filesystem type (supported types: 9p)": "",
 	"Starting existing {{.driver_name}} VM for \"{{.profile_name}}\" ...": "",
+	"Starting node": "",
 	"Starts a local kubernetes cluster": "Démarre un cluster Kubernetes local.",
+	"Starts a node.": "",
+	"Starts an existing stopped node in a cluster.": "",
 	"Stopping \"{{.profile_name}}\" in {{.driver_name}} ...": "Arrêt de \"{{.profile_name}}\" sur {{.driver_name}}...",
 	"Stops a local kubernetes cluster running in Virtualbox. This command stops the VM\nitself, leaving all files intact. The cluster can be started again with the \"start\" command.": "",
+	"Stops a node in a cluster.": "",
 	"Stops a running local kubernetes cluster": "",
 	"Successfully deleted all profiles": "",
 	"Successfully mounted {{.sourcePath}} to {{.destinationPath}}": "",
@@ -391,8 +412,7 @@
 	"The container runtime to be used (docker, crio, containerd).": "",
 	"The cri socket path to be used": "Chemin d'accès au socket CRI à utiliser.",
 	"The cri socket path to be used.": "",
-	"The docker host is currently not running": "",
-	"The docker service is currently not active": "",
+	"The docker service within '{{.profile}}' is not active": "",
 	"The driver '{{.driver}}' is not supported on {{.os}}": "Le pilote \"{{.driver}}\" n'est pas compatible avec {{.os}}.",
 	"The driver {{.experimental}} '{{.driver}}' is not supported on {{.os}}": "",
 	"The existing \"{{.profile_name}}\" VM that was created using the \"{{.old_driver}}\" driver, and is incompatible with the \"{{.driver}}\" driver.": "",
@@ -404,9 +424,12 @@
 	"The minikube VM is offline. Please run 'minikube start' to start it again.": "",
 	"The name of the network plugin": "Nom du plug-in réseau.",
 	"The name of the network plugin.": "",
+	"The name of the node to add.": "",
+	"The name of the node to delete": "",
 	"The number of bytes to use for 9p packet payload": "",
 	"The output format. One of 'json', 'table'": "",
 	"The path on the file system where the docs in markdown need to be saved": "",
+	"The podman service within '{{.profile}}' is not active": "",
 	"The service namespace": "",
 	"The services namespace": "",
 	"The time interval for each check that wait performs in seconds": "",
@@ -470,6 +493,7 @@
 	"Usage: minikube completion SHELL": "",
 	"Usage: minikube delete": "",
 	"Usage: minikube delete --all --purge": "",
+	"Usage: minikube node [add|start|stop|delete]": "",
 	"Use \"{{.CommandPath}} [command] --help\" for more information about a command.": "",
 	"Use 'kubect get po -A' to find the correct and namespace name": "",
 	"Use -A to specify all namespaces": "",
@@ -481,6 +505,8 @@
 	"Using image repository {{.name}}": "Utilisation du dépôt d'images {{.name}}…",
 	"Using the '{{.runtime}}' runtime with the 'none' driver is an untested configuration!": "",
 	"Using the running {{.driver_name}} \"{{.profile_name}}\" VM ...": "",
+	"Using the {{.driver}} driver based on existing profile": "",
+	"Using the {{.driver}} driver based on user configuration": "",
 	"VM driver is one of: %v": "Le pilote de la VM appartient à : %v",
 	"VM is unable to access {{.repository}}, you may need to configure a proxy or set --image-repository": "",
 	"Verify that your HTTP_PROXY and HTTPS_PROXY environment variables are set correctly.": "",
@@ -502,6 +528,7 @@
 	"Waiting for cluster to come online ...": "",
 	"Waiting for:": "En attente de :",
 	"Where to root the NFS Shares, defaults to /nfsshares (hyperkit driver only)": "Emplacement permettant d'accéder aux partages NFS en mode root, la valeur par défaut affichant /nfsshares (pilote hyperkit uniquement).",
+	"Whether to use external switch over Default Switch if virtual switch not explicitly specified. (hyperv driver only)": "",
 	"You appear to be using a proxy, but your NO_PROXY environment does not include the minikube IP ({{.ip_address}}). Please see {{.documentation_url}} for more details": "Il semble que vous utilisiez un proxy, mais votre environment NO_PROXY n'inclut pas l'adresse IP ({{.ip_address}}) de minikube. Consultez la documentation à l'adresse {{.documentation_url}} pour en savoir plus.",
 	"You can delete them using the following command(s):": "",
 	"You may need to manually remove the \"{{.name}}\" VM from your hypervisor": "Vous devrez peut-être supprimer la VM \"{{.name}}\" manuellement de votre hyperviseur.",
@@ -520,6 +547,7 @@
 	"command runner": "",
 	"config modifies minikube config files using subcommands like \"minikube config set vm-driver kvm\"\nConfigurable fields:\\n\\n": "",
 	"config view failed": "",
+	"creating api client": "",
 	"dashboard service is not running: {{.error}}": "",
 	"disable failed": "",
 	"dry-run mode. Validates configuration, but does not mutate system state": "",
@@ -535,18 +563,21 @@
 	"kubectl and minikube configuration will be stored in {{.home_folder}}": "Les configurations kubectl et minikube seront stockées dans le dossier {{.home_folder}}.",
 	"kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "",
 	"kubectl proxy": "",
+	"loading config": "",
 	"logdir set failed": "",
+	"machine '{{.name}}' does not exist. Proceeding ahead with recreating VM.": "",
 	"max time to wait per Kubernetes core services to be healthy.": "",
 	"minikube addons list --output OUTPUT. json, list": "",
 	"minikube is exiting due to an error. If the above message is not useful, open an issue:": "",
 	"minikube is unable to access the Google Container Registry. You may need to configure it to use a HTTP proxy.": "",
-	"minikube is unable to connect to the VM: {{.error}}\n\nThis is likely due to one of two reasons:\n\n- VPN or firewall interference\n- {{.hypervisor}} network configuration issue\n\nSuggested workarounds:\n\n- Disable your local VPN or firewall software\n- Configure your local VPN or firewall to allow access to {{.ip}}\n- Restart or reinstall {{.hypervisor}}\n- Use an alternative --vm-driver": "",
+	"minikube is unable to connect to the VM: {{.error}}\n\n\tThis is likely due to one of two reasons:\n\n\t- VPN or firewall interference\n\t- {{.hypervisor}} network configuration issue\n\n\tSuggested workarounds:\n\n\t- Disable your local VPN or firewall software\n\t- Configure your local VPN or firewall to allow access to {{.ip}}\n\t- Restart or reinstall {{.hypervisor}}\n\t- Use an alternative --vm-driver\n\t- Use --force to override this connectivity check": "",
 	"minikube profile was successfully set to {{.profile_name}}": "",
 	"minikube status --output OUTPUT. json, text": "",
 	"minikube {{.version}} is available! Download it: {{.url}}": "",
 	"mkcmp is used to compare performance of two minikube binaries": "",
 	"mount argument \"{{.value}}\" must be in form: \u003csource directory\u003e:\u003ctarget directory\u003e": "",
 	"mount failed": "",
+	"name is required": "",
 	"namespaces to pause": "",
 	"namespaces to unpause": "",
 	"not enough arguments ({{.ArgCount}}).\\nusage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "",
@@ -554,6 +585,7 @@
 	"profile sets the current minikube profile, or gets the current profile if no arguments are provided.  This is used to run and manage multiple minikube instance.  You can return to the default minikube profile by running `minikube profile default`": "",
 	"reload cached images.": "",
 	"reloads images previously added using the 'cache add' subcommand": "",
+	"retrieving node": "",
 	"service {{.namespace_name}}/{{.service_name}} has no node port": "",
 	"stat failed": "",
 	"status json failure": "",
@@ -587,6 +619,8 @@
 	"{{.machine}} IP was already correctly configured for {{.ip}}": "",
 	"{{.name}} cluster does not exist": "",
 	"{{.name}} has no available configuration options": "",
+	"{{.name}} is already running": "",
+	"{{.name}} is already stopped": "",
 	"{{.name}} was successfully configured": "",
 	"{{.path}} is version {{.client_version}}, and is incompatible with Kubernetes {{.cluster_version}}. You will need to update {{.path}} or use 'minikube kubectl' to connect with this cluster": "",
 	"{{.prefix}}minikube {{.version}} on {{.platform}}": "{{.prefix}}minikube {{.version}} sur {{.platform}}",