Merge pull request #23178 from sjenning/pick-68767-3.11

UPSTREAM: 68767: Fix drain for evicting terminal DS pods and pods with local storage
openshift · Jun 14, 2019 · 34ef52f · 34ef52f
2 parents 38edb3c + eebe4ea
commit 34ef52f
Show file tree

Hide file tree

Showing 2 changed files with 127 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain_test.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain_test.go