fix docker driver

pull/6787/head
Sharif Elgamal 2020-03-16 15:36:05 -07:00
parent f387032d7f
commit f99d335fed
3 changed files with 23 additions and 13 deletions

View File

@ -357,18 +357,19 @@ func runStart(cmd *cobra.Command, args []string) {
if numNodes > 1 {
if driver.BareMetal(driverName) {
out.T(out.Meh, "The none driver is not compatible with multi-node clusters.")
}
for i := 1; i < numNodes; i++ {
nodeName := fmt.Sprintf("m%02d", i+1)
n := config.Node{
Name: nodeName,
Worker: true,
ControlPlane: false,
KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
}
err := node.Add(&cc, n)
if err != nil {
exit.WithError("adding node", err)
} else {
for i := 1; i < numNodes; i++ {
nodeName := fmt.Sprintf("m%02d", i+1)
n := config.Node{
Name: nodeName,
Worker: true,
ControlPlane: false,
KubernetesVersion: cc.KubernetesConfig.KubernetesVersion,
}
err := node.Add(&cc, n)
if err != nil {
exit.WithError("adding node", err)
}
}
}
}

View File

@ -236,3 +236,11 @@ func MachineName(cc config.ClusterConfig, n config.Node) string {
}
return fmt.Sprintf("%s-%s", cc.Name, n.Name)
}
// ClusterNameFromMachine retrieves the cluster name embedded in the machine name
func ClusterNameFromMachine(name string) string {
if strings.Contains(name, "-") {
return strings.Split(name, "-")[0]
}
return name
}

View File

@ -39,6 +39,7 @@ import (
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/driver"
"k8s.io/minikube/pkg/minikube/sshutil"
)
@ -195,7 +196,7 @@ func setRemoteAuthOptions(p provision.Provisioner) auth.Options {
}
func setContainerRuntimeOptions(name string, p miniProvisioner) error {
cluster := strings.Split(name, "-")[0]
cluster := driver.ClusterNameFromMachine(name)
c, err := config.Load(cluster)
if err != nil {
return errors.Wrap(err, "getting cluster config")