Skip to content

Commit

Permalink
Merge pull request #89602 from kvaps/fix-rejoin
Browse files Browse the repository at this point in the history
Kubeadm: fix Ready condition check
  • Loading branch information
k8s-ci-robot committed Mar 28, 2020
2 parents c7abf44 + 68dcc17 commit 9cbb46e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/cmd/phases/join/kubelet.go
Expand Up @@ -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)
}
Expand Down

0 comments on commit 9cbb46e

Please sign in to comment.