Skip to content

K
k3s
Unverified Commit faa246de authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #72126 from neolit123/automated-cherry-pick-of-#72123-origin-release-1.13

Automated cherry pick of #72123: kubeadm: fix nil check in join config creation
parents dc5b1c51 2f6bf9d3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/join.go
View file @ faa246de
...@@ -316,7 +316,7 @@ func NewJoin(cfgPath string, defaultcfg *kubeadmapiv1beta1.JoinConfiguration, ig ...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment