From 13308e45bbde6bf9348e2c22002a2f00bdf4c494 Mon Sep 17 00:00:00 2001 From: Brendan Daly Date: Thu, 10 Jul 2025 11:44:13 +0100 Subject: [PATCH] OSDOCS-15248:combining assemblies --- _topic_maps/_topic_map.yml | 2 -- .../ipi/installing-azure-customizations.adoc | 28 ++++++++++++++++++- .../ipi/installing-azure-preparing-ipi.adoc | 1 - .../preparing-to-install-on-azure.adoc | 2 +- installing/overview/installing-preparing.adoc | 10 +++---- modules/cco-ccoctl-configuring.adoc | 7 ----- modules/cco-ccoctl-creating-at-once.adoc | 7 ----- ...cco-ccoctl-install-creating-manifests.adoc | 7 ----- modules/cluster-entitlements.adoc | 1 - modules/cluster-telemetry.adoc | 1 - modules/configuring-hybrid-ovnkubernetes.adoc | 1 - ...lation-azure-arm-tested-machine-types.adoc | 1 - modules/installation-azure-config-yaml.adoc | 23 ++++----------- ...tallation-azure-finalizing-encryption.adoc | 1 - ...stallation-azure-tested-machine-types.adoc | 1 - modules/installation-configure-proxy.adoc | 1 - ...llation-minimum-resource-requirements.adoc | 1 - .../nw-modifying-operator-install-config.adoc | 1 - modules/nw-network-config.adoc | 1 - modules/nw-operator-cr.adoc | 1 - .../configuring-hybrid-networking.adoc | 2 +- 21 files changed, 40 insertions(+), 60 deletions(-) diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index d84204cc0f..a413c9fe50 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -265,8 +265,6 @@ Topics: File: installing-azure-default - Name: Installing a cluster with customizations File: installing-azure-customizations - - Name: Installing a cluster with network customizations - File: installing-azure-network-customizations - Name: Installing a cluster in a disconnected environment File: installing-restricted-networks-azure-installer-provisioned - Name: Installing a cluster into an existing VNet diff --git a/installing/installing_azure/ipi/installing-azure-customizations.adoc b/installing/installing_azure/ipi/installing-azure-customizations.adoc index 6cb46d35fc..3214b6b892 100644 --- a/installing/installing_azure/ipi/installing-azure-customizations.adoc +++ b/installing/installing_azure/ipi/installing-azure-customizations.adoc @@ -7,7 +7,13 @@ include::_attributes/common-attributes.adoc[] toc::[] -You can install a customized cluster on infrastructure that the installation program provisions on {azure-first}. To customize the installation, modify parameters in the `install-config.yaml` file before you install the cluster. +In {product-title} version {product-version}, you can install a cluster with a customized configuration or a customized network configuration on infrastructure that the installation program provisions on {azure-first}. + +To install a cluster with customizations or with network customizations, modify parameters in the `install-config.yaml` file before you install the cluster. + +By customizing your network configuration, your cluster can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. + +You must set most of the network configuration parameters during installation, and you can modify only the `kubeProxy` configuration parameters in a running cluster. include::modules/installation-azure-marketplace-subscribe.adoc[leveloffset=+1] @@ -29,6 +35,7 @@ include::modules/installation-azure-tested-machine-types.adoc[leveloffset=+2] include::modules/installation-azure-arm-tested-machine-types.adoc[leveloffset=+2] include::modules/installation-azure-trusted-launch.adoc[leveloffset=+2] + include::modules/installation-azure-confidential-vms.adoc[leveloffset=+2] include::modules/installation-azure-config-yaml.adoc[leveloffset=+2] @@ -40,6 +47,25 @@ include::modules/installation-configure-proxy.adoc[leveloffset=+2] * For more details about Accelerated Networking, see xref:../../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]. +// Network Operator specific configuration +include::modules/nw-network-config.adoc[leveloffset=+1] + +include::modules/nw-modifying-operator-install-config.adoc[leveloffset=+1] + +include::modules/nw-operator-cr.adoc[leveloffset=+1] + +include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] + +[NOTE] +==== +For more information about using Linux and Windows nodes in the same cluster, see xref:../../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads]. +==== + +[role="_additional-resources"] +.Additional resources + +* For more details about Accelerated Networking, see xref:../../../machine_management/creating_machinesets/creating-machineset-azure.adoc#machineset-azure-accelerated-networking_creating-machineset-azure[Accelerated Networking for Microsoft Azure VMs]. + include::modules/installation-user-defined-tags-azure.adoc[leveloffset=+1] include::modules/installation-creating-user-defined-tags-azure.adoc[leveloffset=+2] diff --git a/installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc b/installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc index 0f0e40ac85..d78d338ba7 100644 --- a/installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc +++ b/installing/installing_azure/ipi/installing-azure-preparing-ipi.adoc @@ -35,7 +35,6 @@ include::modules/installation-azure-preparing-diskencryptionsets.adoc[leveloffse * Install an {product-title} cluster: ** xref:../../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with customizations on installer-provisioned infrastructure] -** xref:../../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Install a cluster with network customizations on installer-provisioned infrastructure] ** xref:../../../installing/installing_azure/ipi/installing-azure-vnet.adoc#installing-azure-vnet[Install a cluster into an existing VNet on installer-provisioned infrastructure] ** xref:../../../installing/installing_azure/ipi/installing-azure-private.adoc#installing-azure-private[Install a private cluster on installer-provisioned infrastructure] ** xref:../../../installing/installing_azure/ipi/installing-azure-government-region.adoc#installing-azure-government-region[Install a cluster into an government region on installer-provisioned infrastructure] \ No newline at end of file diff --git a/installing/installing_azure/preparing-to-install-on-azure.adoc b/installing/installing_azure/preparing-to-install-on-azure.adoc index 032628510d..f65ea83ec2 100644 --- a/installing/installing_azure/preparing-to-install-on-azure.adoc +++ b/installing/installing_azure/preparing-to-install-on-azure.adoc @@ -19,7 +19,7 @@ You can install a cluster on {azure-first} infrastructure that is provisioned by * **xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Installing a customized cluster on {azure-short}]**: You can install a customized cluster on {azure-short} infrastructure that the installation program provisions. The installation program allows for some customization to be applied at the installation stage. Many other customization options are available xref:../../post_installation_configuration/cluster-tasks.adoc#post-install-cluster-tasks[post-installation]. -* **xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Installing a cluster on {azure-short} with network customizations]**: You can customize your {product-title} network configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your network requirements. +* **xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Installing a cluster on {azure-short} with customizations]**: You can customize your {product-title} configuration during installation, so that your cluster can coexist with your existing IP address allocations and adhere to your customized network requirements. * **xref:../../installing/installing_azure/ipi/installing-restricted-networks-azure-installer-provisioned.adoc#installing-restricted-networks-azure-installer-provisioned[Installing a cluster on {azure-short} in a restricted network]** : You can install a cluster on {azure-short} in a restricted network by creating an internal mirror of the installation release content on an existing Azure Virtual Network (VNet). diff --git a/installing/overview/installing-preparing.adoc b/installing/overview/installing-preparing.adoc index a72e92f9dc..631730982a 100644 --- a/installing/overview/installing-preparing.adoc +++ b/installing/overview/installing-preparing.adoc @@ -58,8 +58,7 @@ You can deploy an installer-provisioned infrastructure cluster without specifyin If you need to perform basic configuration for your installer-provisioned infrastructure cluster, such as the instance type for the cluster machines, you can customize an installation for xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Azure], xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installing-gcp-customizations[GCP], xref:../../installing/installing_nutanix/installing-nutanix-installer-provisioned.adoc#installing-nutanix-installer-provisioned[Nutanix]. -For installer-provisioned infrastructure installations, you can use an existing xref:../../installing/installing_aws/ipi/installing-aws-vpc.adoc#installing-aws-vpc[VPC in AWS], xref:../../installing/installing_azure/ipi/installing-azure-vnet.adoc#installing-azure-vnet[vNet in Azure], or xref:../../installing/installing_gcp/installing-gcp-vpc.adoc#installing-gcp-vpc[VPC in GCP]. You can also reuse part of your networking infrastructure so that your cluster in xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Azure], xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[GCP] can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. If you have existing accounts and credentials on these clouds, you can re-use them, but you might need to modify the accounts to have the required permissions to install {product-title} clusters on them. - +For installer-provisioned infrastructure installations, you can use an existing xref:../../installing/installing_aws/ipi/installing-aws-vpc.adoc#installing-aws-vpc[VPC in AWS], xref:../../installing/installing_azure/ipi/installing-azure-vnet.adoc#installing-azure-vnet[vNet in Azure], or xref:../../installing/installing_gcp/installing-gcp-vpc.adoc#installing-gcp-vpc[VPC in GCP]. You can also reuse part of your networking infrastructure so that your cluster in xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[AWS], xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Azure], xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[GCP] can coexist with existing IP address allocations in your environment and integrate with existing MTU and VXLAN configurations. If you have existing accounts and credentials on these clouds, you can re-use them, but you might need to modify the accounts to have the required permissions to install {product-title} clusters on them. You can use the installer-provisioned infrastructure method to create appropriate machine instances on your hardware for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned.adoc#installing-vsphere-installer-provisioned[vSphere], and xref:../../installing/installing_bare_metal/ipi/ipi-install-overview.adoc#ipi-install-overview[bare metal]. Additionally, for xref:../../installing/installing_vsphere/ipi/installing-vsphere-installer-provisioned-customizations.adoc#installing-vsphere-installer-provisioned-customizations[vSphere], you can also customize additional network parameters during installation. @@ -178,8 +177,9 @@ ifndef::openshift-origin[] |Network customization |xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[✓] |xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[✓] -|xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] -|xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] +|xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[✓] +|xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[✓] + |xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] @@ -337,7 +337,7 @@ ifdef::openshift-origin[] |Network customization |xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[✓] -|xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[✓] +|xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[✓] |xref:../../installing/installing_azure_stack_hub/ipi/installing-azure-stack-hub-network-customizations.adoc#installing-azure-stack-hub-network-customizations[✓] |xref:../../installing/installing_gcp/installing-gcp-network-customizations.adoc#installing-gcp-network-customizations[✓] | diff --git a/modules/cco-ccoctl-configuring.adoc b/modules/cco-ccoctl-configuring.adoc index 9a4b03a235..c20c5955b6 100644 --- a/modules/cco-ccoctl-configuring.adoc +++ b/modules/cco-ccoctl-configuring.adoc @@ -30,7 +30,6 @@ // Azure assemblies // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc @@ -110,9 +109,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :azure-workload-id: endif::[] @@ -327,9 +323,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :!azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :!azure-workload-id: endif::[] diff --git a/modules/cco-ccoctl-creating-at-once.adoc b/modules/cco-ccoctl-creating-at-once.adoc index 9345269bdc..9a5b13191d 100644 --- a/modules/cco-ccoctl-creating-at-once.adoc +++ b/modules/cco-ccoctl-creating-at-once.adoc @@ -21,7 +21,6 @@ // Azure assemblies // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc @@ -85,9 +84,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :azure-workload-id: endif::[] @@ -370,9 +366,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :!azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :!azure-workload-id: endif::[] diff --git a/modules/cco-ccoctl-install-creating-manifests.adoc b/modules/cco-ccoctl-install-creating-manifests.adoc index 2ef384b5ee..73568dbd6b 100644 --- a/modules/cco-ccoctl-install-creating-manifests.adoc +++ b/modules/cco-ccoctl-install-creating-manifests.adoc @@ -21,7 +21,6 @@ // Azure assemblies // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-restricted-networks-azure-installer-provisioned.adoc @@ -33,9 +32,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :azure-workload-id: endif::[] @@ -160,9 +156,6 @@ endif::[] ifeval::["{context}" == "installing-azure-government-region"] :!azure-workload-id: endif::[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!azure-workload-id: -endif::[] ifeval::["{context}" == "installing-azure-private"] :!azure-workload-id: endif::[] diff --git a/modules/cluster-entitlements.adoc b/modules/cluster-entitlements.adoc index 45e989ead7..bf479e0350 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -25,7 +25,6 @@ // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc // * installing/installing_azure/installing-azure-default.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc diff --git a/modules/cluster-telemetry.adoc b/modules/cluster-telemetry.adoc index 3f9b944bff..d1e43caacc 100644 --- a/modules/cluster-telemetry.adoc +++ b/modules/cluster-telemetry.adoc @@ -19,7 +19,6 @@ // * installing/installing_azure_stack_hub/installing-azure-stack-hub-default.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-user-infra.adoc // * installing/installing_azure/installing-azure-default.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc diff --git a/modules/configuring-hybrid-ovnkubernetes.adoc b/modules/configuring-hybrid-ovnkubernetes.adoc index 01114ed4dd..e526c92786 100644 --- a/modules/configuring-hybrid-ovnkubernetes.adoc +++ b/modules/configuring-hybrid-ovnkubernetes.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc // * networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc diff --git a/modules/installation-azure-arm-tested-machine-types.adoc b/modules/installation-azure-arm-tested-machine-types.adoc index bc9bc8c5dd..3c3a93840d 100644 --- a/modules/installation-azure-arm-tested-machine-types.adoc +++ b/modules/installation-azure-arm-tested-machine-types.adoc @@ -3,7 +3,6 @@ // // installing/installing_azure/installing-azure-customizations.adoc // installing/installing_azure/installing-azure-government-region.adoc -// installing/installing_azure/installing-azure-network-customizations.adoc // installing/installing_azure/installing-azure-private.adoc // installing/installing_azure/installing-azure-user-infra.adoc // installing/installing_azure/installing-azure-vnet.adoc diff --git a/modules/installation-azure-config-yaml.adoc b/modules/installation-azure-config-yaml.adoc index 6f18655ed0..46d172c3ae 100644 --- a/modules/installation-azure-config-yaml.adoc +++ b/modules/installation-azure-config-yaml.adoc @@ -2,16 +2,12 @@ // // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing-restricted-networks-azure-installer-provisioned.adoc -ifeval::["{context}" == "installing-azure-network-customizations"] -:with-networking: -endif::[] -ifeval::["{context}" != "installing-azure-network-customizations"] -:without-networking: +ifeval::["{context}" == "installing-azure-customizations"] +:customizations: endif::[] ifeval::["{context}" == "installing-azure-vnet"] :vnet: @@ -88,10 +84,7 @@ compute: <2> replicas: 5 metadata: name: test-cluster <1> -ifdef::without-networking[] -networking: -endif::[] -ifdef::with-networking[] +ifdef::customizations[] networking: <2> endif::[] clusterNetwork: @@ -222,7 +215,7 @@ ifdef::gov[] endif::gov[] <2> If you do not provide these parameters and values, the installation program provides the default value. <3> The `controlPlane` section is a single mapping, but the `compute` section is a sequence of mappings. To meet the requirements of the different data structures, the first line of the `compute` section must begin with a hyphen, `-`, and the first line of the `controlPlane` section must not. Only one control plane pool is used. -<4> Whether to enable or disable simultaneous multithreading, or `hyperthreading`. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores. You can disable it by setting the parameter value to `Disabled`. If you disable simultaneous multithreading in some cluster machines, you must disable it in all cluster machines. +<4> Whether to enable or disable simultaneous multithreading, or `hyperthreading`. By default, simultaneous multithreading is enabled to increase the performance of your machines' cores. You can disable it by setting the parameter value to `Disabled`. If you disable simultaneous multithreading in some cluster machines, you must disable it in all cluster machines. + [IMPORTANT] ==== @@ -336,12 +329,8 @@ ifdef::openshift-origin[] endif::openshift-origin[] endif::gov[] - -ifeval::["{context}" == "installing-azure-network-customizations"] -:!with-networking: -endif::[] -ifeval::["{context}" != "installing-azure-network-customizations"] -:!without-networking: +ifeval::["{context}" == "installing-azure-customizations"] +:!customizations: endif::[] ifeval::["{context}" == "installing-azure-vnet"] :!vnet: diff --git a/modules/installation-azure-finalizing-encryption.adoc b/modules/installation-azure-finalizing-encryption.adoc index faeb103234..4cd4782b1e 100644 --- a/modules/installation-azure-finalizing-encryption.adoc +++ b/modules/installation-azure-finalizing-encryption.adoc @@ -2,7 +2,6 @@ // // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc diff --git a/modules/installation-azure-tested-machine-types.adoc b/modules/installation-azure-tested-machine-types.adoc index 051bc365a8..232e9668c0 100644 --- a/modules/installation-azure-tested-machine-types.adoc +++ b/modules/installation-azure-tested-machine-types.adoc @@ -2,7 +2,6 @@ // // installing/installing_azure/installing-azure-customizations.adoc // installing/installing_azure/installing-azure-government-region.adoc -// installing/installing_azure/installing-azure-network-customizations.adoc // installing/installing_azure/installing-azure-private.adoc // installing/installing_azure/installing-azure-user-infra.adoc // installing/installing_azure/installing-azure-vnet.adoc diff --git a/modules/installation-configure-proxy.adoc b/modules/installation-configure-proxy.adoc index 153095efe8..4052629042 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -10,7 +10,6 @@ // * installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc // * installing/installing_aws/installing-restricted-networks-aws.adoc // * installing/installing_azure/installing-azure-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc diff --git a/modules/installation-minimum-resource-requirements.adoc b/modules/installation-minimum-resource-requirements.adoc index 336941c244..9b7c6c1153 100644 --- a/modules/installation-minimum-resource-requirements.adoc +++ b/modules/installation-minimum-resource-requirements.adoc @@ -14,7 +14,6 @@ // * installing/installaing_aws/installing-aws-wavelength-zone.adoc // * installing/installing_azure/installing-azure-customizations.adoc // * installing/installing_azure/installing-azure-government-region.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_azure/installing-azure-private.adoc // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc diff --git a/modules/nw-modifying-operator-install-config.adoc b/modules/nw-modifying-operator-install-config.adoc index 95f1ba52ea..4f7545e53e 100644 --- a/modules/nw-modifying-operator-install-config.adoc +++ b/modules/nw-modifying-operator-install-config.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // // * installing/installing_aws/installing-aws-network-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc // * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc diff --git a/modules/nw-network-config.adoc b/modules/nw-network-config.adoc index 47ef6c058d..93b7b5b78a 100644 --- a/modules/nw-network-config.adoc +++ b/modules/nw-network-config.adoc @@ -5,7 +5,6 @@ // // * networking/cluster-network-operator.adoc // * installing/installing_aws/installing-aws-network-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc // * installing/installing_ibm_cloud/installing-ibm-cloud-network-customizations.adoc // * installing/installing_vsphere/installing-vsphere-network-customizations.adoc diff --git a/modules/nw-operator-cr.adoc b/modules/nw-operator-cr.adoc index 9636d837ac..b30dfc00a9 100644 --- a/modules/nw-operator-cr.adoc +++ b/modules/nw-operator-cr.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // // * installing/installing_aws/installing-aws-network-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations.adoc // * installing/installing_bare_metal/upi/installing-bare-metal-network-customizations.adoc // * installing/installing_gcp/installing-gcp-network-customizations.adoc // * installing/installing_ibm_power/installing-ibm-power.adoc diff --git a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc index 9b3687ccfd..affaec8a80 100644 --- a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc +++ b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc @@ -15,4 +15,4 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] == Additional resources * xref:../../installing/installing_aws/ipi/installing-aws-customizations.adoc#installing-aws-customizations[Installing a cluster on AWS with network customizations] -* xref:../../installing/installing_azure/ipi/installing-azure-network-customizations.adoc#installing-azure-network-customizations[Installing a cluster on Azure with network customizations] +* xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Installing a cluster on Azure with customizations]