Skip to content

Commit e409377

Browse files
authored
Merge pull request #95637 from shdeshpa07/OADP-6216-must-gather-4.15-4.14
must-gather on oadp 1.4 for ocp 4.15 4.14
2 parents 6b93627 + 052d26f commit e409377

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

modules/using-must-gather.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ $ oc adm must-gather --image={must-gather-v1-3} -- /usr/bin/gather --request-tim
5555
+
5656
[source,terminal,subs="attributes+"]
5757
----
58-
$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather_with_timeout <timeout> # <1>
58+
$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather --request-timeout 1m # <1>
5959
----
60-
<1> Specify a timeout value in seconds.
60+
<1> In this example, the timeout is 1 minute.
6161

6262
* To use the insecure TLS connection flag with the `must-gather` tool, run one of the following commands:
6363
@@ -72,9 +72,8 @@ $ oc adm must-gather --image={must-gather-v1-3} -- /usr/bin/gather --skip-tls
7272
+
7373
[source,terminal,subs="attributes+"]
7474
----
75-
$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather_without_tls <value> # <1>
75+
$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather --skip-tls
7676
----
77-
<1> By default, the value is `false`. Set to `true` to allow insecure TLS connections.
7877

7978
* To use a combination of the insecure TLS connection, and the timeout flags with the `must-gather` tool, run one of the following commands:
8079
@@ -90,9 +89,9 @@ $ oc adm must-gather --image={must-gather-v1-3} -- /usr/bin/gather --request-tim
9089
+
9190
[source,terminal,subs="attributes+"]
9291
----
93-
$ oc adm must-gather --image={must-gather-v1-4} --skip_tls=true /usr/bin/gather_with_timeout <timeout_value_in_seconds> #<1>
92+
$ oc adm must-gather --image={must-gather-v1-4} -- /usr/bin/gather --request-timeout 15s --skip-tls #<1>
9493
----
95-
<1> By default, the `--skip-tls` flag value is `false`. Set the value to `true` to allow insecure TLS connections. Specify a timeout value.
94+
<1> In this example, the timeout is 15 seconds. By default, the `--skip-tls` flag value is `false`. Set the value to `true` to allow insecure TLS connections.
9695

9796
.Verification
9897

0 commit comments

Comments
 (0)