github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109030 from liggitt/revert-apf-ssa

Browse Source 
Revert "Revert "Merge pull request #107797 from tkashem/revert-107456""
This commit is contained in:
Kubernetes Prow Robot
2022-03-25 19:17:58 -07:00
committed by GitHub
parent 6efd6582df 363a8beaab
commit 6c73b674d7
3 changed files with 114 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/apiserver/apply/reset_fields_test.go
View File

@@ -68,7 +68,11 @@ var resetFieldsStatusData = map[schema.GroupVersionResource]string{
// resetFieldsStatusDefault conflicts with statusDefault
const resetFieldsStatusDefault = `{"status": {"conditions": [{"type": "MyStatus", "status":"False"}]}}`
var resetFieldsSkippedResources = map[string]struct{}{}
var resetFieldsSkippedResources = map[string]struct{}{
// TODO: flowschemas is flaking,
// possible bug in the flowschemas controller.
"flowschemas": {},
}
// noConflicts is the set of reources for which
// a conflict cannot occur.