Merge pull request #17616 from juanvallejo/jvallejo/add-selector-oc-d…

…rain

Automatic merge from submit-queue (batch tested with PRs 17072, 17616).

Add --selector, --pod-selector flags `oc adm drain`

Fixes #17554
Fixes #17563
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1525340

Picks kubernetes/kubernetes#52917, kubernetes/kubernetes#54083, and kubernetes/kubernetes#56864 to bring in `--selector` and `--pod-selector` flag support to `oc adm drain`.

cc @openshift/cli-review @deads2k @dustymabe

contrib/completions/bash/oc

@@ -2454,6 +2454,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+=("--selector=")
     two_word_flags+=("-l")
     local_nonpersistent_flags+=("--selector=")

contrib/completions/zsh/oc

@@ -2596,6 +2596,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+=("--selector=")
     two_word_flags+=("-l")
     local_nonpersistent_flags+=("--selector=")