Skip to content

Commit d8c46e4

Browse files
authoredDec 21, 2017
Merge pull request #17616 from juanvallejo/jvallejo/add-selector-oc-drain
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
2 parents f37047b + 9f49283 commit d8c46e4

File tree

3 files changed

+34
-51
lines changed
  • contrib/completions
  • vendor/k8s.io/kubernetes/pkg/kubectl/cmd

3 files changed

+34
-51
lines changed
 

‎contrib/completions/bash/oc

+2
Original file line numberDiff line numberDiff line change
@@ -2454,6 +2454,8 @@ _oc_adm_drain()
24542454
local_nonpersistent_flags+=("--grace-period=")
24552455
flags+=("--ignore-daemonsets")
24562456
local_nonpersistent_flags+=("--ignore-daemonsets")
2457+
flags+=("--pod-selector=")
2458+
local_nonpersistent_flags+=("--pod-selector=")
24572459
flags+=("--selector=")
24582460
two_word_flags+=("-l")
24592461
local_nonpersistent_flags+=("--selector=")

‎contrib/completions/zsh/oc

+2
Original file line numberDiff line numberDiff line change
@@ -2596,6 +2596,8 @@ _oc_adm_drain()
25962596
local_nonpersistent_flags+=("--grace-period=")
25972597
flags+=("--ignore-daemonsets")
25982598
local_nonpersistent_flags+=("--ignore-daemonsets")
2599+
flags+=("--pod-selector=")
2600+
local_nonpersistent_flags+=("--pod-selector=")
25992601
flags+=("--selector=")
26002602
two_word_flags+=("-l")
26012603
local_nonpersistent_flags+=("--selector=")

‎vendor/k8s.io/kubernetes/pkg/kubectl/cmd/drain.go

+30-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.