Merge pull request openshift#22429 from deads2k/ns-controller

UPSTREAM: 75785: add annotation from namespace controller to indicate…
FyreNet · Apr 8, 2019 · 5678258 · 5678258
2 parents 849f38a + 423816e
commit 5678258
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 44 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/namespace/deletion/namespaced_resources_deleter.go b/vendor/k8s.io/kubernetes/pkg/controller/namespace/deletion/namespaced_resources_deleter.go
diff --git a/.../k8s.io/kubernetes/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go b/.../k8s.io/kubernetes/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go