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

Merge pull request #108383 from tkashem/revert

Browse Source 
Revert the revert of #107456 - "apf: change controller to use SSA for patches"
This commit is contained in:
Kubernetes Prow Robot
2022-03-21 22:09:43 -07:00
committed by GitHub
parent 0053a0e0fd b0b460921b
commit 9a8defda15
3 changed files with 19 additions and 114 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,11 +68,7 @@ var resetFieldsStatusData = map[schema.GroupVersionResource]string{
// resetFieldsStatusDefault conflicts with statusDefault
const resetFieldsStatusDefault = `{"status": {"conditions": [{"type": "MyStatus", "status":"False"}]}}`
var resetFieldsSkippedResources = map[string]struct{}{
// TODO: flowschemas is flaking,
// possible bug in the flowschemas controller.
"flowschemas": {},
}
var resetFieldsSkippedResources = map[string]struct{}{}
// noConflicts is the set of reources for which
// a conflict cannot occur.