Skip to content

Commit

Permalink
Merge pull request #16333 from juanvallejo/jvallejo/add-dry-run-flag-…
Browse files Browse the repository at this point in the history
…oadm-drain

Automatic merge from submit-queue.

UPSTREAM: 52440: add --dry-run option -> oadm <drain,cordon,uncordon>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1491346

Adds a `--dry-run` flag to `oc adm <cordon, uncordon, drain>`

cc @openshift/cli-review
  • Loading branch information
openshift-merge-robot committed Oct 17, 2017
2 parents a4c55f6 + 7033a5f commit 80f9cb3
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 34 deletions.
6 changes: 6 additions & 0 deletions contrib/completions/bash/oadm
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,8 @@ _oadm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2124,6 +2126,8 @@ _oadm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5387,6 +5391,8 @@ _oadm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
6 changes: 6 additions & 0 deletions contrib/completions/bash/oc
Original file line number Diff line number Diff line change
Expand Up @@ -1704,6 +1704,8 @@ _oc_adm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2289,6 +2291,8 @@ _oc_adm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5552,6 +5556,8 @@ _oc_adm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
18 changes: 18 additions & 0 deletions contrib/completions/bash/openshift
Original file line number Diff line number Diff line change
Expand Up @@ -1539,6 +1539,8 @@ _openshift_admin_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2124,6 +2126,8 @@ _openshift_admin_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5387,6 +5391,8 @@ _openshift_admin_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -6863,6 +6869,8 @@ _openshift_cli_adm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -7448,6 +7456,8 @@ _openshift_cli_adm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -10711,6 +10721,8 @@ _openshift_cli_adm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -26752,6 +26764,8 @@ _openshift_kube_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -29020,6 +29034,8 @@ _openshift_kube_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -32355,6 +32371,8 @@ _openshift_kube_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
6 changes: 6 additions & 0 deletions contrib/completions/zsh/oadm
Original file line number Diff line number Diff line change
Expand Up @@ -1688,6 +1688,8 @@ _oadm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2273,6 +2275,8 @@ _oadm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5536,6 +5540,8 @@ _oadm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
6 changes: 6 additions & 0 deletions contrib/completions/zsh/oc
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,8 @@ _oc_adm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2438,6 +2440,8 @@ _oc_adm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5701,6 +5705,8 @@ _oc_adm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
18 changes: 18 additions & 0 deletions contrib/completions/zsh/openshift
Original file line number Diff line number Diff line change
Expand Up @@ -1688,6 +1688,8 @@ _openshift_admin_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -2273,6 +2275,8 @@ _openshift_admin_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -5536,6 +5540,8 @@ _openshift_admin_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -7012,6 +7018,8 @@ _openshift_cli_adm_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -7597,6 +7605,8 @@ _openshift_cli_adm_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -10860,6 +10870,8 @@ _openshift_cli_adm_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -26901,6 +26913,8 @@ _openshift_kube_cordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down Expand Up @@ -29169,6 +29183,8 @@ _openshift_kube_drain()

flags+=("--delete-local-data")
local_nonpersistent_flags+=("--delete-local-data")
flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--force")
local_nonpersistent_flags+=("--force")
flags+=("--grace-period=")
Expand Down Expand Up @@ -32504,6 +32520,8 @@ _openshift_kube_uncordon()
flags_with_completion=()
flags_completion=()

flags+=("--dry-run")
local_nonpersistent_flags+=("--dry-run")
flags+=("--as=")
flags+=("--as-group=")
flags+=("--certificate-authority=")
Expand Down
Loading

0 comments on commit 80f9cb3

Please sign in to comment.