Merge pull request kubernetes#89603 from neolit123/automated-cherry-pick-of-#89602-origin-release-1.18

k8s-ci-robot · web-flow · commit 974a91db1c6e · 2020-04-04T04:17:46.000-07:00
Automated cherry pick of kubernetes#89602: Kubeadm: fix Ready condition check
diff --git a/cmd/kubeadm/app/cmd/phases/join/kubelet.go b/cmd/kubeadm/app/cmd/phases/join/kubelet.go
@@ -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)
 		}

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