Revert "Merge pull request openshift#24207 from deads2k/scrub-well-kn…

…own" This reverts commit d16a7be, reversing changes made to 369a26a.
deads2k · Dec 13, 2019 · b0acd13 · b0acd13
1 parent 48f0aeb
commit b0acd13
Show file tree

Hide file tree

Showing 7 changed files with 234 additions and 80 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/patch_openshift.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/patch_openshift.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go
diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/discovery.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/discovery.go
diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/discovery_test.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/discovery_test.go
diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/nonapiserver.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/nonapiserver.go