Merge pull request #7238 from sharifelgamal/honor-override

do not override hostname if extraConfig is specified
kubernetes · Mar 25, 2020 · 7100353 · 7100353
2 parents 8f3e480 + 6417e85
commit 7100353
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/minikube/bootstrapper/bsutil/kubelet.go b/pkg/minikube/bootstrapper/bsutil/kubelet.go
@@ -61,8 +61,8 @@ func extraKubeletOpts(mc config.ClusterConfig, nc config.Node, r cruntime.Manage
 	if _, ok := extraOpts["node-ip"]; !ok {
 		extraOpts["node-ip"] = cp.IP
 	}
-	nodeName := KubeNodeName(mc, nc)
-	if nodeName != "" {
+	if _, ok := extraOpts["hostname-override"]; !ok {
+		nodeName := KubeNodeName(mc, nc)
 		extraOpts["hostname-override"] = nodeName
 	}