kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set node name the same as host name by default for none driver 

Signed-off-by: Zhongcheng Lao <Zhongcheng.Lao@microsoft.com>
pull/6200/head
Zhongcheng Lao 2020-01-03 00:32:05 +08:00
parent 914c34cc2a
commit 73608d60e4
No known key found for this signature in database
GPG Key ID: 3B0C92A7E58EF413
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/minikube/cmd/start.go
View File

@ -889,6 +889,13 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
} }
kubeNodeName := viper.GetString(nodeName) kubeNodeName := viper.GetString(nodeName)
if kubeNodeName == "" {
if drvName == driver.None {
// set the node name the same as host name for none driver
hostname, _ := os.Hostname()
kubeNodeName = hostname
}
if kubeNodeName == "" { if kubeNodeName == "" {
machineName := viper.GetString(cfg.MachineProfile) machineName := viper.GetString(cfg.MachineProfile)
if machineName != constants.DefaultMachineName { if machineName != constants.DefaultMachineName {
@ -897,6 +904,7 @@ func generateCfgFromFlags(cmd *cobra.Command, k8sVersion string, drvName string)
kubeNodeName = constants.DefaultNodeName kubeNodeName = constants.DefaultNodeName
} }
} }
}
cfg := cfg.MachineConfig{ cfg := cfg.MachineConfig{
Name: viper.GetString(cfg.MachineProfile), Name: viper.GetString(cfg.MachineProfile),