Merge pull request kubernetes#131559 from jpbetz/fix-unstructured-to-val-equality

Fix UnstructuredToVal map equality to respect nil fields

Author: k8s-ci-robot

staging/src/k8s.io/apiserver/pkg/cel/common/values_test.go

@@ -318,6 +318,16 @@ func TestToValue(t *testing.T) {
 				"s2": struct2,
 			},
 		},
+		{
+			name:       "compare: identical complex structs",
+			expression: "c1 == c2",
+			activation: map[string]typedValue{"c1": complex1, "c2": complex1Again},
+		},
+		{
+			name:       "compare: different complex structs",
+			expression: "c1 != c2",
+			activation: map[string]typedValue{"c1": complex1, "c2": complex2},
+		},
 		{
 			name:       "compare: struct and pointer to identical struct",
 			expression: "s1 == s1_ptr",

staging/src/k8s.io/apiserver/pkg/cel/common/valuesunstructured.go

@@ -598,13 +598,17 @@ func (t *unstructuredMap) Equal(other ref.Val) ref.Val {
 	if t.Size() != oMap.Size() {
 		return types.False
 	}
+
 	for key, value := range t.value {
-		if propSchema, ok := t.propSchema(key); ok {
-			ov, found := oMap.Find(types.String(key))
-			if !found {
+		if _, ok := t.propSchema(key); ok {
+			v, found := t.Find(types.String(key))
+			ov, oFound := oMap.Find(types.String(key))
+			if found != oFound {
 				return types.False
 			}
-			v := UnstructuredToVal(value, propSchema)
+			if !found {
+				continue
+			}
 			vEq := v.Equal(ov)
 			if vEq != types.True {
 				return vEq // either false or error