Skip to content

Commit 96d4c20

Browse files
authored
Merge pull request #29546 from skrthomas/BZ1839983
BZ1839983: Added a warning and additional resource for mirroring addi…
2 parents 06a3b11 + 2b096ac commit 96d4c20

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

installing/install_config/installing-restricted-networks-preparations.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ include::modules/installation-restricted-network-samples.adoc[leveloffset=+1]
5555

5656
include::modules/installation-images-samples-disconnected-mirroring-assist.adoc[leveloffset=+2]
5757

58-
See xref:../install_config/installing-restricted-networks-preparations.adoc#installation-restricted-network-samples_installing-restricted-networks-preparations[Using Cluster Samples Operator image streams with alternate or mirrored registries] for a detailed procedure.
59-
60-
6158

6259
== Next steps
6360

@@ -66,3 +63,8 @@ See xref:../install_config/installing-restricted-networks-preparations.adoc#inst
6663
* Install a cluster on infrastructure that you provision in your restricted nework, such as on
6764
xref:../../installing/installing_vsphere/installing-restricted-networks-vsphere.adoc#installing-restricted-networks-vsphere[VMware vSphere],
6865
xref:../../installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc#installing-restricted-networks-bare-metal[bare metal], or xref:../../installing/installing_aws/installing-restricted-networks-aws.adoc#installing-restricted-networks-aws[Amazon Web Services].
66+
67+
[id="restricted-networks-additional-resources"]
68+
== Additional resources
69+
70+
* See xref:../../support/gathering-cluster-data.adoc#gathering-data-specific-features_gathering-cluster-data[Gathering data about specific features] for more information about using must-gather.

modules/installation-mirror-repository.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,6 @@ that you selected, you must extract the installation program from the mirrored
183183
content.
184184
185185
You must perform this step on a machine with an active Internet connection.
186+
187+
If you are in a disconnected environment, use the `--image` flag as part of must-gather and point to the payload image.
186188
====

modules/installation-preparing-restricted-cluster-to-gather-support-data.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ Clusters using a restricted network must import the default must-gather image in
99

1010
.Procedure
1111

12-
. Import the default must-gather image from your installation payload:
12+
* Import the default must-gather image from your installation payload:
1313
+
1414
[source,terminal]
1515
----
1616
$ oc import-image is/must-gather -n openshift
1717
----
18+
19+
When running the `oc adm must-gather` command, use the `--image` flag and point to the payload image, as in the following example:
20+
[source,terminal]
21+
----
22+
$ oc adm must-gather --image=$(oc adm release info --image-for must-gather)
23+
----

0 commit comments

Comments
 (0)