Create the Node subcommands

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)

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/profile_list.go

@@ -85,7 +85,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)

cmd/minikube/cmd/delete.go

@@ -33,6 +33,7 @@ import (
 	"github.com/spf13/viper"
 	cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
 	"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"
@@ -41,6 +42,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/localpath"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 	"k8s.io/minikube/pkg/minikube/out"
 )
 
@@ -92,10 +94,7 @@ 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()
 	profilesToDelete := append(validProfiles, invalidProfiles...)
@@ -192,7 +191,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 {
@@ -276,7 +275,7 @@ 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 := node.Bootstrapper(api, bsName)
 	if err != nil {
 		return DeletionError{Err: fmt.Errorf("unable to get bootstrapper: %v", err), Errtype: Fatal}
 	}

cmd/minikube/cmd/logs.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/logs"
 	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
 )
 
 const (
@@ -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 := node.Bootstrapper(api, viper.GetString(cmdcfg.Bootstrapper))
 		if err != nil {
 			exit.WithError("Error getting cluster bootstrapper", err)
 		}

cmd/minikube/cmd/node.go

@@ -0,0 +1,33 @@
+/*
+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

@@ -0,0 +1,77 @@
+/*
+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

@@ -0,0 +1,58 @@
+/*
+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

@@ -0,0 +1,75 @@
+/*
+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/cluster"
+	"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 cluster.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)
+}