Multi-node Prototype

Makefile

@@ -140,7 +140,7 @@ ifeq ($(IN_DOCKER),1)
 	$(MAKE) minikube_iso
 else
 	docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
-		--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
+		--env HOME=/tmp --env IN_DOCKER=1 \
 		$(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso
 endif
 

cmd/minikube/cmd/delete.go

@@ -49,7 +49,7 @@ associated files.`,
 		}
 		defer api.Close()
 
-		if err = cluster.DeleteHost(api); err != nil {
+		if err = cluster.DeleteHost(pkg_config.GetMachineName(), api); err != nil {
 			fmt.Println("Errors occurred deleting machine: ", err)
 			os.Exit(1)
 		}

cmd/minikube/cmd/env.go

@@ -146,7 +146,7 @@ func generateUsageHint(userShell string) string {
 
 func shellCfgSet(api libmachine.API) (*ShellConfig, error) {
 
-	envMap, err := cluster.GetHostDockerEnv(api)
+	envMap, err := cluster.GetHostDockerEnv(config.GetMachineName(), api)
 	if err != nil {
 		return nil, err
 	}

cmd/minikube/cmd/node/add.go

@@ -0,0 +1,57 @@
+package node
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/golang/glog"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"k8s.io/minikube/cmd/minikube/profile"
+	cmdutil "k8s.io/minikube/cmd/util"
+	"k8s.io/minikube/pkg/minikube"
+	cfg "k8s.io/minikube/pkg/minikube/config"
+)
+
+func NewCmdAdd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "add <node_name>",
+		Short: "Adds a node to the cluster",
+		Long:  "Adds a node tot the cluster",
+		Run:   add,
+	}
+}
+
+func add(cmd *cobra.Command, args []string) {
+	// TODO Make clusterName into `--cluster=` flag
+	clusterName := viper.GetString(cfg.MachineProfile)
+
+	nodeName := ""
+	if len(args) > 0 {
+		nodeName = args[0]
+	}
+
+	cfg, err := profile.LoadConfigFromFile(clusterName)
+	if err != nil {
+		glog.Errorln("Error loading profile config: ", err)
+		cmdutil.MaybeReportErrorAndExit(err)
+	}
+
+	if nodeName == "" {
+		nodeName = fmt.Sprintf("node-%d", len(cfg.Nodes)+1)
+	}
+
+	node := minikube.NodeConfig{
+		Name: nodeName,
+	}
+
+	cfg.Nodes = append(cfg.Nodes, node)
+
+	if err := profile.SaveConfig(clusterName, cfg); err != nil {
+		glog.Errorln("Error saving profile cluster configuration: ", err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Added node: ", node.Name)
+}

cmd/minikube/cmd/node/list.go

@@ -0,0 +1,68 @@
+package node
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/golang/glog"
+	"github.com/spf13/cobra"
+
+	"k8s.io/minikube/cmd/minikube/profile"
+	cmdutil "k8s.io/minikube/cmd/util"
+	"k8s.io/minikube/pkg/minikube"
+	"k8s.io/minikube/pkg/minikube/machine"
+	"k8s.io/minikube/pkg/minikube/node"
+)
+
+func NewCmdList() *cobra.Command {
+	return &cobra.Command{
+		Use:   "list",
+		Short: "Lists all nodes",
+		Long:  "Lists all nodes",
+		Run:   list,
+	}
+}
+
+func list(cmd *cobra.Command, args []string) {
+	configs, err := profile.LoadClusterConfigs()
+	if err != nil {
+		glog.Errorln("Error loading cluster configs: ", err)
+		cmdutil.MaybeReportErrorAndExit(err)
+	}
+
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		glog.Errorf("Error getting client: %s\n", err)
+		os.Exit(1)
+	}
+	defer api.Close()
+
+	fmt.Printf("%-20s %-20s %-16s %-20s\n", "CLUSTER", "NODE", "IP", "STATUS")
+
+	nodesFound := false
+	for _, c := range configs {
+		for _, nc := range c.Nodes {
+			nodesFound = true
+			n := node.NewNode(nc, c.MachineConfig, c.ClusterName, api)
+			status, err := n.Status()
+			if err != nil {
+				status = minikube.NodeStatus("Error: " + err.Error())
+			}
+
+			ip := ""
+			if status == minikube.StatusRunning {
+				ip, err = n.IP()
+				if err != nil {
+					glog.Errorf("Error getting IP address for node %s: %s", nc.Name, err)
+					cmdutil.MaybeReportErrorAndExit(err)
+				}
+			}
+
+			fmt.Printf("%-20s %-20s %-16s %-20s\n", c.ClusterName, nc.Name, ip, status)
+		}
+	}
+
+	if !nodesFound {
+		fmt.Println("No nodes found.")
+	}
+}

cmd/minikube/cmd/node/node.go

@@ -0,0 +1,50 @@
+package node
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+
+	"k8s.io/minikube/cmd/minikube/profile"
+	"k8s.io/minikube/pkg/minikube"
+)
+
+const internalErrorCode = -1
+
+func NewCmdNode() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "node SUBCOMMAND [flags]",
+		Short: "Control a minikube cluster's nodes",
+		Long:  `Control a cluster's nodes using subcommands like "minikube node add <node_name>"`,
+		Run: func(cmd *cobra.Command, args []string) {
+			cmd.Help()
+		},
+	}
+	cmd.AddCommand(NewCmdAdd())
+	cmd.AddCommand(NewCmdList())
+	cmd.AddCommand(NewCmdRemove())
+	cmd.AddCommand(NewCmdSsh())
+	cmd.AddCommand(NewCmdStart())
+	return cmd
+}
+
+func getMachineName(clusterName string, node minikube.NodeConfig) string {
+	return fmt.Sprintf("%s-%s", clusterName, node.Name)
+}
+
+func getNode(clusterName, nodeName string) (minikube.NodeConfig, error) {
+	cfg, err := profile.LoadConfigFromFile(clusterName)
+	if err != nil && !os.IsNotExist(err) {
+		return minikube.NodeConfig{}, errors.Errorf("Error loading profile config: %s", err)
+	}
+
+	for _, node := range cfg.Nodes {
+		if node.Name == nodeName {
+			return node, nil
+		}
+	}
+
+	return minikube.NodeConfig{}, errors.Errorf("Node not found in cluster. cluster: %s node: %s", clusterName, nodeName)
+}

cmd/minikube/cmd/node/remove.go

@@ -0,0 +1,77 @@
+package node
+
+import (
+	"os"
+
+	"github.com/golang/glog"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"k8s.io/minikube/cmd/minikube/profile"
+	cmdutil "k8s.io/minikube/cmd/util"
+	"k8s.io/minikube/pkg/minikube/cluster"
+	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/machine"
+)
+
+func NewCmdRemove() *cobra.Command {
+	return &cobra.Command{
+		Use:   "remove <node_name>",
+		Short: "Removes a node from the cluster",
+		Long:  "Removes a node from the cluster",
+		Run:   remove,
+	}
+}
+
+func remove(cmd *cobra.Command, args []string) {
+	clusterName := viper.GetString(cfg.MachineProfile)
+
+	if len(args) == 0 || args[0] == "" {
+		glog.Error("node_name is required.")
+		os.Exit(1)
+	}
+
+	nodeName := args[0]
+
+	cfg, err := profile.LoadConfigFromFile(clusterName)
+	if err != nil && !os.IsNotExist(err) {
+		glog.Errorln("Error loading profile config: ", err)
+		cmdutil.MaybeReportErrorAndExit(err)
+	}
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		glog.Errorf("Error getting client: %s\n", err)
+		os.Exit(1)
+	}
+	defer api.Close()
+
+	for i, node := range cfg.Nodes {
+		if node.Name == nodeName {
+			machineName := getMachineName(clusterName, node)
+			exists, err := api.Exists(machineName)
+			if err != nil {
+				glog.Errorln("Error removing node: ", err)
+				os.Exit(1)
+			}
+
+			if exists {
+				if err := cluster.DeleteHost(machineName, api); err != nil {
+					glog.Errorln("Error removing node: ", err)
+					os.Exit(1)
+				}
+			}
+
+			cfg.Nodes = append(cfg.Nodes[:i], cfg.Nodes[i+1:]...)
+			break
+
+		} else if i == len(cfg.Nodes)-1 {
+			glog.Errorln("Node not found: ", nodeName)
+			os.Exit(1)
+		}
+	}
+
+	if err := profile.SaveConfig(clusterName, cfg); err != nil {
+		glog.Errorln("Error saving profile cluster configuration: ", err)
+		os.Exit(1)
+	}
+}

cmd/minikube/cmd/node/ssh.go

@@ -0,0 +1,65 @@
+package node
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/golang/glog"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"k8s.io/minikube/pkg/minikube/cluster"
+	cfg "k8s.io/minikube/pkg/minikube/config"
+	"k8s.io/minikube/pkg/minikube/machine"
+)
+
+func NewCmdSsh() *cobra.Command {
+	return &cobra.Command{
+		Use:   "ssh",
+		Short: "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'",
+		Long:  "Log into or run a command on a machine with SSH; similar to 'docker-machine ssh'.",
+		Run:   ssh,
+	}
+}
+
+func ssh(cmd *cobra.Command, args []string) {
+	clusterName := viper.GetString(cfg.MachineProfile)
+
+	if len(args) == 0 || args[0] == "" {
+		glog.Error("node_name is required.")
+		os.Exit(1)
+	}
+
+	nodeName := args[0]
+	args = args[1:]
+
+	node, err := getNode(clusterName, nodeName)
+	if err != nil {
+		glog.Error("Error loading node: ", err)
+		os.Exit(1)
+	}
+
+	api, err := machine.NewAPIClient()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error getting client: %s\n", err)
+		os.Exit(1)
+	}
+	defer api.Close()
+
+	machineName := getMachineName(clusterName, node)
+	host, err := cluster.CheckIfApiExistsAndLoadByName(machineName, api)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Error getting host: %s\n", err)
+		os.Exit(1)
+	}
+	if host.Driver.DriverName() == "none" {
+		fmt.Println(`'none' driver does not support 'minikube ssh' command`)
+		os.Exit(0)
+	}
+	err = cluster.CreateSSHShellByName(machineName, api, args)
+	if err != nil {
+		glog.Errorln(errors.Wrap(err, "Error attempting to ssh/run-ssh-command"))
+		os.Exit(1)
+	}
+}