Merge pull request #17868 from juanvallejo/jvallejo/pick-17616-pod-se…

…lector Automatic merge from submit-queue. Pick 17616: Add --selector, --pod-selector flags `oc adm drain` UPSTREAM kubernetes/kubernetes#56864 Pick of #17616 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525340 cc @mfojtik @deads2k @soltysh
openshift · Jan 8, 2018 · 91f500a · 91f500a
2 parents 63be508 + 67ed27a
commit 91f500a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 51 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
@@ -2447,6 +2447,8 @@ _oc_adm_drain()
     local_nonpersistent_flags+=("--grace-period=")
     flags+=("--ignore-daemonsets")
     local_nonpersistent_flags+=("--ignore-daemonsets")
+    flags+=("--pod-selector=")
+    local_nonpersistent_flags+=("--pod-selector=")
     flags+=("--timeout=")
     local_nonpersistent_flags+=("--timeout=")
     flags+=("--as=")

diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
@@ -2589,6 +2589,8 @@ _oc_adm_drain()
     local_nonpersistent_flags+=("--grace-period=")
     flags+=("--ignore-daemonsets")
     local_nonpersistent_flags+=("--ignore-daemonsets")
+    flags+=("--pod-selector=")
+    local_nonpersistent_flags+=("--pod-selector=")
     flags+=("--timeout=")
     local_nonpersistent_flags+=("--timeout=")
     flags+=("--as=")

diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go