diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 6eebda55cd1c..c9d3a1e0a444 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -271,8 +271,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/_unused_topics/manually-creating-iam-azure.adoc b/_unused_topics/manually-creating-iam-azure.adoc index a38460ef6906..4199599ed67a 100644 --- a/_unused_topics/manually-creating-iam-azure.adoc +++ b/_unused_topics/manually-creating-iam-azure.adoc @@ -24,6 +24,6 @@ include::modules/manually-create-identity-access-management.adoc[leveloffset=+1] == Next steps * Install an {product-title} cluster: -** xref:../../installing/installing_azure/ipi/installing-azure-default.adoc#installing-azure-default[Installing a cluster quickly on Azure] with default options on installer-provisioned infrastructure -** xref:../../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with cloud 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-default.adoc#installing-azure-default[Installing a cluster quickly on Azure] with default options on installer-provisioned infrastructure +** xref:../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with cloud customizations on installer-provisioned infrastructure] +** xref:../installing/installing_azure/ipi/installing-azure-customizations.adoc#installing-azure-customizations[Install a cluster with customizations on installer-provisioned infrastructure] diff --git a/installing/installing_azure/ipi/installing-azure-customizations.adoc b/installing/installing_azure/ipi/installing-azure-customizations.adoc index 6cb46d35fc80..f40eed88181f 100644 --- a/installing/installing_azure/ipi/installing-azure-customizations.adoc +++ b/installing/installing_azure/ipi/installing-azure-customizations.adoc @@ -7,7 +7,14 @@ 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 `kubeProxy` configuration parameters in a running +cluster. include::modules/installation-azure-marketplace-subscribe.adoc[leveloffset=+1] @@ -40,6 +47,23 @@ 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 0f0e40ac85c9..d78d338ba7d0 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 032628510da1..f65ea83ec2d7 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 3d885b7ba16f..52ed15297d50 100644 --- a/installing/overview/installing-preparing.adoc +++ b/installing/overview/installing-preparing.adoc @@ -58,7 +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-network-customizations.adoc#installing-aws-network-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-network-customizations.adoc#installing-aws-network-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-network-customizations.adoc#installing-vsphere-installer-provisioned-network-customizations[vSphere], you can also customize additional network parameters during installation. @@ -175,8 +175,8 @@ ifndef::openshift-origin[] |Network customization |xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-customizations[✓] |xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-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[✓] @@ -334,7 +334,7 @@ ifdef::openshift-origin[] |Network customization |xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-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_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 5b9fdddf3ba0..feefa6d01c3c 100644 --- a/modules/cco-ccoctl-configuring.adoc +++ b/modules/cco-ccoctl-configuring.adoc @@ -31,7 +31,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 @@ -111,9 +110,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::[] @@ -328,9 +324,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 3917fe1a00d0..5329c070f532 100644 --- a/modules/cco-ccoctl-creating-at-once.adoc +++ b/modules/cco-ccoctl-creating-at-once.adoc @@ -22,7 +22,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 @@ -83,9 +82,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::[] @@ -224,7 +220,7 @@ $ ccoctl azure create-all \ --subscription-id= \// <4> --credentials-requests-dir= \// <5> --dnszone-resource-group-name= \// <6> - --tenant-id= \// <7> + --tenant-id= \// <7> --network-resource-group-name <8> ---- <1> Specify the user-defined name for all created Azure resources used for tracking. @@ -365,9 +361,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 af24e2d55fb0..e4f07bc037e1 100644 --- a/modules/cco-ccoctl-install-creating-manifests.adoc +++ b/modules/cco-ccoctl-install-creating-manifests.adoc @@ -22,7 +22,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 @@ -34,9 +33,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::[] @@ -161,9 +157,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 1f5e2a631b74..6ea39c4d6872 100644 --- a/modules/cluster-entitlements.adoc +++ b/modules/cluster-entitlements.adoc @@ -26,7 +26,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 425d5f5b8930..3905ee90e9b1 100644 --- a/modules/cluster-telemetry.adoc +++ b/modules/cluster-telemetry.adoc @@ -20,7 +20,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 861b7bf5bd31..c8ee0734669e 100644 --- a/modules/configuring-hybrid-ovnkubernetes.adoc +++ b/modules/configuring-hybrid-ovnkubernetes.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_azure_stack_hub/installing-azure-stack-hub-network-customizations.adoc // * networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc @@ -153,8 +152,8 @@ network.operator.openshift.io/cluster patched $ oc get network.operator.openshift.io -o jsonpath="{.items[0].spec.defaultNetwork.ovnKubernetesConfig}" ---- endif::post-install[] -//// -Made changes to hide Windows-related material. Use this material instead of the above if the WMCO is not available at the time of an OCP release. +//// +Made changes to hide Windows-related material. Use this material instead of the above if the WMCO is not available at the time of an OCP release. ifndef::post-install[] .Prerequisites diff --git a/modules/installation-azure-arm-tested-machine-types.adoc b/modules/installation-azure-arm-tested-machine-types.adoc index bc9bc8c5ddbe..3c3a93840d79 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 6f18655ed0f1..c42564e9eaef 100644 --- a/modules/installation-azure-config-yaml.adoc +++ b/modules/installation-azure-config-yaml.adoc @@ -2,17 +2,10 @@ // // * 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: -endif::[] ifeval::["{context}" == "installing-azure-vnet"] :vnet: endif::[] @@ -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] ==== @@ -337,12 +330,6 @@ endif::openshift-origin[] endif::gov[] -ifeval::["{context}" == "installing-azure-network-customizations"] -:!with-networking: -endif::[] -ifeval::["{context}" != "installing-azure-network-customizations"] -:!without-networking: -endif::[] ifeval::["{context}" == "installing-azure-vnet"] :!vnet: endif::[] diff --git a/modules/installation-azure-finalizing-encryption.adoc b/modules/installation-azure-finalizing-encryption.adoc index faeb1032349b..4cd4782b1e49 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 051bc365a84d..232e9668c0f7 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 17a987408bb7..a0256efbd62f 100644 --- a/modules/installation-configure-proxy.adoc +++ b/modules/installation-configure-proxy.adoc @@ -11,7 +11,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-initializing.adoc b/modules/installation-initializing.adoc index dfb7ebcc3ad9..4e5a995c29c1 100644 --- a/modules/installation-initializing.adoc +++ b/modules/installation-initializing.adoc @@ -6,7 +6,6 @@ // * installing/installing_aws/installing-restricted-networks-aws-installer-provisioned.adoc // * installing/installing_aws/installing-aws-outposts-remote-workers.adoc // * installing/installing_azure/installing-azure-customizations.adoc -// * installing/installing_azure/installing-azure-network-customizations // * installing/installing_azure/installing-azure-vnet.adoc // * installing/installing_azure/installing-azure-user-infra.adoc // * installing/installing_gcp/installing-gcp-customizations.adoc diff --git a/modules/installation-minimum-resource-requirements.adoc b/modules/installation-minimum-resource-requirements.adoc index 336941c2444e..9b7c6c1153e8 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 046269465461..854d9dc8814f 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_vsphere/installing-vsphere-installer-provisioned-network-customizations.adoc diff --git a/modules/nw-network-config.adoc b/modules/nw-network-config.adoc index b639dd365af1..3e278fc80792 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 99f2c555068e..f02ef2c95e3b 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 36343a345699..b0f9ef7baf90 100644 --- a/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc +++ b/networking/ovn_kubernetes_network_provider/configuring-hybrid-networking.adoc @@ -17,4 +17,4 @@ include::modules/configuring-hybrid-ovnkubernetes.adoc[leveloffset=+1] * xref:../../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads[Understanding Windows container workloads] * xref:../../windows_containers/enabling-windows-container-workloads.adoc#enabling-windows-container-workloads[Enabling Windows container workloads] * xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#installing-aws-network-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]