sync podCondition when probe message of NodePodProbe changed (openkru…

…ise#1479)
ppbits · Jan 11, 2024 · 1eaa0f2 · 1eaa0f2
1 parent 95cf9be
commit 1eaa0f2
Show file tree

Hide file tree

Showing 5 changed files with 839 additions and 2 deletions.
diff --git a/pkg/controller/nodepodprobe/node_pod_probe_controller.go b/pkg/controller/nodepodprobe/node_pod_probe_controller.go
@@ -333,7 +333,7 @@ func (r *ReconcileNodePodProbe) updatePodProbeStatus(pod *corev1.Pod, status app
 		oldStatus := podClone.Status.DeepCopy()
 		for i := range probeConditions {
 			condition := probeConditions[i]
-			util.SetPodCondition(podClone, condition)
+			util.SetPodConditionIfMsgChanged(podClone, condition)
 		}
 		oldMetadata := podClone.ObjectMeta.DeepCopy()
 		if podClone.Annotations == nil {

diff --git a/pkg/util/pods.go b/pkg/util/pods.go
@@ -304,6 +304,18 @@ func SetPodCondition(pod *v1.Pod, condition v1.PodCondition) {
 	pod.Status.Conditions = append(pod.Status.Conditions, condition)
 }
 
+func SetPodConditionIfMsgChanged(pod *v1.Pod, condition v1.PodCondition) {
+	for i, c := range pod.Status.Conditions {
+		if c.Type == condition.Type {
+			if c.Status != condition.Status || c.Message != condition.Message {
+				pod.Status.Conditions[i] = condition
+			}
+			return
+		}
+	}
+	pod.Status.Conditions = append(pod.Status.Conditions, condition)
+}
+
 func SetPodReadyCondition(pod *v1.Pod) {
 	podReady := GetCondition(pod, v1.PodReady)
 	if podReady == nil {