UPSTREAM: 65856: only need to ignore resources that match discovery c…

…onditions
openshift · Jul 6, 2018 · ea4219f · ea4219f
1 parent ad9cd87
commit ea4219f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/options/options_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/graph_builder.go
diff --git a/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go b/vendor/k8s.io/kubernetes/pkg/quota/install/registry.go