Merge pull request #72123 from criticalstack/fix-kubeadm-panic

kubeadm: fix nil check in join config creation

Merge pull request #72123 from criticalstack/fix-kubeadm-panic
76963255 · Kubernetes Prow Robot · GitHub · 1d59ab05 · 60f754a8 · 76963255
Unverified Commit 76963255 authored Dec 17, 2018 by Kubernetes Prow Robot Committed by GitHub Dec 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

join.go cmd/kubeadm/app/cmd/join.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/join.go
+++ b/cmd/kubeadm/app/cmd/join.go
@@ -316,7 +316,7 @@ func NewJoin(cfgPath string, defaultcfg *kubeadmapiv1beta1.JoinConfiguration, ig
 		internalCfg.NodeRegistration.CRISocket = defaultcfg.NodeRegistration.CRISocket
 	}

-	if defaultcfg.ControlPlane != nil {
+	if internalCfg.ControlPlane != nil {
 		if err := configutil.VerifyAPIServerBindAddress(internalCfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress); err != nil {
 			return nil, err
 		}