diff --git a/installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc b/installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc index 28b1d8bba5..53fc842da6 100644 --- a/installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc +++ b/installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc @@ -62,6 +62,8 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] + [id="next-steps_installing-restricted-networks-aws-installer-provisioned"] == Next steps diff --git a/installing/installing_aws/installing-restricted-networks-aws.adoc b/installing/installing_aws/installing-restricted-networks-aws.adoc index 481830dc28..e861194291 100644 --- a/installing/installing_aws/installing-restricted-networks-aws.adoc +++ b/installing/installing_aws/installing-restricted-networks-aws.adoc @@ -145,6 +145,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-aws-user-infra.adoc[leveloffset=+3] diff --git a/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc b/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc index 2f0cea2f34..6ad1b6427b 100644 --- a/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +++ b/installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc @@ -171,6 +171,8 @@ include::modules/installation-operators-config.adoc[leveloffset=+1] * See xref:../../support/troubleshooting/troubleshooting-installations.adoc#installation-bootstrap-gather_troubleshooting-installations[Gathering logs from a failed installation] for details about gathering data in the event of a failed {product-title} installation. * See xref:../../support/troubleshooting/troubleshooting-operator-issues.adoc#troubleshooting-operator-issues[Troubleshooting Operator issues] for steps to check Operator pod health across the cluster and gather Operator logs for diagnosis. +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-change-management-state.adoc[leveloffset=+3] diff --git a/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc b/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc index 0779cd0c41..8c0676707f 100644 --- a/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc +++ b/installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc @@ -55,6 +55,8 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] + [id="next-steps_installing-restricted-networks-gcp-installer-provisioned"] == Next steps diff --git a/installing/installing_gcp/installing-restricted-networks-gcp.adoc b/installing/installing_gcp/installing-restricted-networks-gcp.adoc index 8c39ca7be0..4ff0290957 100644 --- a/installing/installing_gcp/installing-restricted-networks-gcp.adoc +++ b/installing/installing_gcp/installing-restricted-networks-gcp.adoc @@ -96,6 +96,8 @@ include::modules/installation-deployment-manager-worker.adoc[leveloffset=+2] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] + include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-gcp-user-infra-adding-ingress.adoc[leveloffset=+1] diff --git a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc index 564bc6b8ad..ce49449c48 100644 --- a/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc +++ b/installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc @@ -91,6 +91,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-change-management-state.adoc[leveloffset=+3] diff --git a/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc b/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc index ccb6485f50..257ce77d0b 100644 --- a/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc +++ b/installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc @@ -85,6 +85,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-baremetal.adoc[leveloffset=+3] diff --git a/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc b/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc index 61f762b962..716f430a7d 100644 --- a/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc +++ b/installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc @@ -88,6 +88,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-baremetal.adoc[leveloffset=+3] diff --git a/installing/installing_openstack/installing-openstack-installer-restricted.adoc b/installing/installing_openstack/installing-openstack-installer-restricted.adoc index 65ea09447b..0f7fc3ed0a 100644 --- a/installing/installing_openstack/installing-openstack-installer-restricted.adoc +++ b/installing/installing_openstack/installing-openstack-installer-restricted.adoc @@ -39,6 +39,7 @@ include::modules/installation-osp-accessing-api-no-floating.adoc[leveloffset=+2] include::modules/installation-launching-installer.adoc[leveloffset=+1] include::modules/installation-osp-verifying-cluster-status.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] .Next steps diff --git a/installing/installing_platform_agnostic/installing-platform-agnostic.adoc b/installing/installing_platform_agnostic/installing-platform-agnostic.adoc index 8e77a74692..990a1978f0 100644 --- a/installing/installing_platform_agnostic/installing-platform-agnostic.adoc +++ b/installing/installing_platform_agnostic/installing-platform-agnostic.adoc @@ -113,6 +113,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/registry-removed.adoc[leveloffset=+2] include::modules/installation-registry-storage-config.adoc[leveloffset=+2] diff --git a/installing/installing_rhv/installing-rhv-restricted-network.adoc b/installing/installing_rhv/installing-rhv-restricted-network.adoc index 80edd39ad3..3ddd2497a5 100644 --- a/installing/installing_rhv/installing-rhv-restricted-network.adoc +++ b/installing/installing_rhv/installing-rhv-restricted-network.adoc @@ -81,3 +81,5 @@ include::modules/installation-osp-verifying-cluster-status.adoc[leveloffset=+1] include::modules/installation-rhv-removing-bootstrap-machine.adoc[leveloffset=+1] include::modules/installation-rhv-creating-worker-nodes-completing-installation.adoc[leveloffset=+1] + +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] diff --git a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc index 56faa9bb5a..807ed83c11 100644 --- a/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc +++ b/installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc @@ -83,6 +83,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] diff --git a/installing/installing_vmc/installing-restricted-networks-vmc.adoc b/installing/installing_vmc/installing-restricted-networks-vmc.adoc index 9e66ad541f..ff97ae8c16 100644 --- a/installing/installing_vmc/installing-restricted-networks-vmc.adoc +++ b/installing/installing_vmc/installing-restricted-networks-vmc.adoc @@ -59,6 +59,8 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] + [id="installing-vmc-restricted-networks-installer-provisioned-customizations-registry"] == Creating registry storage diff --git a/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc index cbe3565caf..600e83d0f9 100644 --- a/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc @@ -54,6 +54,8 @@ include::modules/cli-installing-cli.adoc[leveloffset=+1] include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+1] + [id="installing-vsphere-restricted-networks-installer-provisioned-customizations-registry"] == Creating registry storage diff --git a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc index 694c4ca75b..ea66497548 100644 --- a/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc +++ b/installing/installing_vsphere/installing-restricted-networks-vsphere.adoc @@ -90,6 +90,8 @@ include::modules/installation-approve-csrs.adoc[leveloffset=+1] include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/olm-restricted-networks-configuring-operatorhub.adoc[leveloffset=+2] + include::modules/installation-registry-storage-config.adoc[leveloffset=+2] include::modules/registry-configuring-storage-vsphere.adoc[leveloffset=+3] diff --git a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc index d3d21c9c46..dff371366f 100644 --- a/installing/installing_vsphere/installing-vsphere-network-customizations.adoc +++ b/installing/installing_vsphere/installing-vsphere-network-customizations.adoc @@ -77,7 +77,7 @@ include::modules/cli-logging-in-kubeadmin.adoc[leveloffset=+1] include::modules/installation-approve-csrs.adoc[leveloffset=+1] -include::modules/installation-operators-config.adoc[leveloffset=+1] +include::modules/installation-operators-config.adoc[leveloffset=+2] include::modules/registry-removed.adoc[leveloffset=+2] diff --git a/modules/olm-restricted-networks-configuring-operatorhub.adoc b/modules/olm-restricted-networks-configuring-operatorhub.adoc index 43fe163e21..698afedb57 100644 --- a/modules/olm-restricted-networks-configuring-operatorhub.adoc +++ b/modules/olm-restricted-networks-configuring-operatorhub.adoc @@ -1,5 +1,20 @@ // Module included in the following assemblies: // +// * installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc +// * installing/installing_aws/installing-restricted-networks-aws.adoc +// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc +// * installing/installing_gcp/installing-restricted-networks-gcp-installer-provisioned.adoc +// * installing/installing_gcp/installing-restricted-networks-gcp.adoc +// * installing/installing_ibm_power/installing-restricted-networks-ibm-power.adoc +// * installing/installing_ibm_z/installing-restricted-networks-ibm-z-kvm.adoc +// * installing/installing_ibm_z/installing-restricted-networks-ibm-z.adoc +// * installing/installing_openstack/installing-openstack-installer-restricted.adoc +// * installing/installing_platform_agnostic/installing-platform-agnostic.adoc +// * installing/installing_rhv/installing-rhv-restricted-network.adoc +// * installing/installing_vmc/installing-restricted-networks-vmc-user-infra.adoc +// * installing/installing_vmc/installing-restricted-networks-vmc.adoc +// * installing/installing_vsphere/installing-restricted-networks-installer-provisioned-vsphere.adoc +// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc // * operators/admin/olm-restricted-networks.adoc // * operators/admin/olm-managing-custom-catalogs.adoc @@ -14,8 +29,11 @@ endif::[] = Disabling the default OperatorHub sources Operator catalogs that source content provided by Red Hat and community projects are configured for OperatorHub by default during an {product-title} installation. +ifndef::olm-managing-custom-catalogs[] +In a restricted network environment, you must disable the default catalogs as a cluster administrator. +endif::[] ifdef::olm-restricted-networks[] -Before configuring OperatorHub to instead use local catalog sources in a restricted network environment, you must disable the default catalogs as a cluster administrator. +You can then configure OperatorHub to use local catalog sources. endif::[] ifdef::olm-managing-custom-catalogs[] As a cluster administrator, you can disable the set of default catalogs.