sync podCondition when probe message of NodePodProbe changed

Signed-off-by: ChrisLiu <[email protected]>

Author: chrisliu1995

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 {

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 {

pkg/util/pods_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package util
 
 import (
+	"reflect"
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
@@ -102,3 +103,249 @@ func TestMergeVolumes(t *testing.T) {
 		}
 	}
 }
+
+func TestSetPodConditionIfMsgChanged(t *testing.T) {
+	tests := []struct {
+		pod        *v1.Pod
+		condition  v1.PodCondition
+		conditions []v1.PodCondition
+	}{
+		// case 0: existed condition status changed
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:   "type-0",
+				Status: v1.ConditionFalse,
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:   "type-0",
+					Status: v1.ConditionFalse,
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+
+		// case 1: add a new condition
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:   "type-2",
+				Status: v1.ConditionFalse,
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:    "type-0",
+					Status:  v1.ConditionTrue,
+					Message: "Msg-0",
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+				{
+					Type:   "type-2",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+
+		// case 2: existed condition status not changed, but message changed
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:    "type-0",
+				Status:  v1.ConditionTrue,
+				Message: "Msg-Changed",
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:    "type-0",
+					Status:  v1.ConditionTrue,
+					Message: "Msg-Changed",
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+	}
+
+	for i, test := range tests {
+		expect := test.conditions
+		SetPodConditionIfMsgChanged(test.pod, test.condition)
+		actual := test.pod.Status.Conditions
+		if !reflect.DeepEqual(expect, actual) {
+			t.Fatalf("case %d: expect Conditions(%s), but get %s", i, expect, actual)
+		}
+	}
+}
+
+func TestSetPodCondition(t *testing.T) {
+	tests := []struct {
+		pod        *v1.Pod
+		condition  v1.PodCondition
+		conditions []v1.PodCondition
+	}{
+		// case 0: existed condition status changed
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:   "type-0",
+				Status: v1.ConditionFalse,
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:   "type-0",
+					Status: v1.ConditionFalse,
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+
+		// case 1: add a new condition
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:   "type-2",
+				Status: v1.ConditionFalse,
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:    "type-0",
+					Status:  v1.ConditionTrue,
+					Message: "Msg-0",
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+				{
+					Type:   "type-2",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+
+		// case 2: existed condition status not changed, message should not be changed
+		{
+			pod: &v1.Pod{
+				Status: v1.PodStatus{
+					Conditions: []v1.PodCondition{
+						{
+							Type:    "type-0",
+							Status:  v1.ConditionTrue,
+							Message: "Msg-0",
+						},
+						{
+							Type:   "type-1",
+							Status: v1.ConditionFalse,
+						},
+					},
+				},
+			},
+			condition: v1.PodCondition{
+				Type:    "type-0",
+				Status:  v1.ConditionTrue,
+				Message: "Msg-Changed",
+			},
+			conditions: []v1.PodCondition{
+				{
+					Type:    "type-0",
+					Status:  v1.ConditionTrue,
+					Message: "Msg-0",
+				},
+				{
+					Type:   "type-1",
+					Status: v1.ConditionFalse,
+				},
+			},
+		},
+	}
+
+	for i, test := range tests {
+		expect := test.conditions
+		SetPodCondition(test.pod, test.condition)
+		actual := test.pod.Status.Conditions
+		if !reflect.DeepEqual(expect, actual) {
+			t.Fatalf("case %d: expect Conditions(%s), but get %s", i, expect, actual)
+		}
+	}
+}