Skip to content

Commit 80f9cb3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16333 from juanvallejo/jvallejo/add-dry-run-flag-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
2 parents a4c55f6 + 7033a5f commit 80f9cb3

File tree

8 files changed

+129
-34
lines changed

8 files changed

+129
-34
lines changed

‎contrib/completions/bash/oadm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,6 +1539,8 @@ _oadm_cordon()
15391539
flags_with_completion=()
15401540
flags_completion=()
15411541

1542+
flags+=("--dry-run")
1543+
local_nonpersistent_flags+=("--dry-run")
15421544
flags+=("--as=")
15431545
flags+=("--as-group=")
15441546
flags+=("--certificate-authority=")
@@ -2124,6 +2126,8 @@ _oadm_drain()
21242126

21252127
flags+=("--delete-local-data")
21262128
local_nonpersistent_flags+=("--delete-local-data")
2129+
flags+=("--dry-run")
2130+
local_nonpersistent_flags+=("--dry-run")
21272131
flags+=("--force")
21282132
local_nonpersistent_flags+=("--force")
21292133
flags+=("--grace-period=")
@@ -5387,6 +5391,8 @@ _oadm_uncordon()
53875391
flags_with_completion=()
53885392
flags_completion=()
53895393

5394+
flags+=("--dry-run")
5395+
local_nonpersistent_flags+=("--dry-run")
53905396
flags+=("--as=")
53915397
flags+=("--as-group=")
53925398
flags+=("--certificate-authority=")

‎contrib/completions/bash/oc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,8 @@ _oc_adm_cordon()
17041704
flags_with_completion=()
17051705
flags_completion=()
17061706

1707+
flags+=("--dry-run")
1708+
local_nonpersistent_flags+=("--dry-run")
17071709
flags+=("--as=")
17081710
flags+=("--as-group=")
17091711
flags+=("--certificate-authority=")
@@ -2289,6 +2291,8 @@ _oc_adm_drain()
22892291

22902292
flags+=("--delete-local-data")
22912293
local_nonpersistent_flags+=("--delete-local-data")
2294+
flags+=("--dry-run")
2295+
local_nonpersistent_flags+=("--dry-run")
22922296
flags+=("--force")
22932297
local_nonpersistent_flags+=("--force")
22942298
flags+=("--grace-period=")
@@ -5552,6 +5556,8 @@ _oc_adm_uncordon()
55525556
flags_with_completion=()
55535557
flags_completion=()
55545558

5559+
flags+=("--dry-run")
5560+
local_nonpersistent_flags+=("--dry-run")
55555561
flags+=("--as=")
55565562
flags+=("--as-group=")
55575563
flags+=("--certificate-authority=")

‎contrib/completions/bash/openshift

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,6 +1539,8 @@ _openshift_admin_cordon()
15391539
flags_with_completion=()
15401540
flags_completion=()
15411541

1542+
flags+=("--dry-run")
1543+
local_nonpersistent_flags+=("--dry-run")
15421544
flags+=("--as=")
15431545
flags+=("--as-group=")
15441546
flags+=("--certificate-authority=")
@@ -2124,6 +2126,8 @@ _openshift_admin_drain()
21242126

21252127
flags+=("--delete-local-data")
21262128
local_nonpersistent_flags+=("--delete-local-data")
2129+
flags+=("--dry-run")
2130+
local_nonpersistent_flags+=("--dry-run")
21272131
flags+=("--force")
21282132
local_nonpersistent_flags+=("--force")
21292133
flags+=("--grace-period=")
@@ -5387,6 +5391,8 @@ _openshift_admin_uncordon()
53875391
flags_with_completion=()
53885392
flags_completion=()
53895393

5394+
flags+=("--dry-run")
5395+
local_nonpersistent_flags+=("--dry-run")
53905396
flags+=("--as=")
53915397
flags+=("--as-group=")
53925398
flags+=("--certificate-authority=")
@@ -6863,6 +6869,8 @@ _openshift_cli_adm_cordon()
68636869
flags_with_completion=()
68646870
flags_completion=()
68656871

6872+
flags+=("--dry-run")
6873+
local_nonpersistent_flags+=("--dry-run")
68666874
flags+=("--as=")
68676875
flags+=("--as-group=")
68686876
flags+=("--certificate-authority=")
@@ -7448,6 +7456,8 @@ _openshift_cli_adm_drain()
74487456

74497457
flags+=("--delete-local-data")
74507458
local_nonpersistent_flags+=("--delete-local-data")
7459+
flags+=("--dry-run")
7460+
local_nonpersistent_flags+=("--dry-run")
74517461
flags+=("--force")
74527462
local_nonpersistent_flags+=("--force")
74537463
flags+=("--grace-period=")
@@ -10711,6 +10721,8 @@ _openshift_cli_adm_uncordon()
1071110721
flags_with_completion=()
1071210722
flags_completion=()
1071310723

10724+
flags+=("--dry-run")
10725+
local_nonpersistent_flags+=("--dry-run")
1071410726
flags+=("--as=")
1071510727
flags+=("--as-group=")
1071610728
flags+=("--certificate-authority=")
@@ -26752,6 +26764,8 @@ _openshift_kube_cordon()
2675226764
flags_with_completion=()
2675326765
flags_completion=()
2675426766

26767+
flags+=("--dry-run")
26768+
local_nonpersistent_flags+=("--dry-run")
2675526769
flags+=("--as=")
2675626770
flags+=("--as-group=")
2675726771
flags+=("--certificate-authority=")
@@ -29020,6 +29034,8 @@ _openshift_kube_drain()
2902029034

2902129035
flags+=("--delete-local-data")
2902229036
local_nonpersistent_flags+=("--delete-local-data")
29037+
flags+=("--dry-run")
29038+
local_nonpersistent_flags+=("--dry-run")
2902329039
flags+=("--force")
2902429040
local_nonpersistent_flags+=("--force")
2902529041
flags+=("--grace-period=")
@@ -32355,6 +32371,8 @@ _openshift_kube_uncordon()
3235532371
flags_with_completion=()
3235632372
flags_completion=()
3235732373

32374+
flags+=("--dry-run")
32375+
local_nonpersistent_flags+=("--dry-run")
3235832376
flags+=("--as=")
3235932377
flags+=("--as-group=")
3236032378
flags+=("--certificate-authority=")

‎contrib/completions/zsh/oadm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,8 @@ _oadm_cordon()
16881688
flags_with_completion=()
16891689
flags_completion=()
16901690

1691+
flags+=("--dry-run")
1692+
local_nonpersistent_flags+=("--dry-run")
16911693
flags+=("--as=")
16921694
flags+=("--as-group=")
16931695
flags+=("--certificate-authority=")
@@ -2273,6 +2275,8 @@ _oadm_drain()
22732275

22742276
flags+=("--delete-local-data")
22752277
local_nonpersistent_flags+=("--delete-local-data")
2278+
flags+=("--dry-run")
2279+
local_nonpersistent_flags+=("--dry-run")
22762280
flags+=("--force")
22772281
local_nonpersistent_flags+=("--force")
22782282
flags+=("--grace-period=")
@@ -5536,6 +5540,8 @@ _oadm_uncordon()
55365540
flags_with_completion=()
55375541
flags_completion=()
55385542

5543+
flags+=("--dry-run")
5544+
local_nonpersistent_flags+=("--dry-run")
55395545
flags+=("--as=")
55405546
flags+=("--as-group=")
55415547
flags+=("--certificate-authority=")

‎contrib/completions/zsh/oc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,6 +1853,8 @@ _oc_adm_cordon()
18531853
flags_with_completion=()
18541854
flags_completion=()
18551855

1856+
flags+=("--dry-run")
1857+
local_nonpersistent_flags+=("--dry-run")
18561858
flags+=("--as=")
18571859
flags+=("--as-group=")
18581860
flags+=("--certificate-authority=")
@@ -2438,6 +2440,8 @@ _oc_adm_drain()
24382440

24392441
flags+=("--delete-local-data")
24402442
local_nonpersistent_flags+=("--delete-local-data")
2443+
flags+=("--dry-run")
2444+
local_nonpersistent_flags+=("--dry-run")
24412445
flags+=("--force")
24422446
local_nonpersistent_flags+=("--force")
24432447
flags+=("--grace-period=")
@@ -5701,6 +5705,8 @@ _oc_adm_uncordon()
57015705
flags_with_completion=()
57025706
flags_completion=()
57035707

5708+
flags+=("--dry-run")
5709+
local_nonpersistent_flags+=("--dry-run")
57045710
flags+=("--as=")
57055711
flags+=("--as-group=")
57065712
flags+=("--certificate-authority=")

‎contrib/completions/zsh/openshift

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,8 @@ _openshift_admin_cordon()
16881688
flags_with_completion=()
16891689
flags_completion=()
16901690

1691+
flags+=("--dry-run")
1692+
local_nonpersistent_flags+=("--dry-run")
16911693
flags+=("--as=")
16921694
flags+=("--as-group=")
16931695
flags+=("--certificate-authority=")
@@ -2273,6 +2275,8 @@ _openshift_admin_drain()
22732275

22742276
flags+=("--delete-local-data")
22752277
local_nonpersistent_flags+=("--delete-local-data")
2278+
flags+=("--dry-run")
2279+
local_nonpersistent_flags+=("--dry-run")
22762280
flags+=("--force")
22772281
local_nonpersistent_flags+=("--force")
22782282
flags+=("--grace-period=")
@@ -5536,6 +5540,8 @@ _openshift_admin_uncordon()
55365540
flags_with_completion=()
55375541
flags_completion=()
55385542

5543+
flags+=("--dry-run")
5544+
local_nonpersistent_flags+=("--dry-run")
55395545
flags+=("--as=")
55405546
flags+=("--as-group=")
55415547
flags+=("--certificate-authority=")
@@ -7012,6 +7018,8 @@ _openshift_cli_adm_cordon()
70127018
flags_with_completion=()
70137019
flags_completion=()
70147020

7021+
flags+=("--dry-run")
7022+
local_nonpersistent_flags+=("--dry-run")
70157023
flags+=("--as=")
70167024
flags+=("--as-group=")
70177025
flags+=("--certificate-authority=")
@@ -7597,6 +7605,8 @@ _openshift_cli_adm_drain()
75977605

75987606
flags+=("--delete-local-data")
75997607
local_nonpersistent_flags+=("--delete-local-data")
7608+
flags+=("--dry-run")
7609+
local_nonpersistent_flags+=("--dry-run")
76007610
flags+=("--force")
76017611
local_nonpersistent_flags+=("--force")
76027612
flags+=("--grace-period=")
@@ -10860,6 +10870,8 @@ _openshift_cli_adm_uncordon()
1086010870
flags_with_completion=()
1086110871
flags_completion=()
1086210872

10873+
flags+=("--dry-run")
10874+
local_nonpersistent_flags+=("--dry-run")
1086310875
flags+=("--as=")
1086410876
flags+=("--as-group=")
1086510877
flags+=("--certificate-authority=")
@@ -26901,6 +26913,8 @@ _openshift_kube_cordon()
2690126913
flags_with_completion=()
2690226914
flags_completion=()
2690326915

26916+
flags+=("--dry-run")
26917+
local_nonpersistent_flags+=("--dry-run")
2690426918
flags+=("--as=")
2690526919
flags+=("--as-group=")
2690626920
flags+=("--certificate-authority=")
@@ -29169,6 +29183,8 @@ _openshift_kube_drain()
2916929183

2917029184
flags+=("--delete-local-data")
2917129185
local_nonpersistent_flags+=("--delete-local-data")
29186+
flags+=("--dry-run")
29187+
local_nonpersistent_flags+=("--dry-run")
2917229188
flags+=("--force")
2917329189
local_nonpersistent_flags+=("--force")
2917429190
flags+=("--grace-period=")
@@ -32504,6 +32520,8 @@ _openshift_kube_uncordon()
3250432520
flags_with_completion=()
3250532521
flags_completion=()
3250632522

32523+
flags+=("--dry-run")
32524+
local_nonpersistent_flags+=("--dry-run")
3250732525
flags+=("--as=")
3250832526
flags+=("--as-group=")
3250932527
flags+=("--certificate-authority=")

0 commit comments

Comments
 (0)