github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
kubeadm: fix nil check in join config creation
This commit is contained in:
Kubernetes Prow Robot 2018-12-17 14:18:35 -08:00 committed by GitHub
commit 76963255cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/join.go
View File

@ -316,7 +316,7 @@ func NewJoin(cfgPath string, defaultcfg *kubeadmapiv1beta1.JoinConfiguration, ig
internalCfg.NodeRegistration.CRISocket = defaultcfg.NodeRegistration.CRISocket internalCfg.NodeRegistration.CRISocket = defaultcfg.NodeRegistration.CRISocket
} }
if defaultcfg.ControlPlane != nil { if internalCfg.ControlPlane != nil {
if err := configutil.VerifyAPIServerBindAddress(internalCfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress); err != nil { if err := configutil.VerifyAPIServerBindAddress(internalCfg.ControlPlane.LocalAPIEndpoint.AdvertiseAddress); err != nil {
return nil, err return nil, err
} }