Skip to content

K
k3s
Commit 47bc948f authored by Minhan Xia's avatar Minhan Xia
Browse files
Options

reconcile pod ready condition when message is not expected

parent 79e8a295
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/kubelet/status/status_manager.go
View file @ 47bc948f
...@@ -665,8 +665,8 @@ func NeedToReconcilePodReadiness(pod *v1.Pod) bool { ...@@ -665,8 +665,8 @@ func NeedToReconcilePodReadiness(pod *v1.Pod) bool {
} }
podReadyCondition := GeneratePodReadyCondition(&pod.Spec, pod.Status.Conditions, pod.Status.ContainerStatuses, pod.Status.Phase) podReadyCondition := GeneratePodReadyCondition(&pod.Spec, pod.Status.Conditions, pod.Status.ContainerStatuses, pod.Status.Phase)
i, curCondition := podutil.GetPodConditionFromList(pod.Status.Conditions, v1.PodReady) i, curCondition := podutil.GetPodConditionFromList(pod.Status.Conditions, v1.PodReady)
// Only reconcile if "Ready" condition is present // Only reconcile if "Ready" condition is present and Status or Message is not expected
if i >= 0 && curCondition.Status != podReadyCondition.Status { if i >= 0 && (curCondition.Status != podReadyCondition.Status || curCondition.Message != podReadyCondition.Message) {
return true return true
} }
return false return false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment