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

Merge pull request #89602 from kvaps/fix-rejoin

Browse Source 
Kubeadm: fix Ready condition check
This commit is contained in:
Kubernetes Prow Robot
2020-03-28 00:11:52 -07:00
committed by GitHub
parent c7abf44a19 68dcc17155
commit 9cbb46e39f
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)
}
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. "+
"You must delete the existing Node or change the name of this new joining Node", nodeName, v1.NodeReady)
}