Merge pull request #75523 from freehan/bug-fix

reconcile pod ready condition when message is not expected
kubernetes · Apr 5, 2019 · a727bdd · a727bdd
2 parents e9ca60b + 47bc948
commit a727bdd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go
@@ -665,8 +665,8 @@ func NeedToReconcilePodReadiness(pod *v1.Pod) bool {
 	}
 	podReadyCondition := GeneratePodReadyCondition(&pod.Spec, pod.Status.Conditions, pod.Status.ContainerStatuses, pod.Status.Phase)
 	i, curCondition := podutil.GetPodConditionFromList(pod.Status.Conditions, v1.PodReady)
-	// Only reconcile if "Ready" condition is present
-	if i >= 0 && curCondition.Status != podReadyCondition.Status {
+	// Only reconcile if "Ready" condition is present and Status or Message is not expected
+	if i >= 0 && (curCondition.Status != podReadyCondition.Status || curCondition.Message != podReadyCondition.Message) {
 		return true
 	}
 	return false