crdupgradesafety: fix to ignore diffs in child items

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

internal/operator-controller/rukpak/preflights/crdupgradesafety/change_validator.go

@@ -154,8 +154,8 @@ func CalculateFlatSchemaDiff(o, n FlatSchema) (map[string]FieldDiff, error) {
 		// we should still detect changes in the children fields.
 		oldCopy := schema.DeepCopy()
 		newCopy := newSchema.DeepCopy()
-		oldCopy.Properties = nil
-		newCopy.Properties = nil
+		oldCopy.Properties, oldCopy.Items = nil, nil
+		newCopy.Properties, newCopy.Items = nil, nil
 		if !reflect.DeepEqual(oldCopy, newCopy) {
 			diffMap[field] = FieldDiff{
 				Old: oldCopy,

internal/operator-controller/rukpak/preflights/crdupgradesafety/change_validator_test.go

@@ -68,6 +68,20 @@ func TestCalculateFlatSchemaDiff(t *testing.T) {
 			},
 			expectedDiff: map[string]crdupgradesafety.FieldDiff{},
 		},
+		{
+			name: "diff in child items only, no diff returned, no error",
+			old: crdupgradesafety.FlatSchema{
+				"foo": &apiextensionsv1.JSONSchemaProps{
+					Items: &apiextensionsv1.JSONSchemaPropsOrArray{Schema: &apiextensionsv1.JSONSchemaProps{ID: "bar"}},
+				},
+			},
+			new: crdupgradesafety.FlatSchema{
+				"foo": &apiextensionsv1.JSONSchemaProps{
+					Items: &apiextensionsv1.JSONSchemaPropsOrArray{Schema: &apiextensionsv1.JSONSchemaProps{ID: "baz"}},
+				},
+			},
+			expectedDiff: map[string]crdupgradesafety.FieldDiff{},
+		},
 		{
 			name: "field exists in old but not new, no diff returned, error",
 			old: crdupgradesafety.FlatSchema{