github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-01 01:08:55 +00:00
Code Issues Projects Releases Wiki Activity

Kubeadm: fix Ready condition check

Browse Source
This commit is contained in:
kvaps
2020-03-27 23:55:12 +01:00
parent f8e62e33c9
commit 68dcc17155
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ func runKubeletStartJoinPhase(c workflow.RunData) (returnErr error) {
return errors.Wrapf(err, "cannot get Node %q", nodeName) return errors.Wrapf(err, "cannot get Node %q", nodeName)
} }
for _, cond := range node.Status.Conditions { for _, cond := range node.Status.Conditions {
if cond.Type == v1.NodeReady { if cond.Type == v1.NodeReady && cond.Status == v1.ConditionTrue {
return errors.Errorf("a Node with name %q and status %q already exists in the cluster. "+ return errors.Errorf("a Node with name %q and status %q already exists in the cluster. "+
"You must delete the existing Node or change the name of this new joining Node", nodeName, v1.NodeReady) "You must delete the existing Node or change the name of this new joining Node", nodeName, v1.NodeReady)
} }