github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112575 from tkashem/apf-fix-reset-fields-test

Browse Source 
apf: don't omit flowschemas from reset fields test
This commit is contained in:
Kubernetes Prow Robot 2022-10-03 13:20:13 -07:00 committed by GitHub
commit a6bee7d5fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,11 +70,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.