Skip to content

Commit a6bee7d

Browse files
authored
Merge pull request kubernetes#112575 from tkashem/apf-fix-reset-fields-test
apf: don't omit flowschemas from reset fields test
2 parents fd6ee0d + aa04af3 commit a6bee7d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

test/integration/apiserver/apply/reset_fields_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,7 @@ var resetFieldsStatusData = map[schema.GroupVersionResource]string{
7070
// resetFieldsStatusDefault conflicts with statusDefault
7171
const resetFieldsStatusDefault = `{"status": {"conditions": [{"type": "MyStatus", "status":"False"}]}}`
7272

73-
var resetFieldsSkippedResources = map[string]struct{}{
74-
// TODO: flowschemas is flaking,
75-
// possible bug in the flowschemas controller.
76-
"flowschemas": {},
77-
}
73+
var resetFieldsSkippedResources = map[string]struct{}{}
7874

7975
// noConflicts is the set of reources for which
8076
// a conflict cannot occur.

0 commit comments

Comments
 (0)