diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 3be61a8ea3..8abacf73b1 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -1395,14 +1395,28 @@ Topics: File: nw-creating-dns-records-on-infoblox - Name: Configuring the cluster-wide proxy on the External DNS Operator File: nw-configuring-cluster-wide-egress-proxy -# - Name: Understanding the Ingress Node Firewall Operator -# File: ingress-node-firewall-operator -# - Name: Understanding the Cluster Network Operator -# File: cluster-network-operator -# - Name: Understanding the DNS Operator -# File: dns-operator -# - Name: Understanding the Ingress Operator -# File: ingress-operator + - Name: MetalLB Operator + Dir: metallb-operator + Distros: openshift-enterprise,openshift-origin + Topics: + - Name: About MetalLB and the MetalLB Operator + File: about-metallb + - Name: Installing the MetalLB Operator + File: metallb-operator-install + - Name: Upgrading the MetalLB Operator + File: metallb-upgrading-operator + - Name: Understanding the Cluster Network Operator + File: cluster-network-operator + Distros: openshift-enterprise,openshift-origin + - Name: Understanding the DNS Operator + File: dns-operator + Distros: openshift-enterprise,openshift-origin + - Name: Understanding the Ingress Operator + File: ingress-operator + Distros: openshift-enterprise,openshift-origin + - Name: Understanding the Ingress Node Firewall Operator + File: ingress-node-firewall-operator + Distros: openshift-enterprise,openshift-origin # - Name: SR-IOV Operator # Dir: sr-iov-operator # Distros: openshift-enterprise,openshift-origin @@ -1413,16 +1427,6 @@ Topics: # File: configuring-sriov-operator # - Name: Uninstalling the SR-IOV Operator # File: uninstalling-sriov-operator -# - Name: MetalLB Operator -# Dir: metallb-operator -# Distros: openshift-enterprise,openshift-origin -# Topics: -# - Name: About MetalLB and the MetalLB Operator -# File: about-metallb -# - Name: Installing the MetalLB Operator -# File: metallb-operator-install -# - Name: Upgrading the MetalLB Operator -# File: metallb-upgrading-operator - Name: Network security Dir: network_security Distros: openshift-enterprise,openshift-origin @@ -1465,8 +1469,6 @@ Topics: File: multitenant-network-policy - Name: Audit logging for network security File: logging-network-security - - Name: Understanding the Ingress Node Firewall Operator - File: ingress-node-firewall-operator - Name: Egress Firewall Dir: egress_firewall Distros: openshift-enterprise,openshift-origin @@ -1481,15 +1483,6 @@ Topics: File: configuring-egress-firewall-ovn - Name: Configuring IPsec encryption File: configuring-ipsec-ovn -- Name: Understanding the Cluster Network Operator - File: cluster-network-operator - Distros: openshift-enterprise,openshift-origin -- Name: Understanding the DNS Operator - File: dns-operator - Distros: openshift-enterprise,openshift-origin -- Name: Understanding the Ingress Operator - File: ingress-operator - Distros: openshift-enterprise,openshift-origin - Name: Configuring the Ingress Controller for manual DNS management File: ingress-controller-dnsmgt Distros: openshift-enterprise,openshift-origin @@ -1673,12 +1666,6 @@ Topics: - Name: Load balancing with MetalLB Dir: metallb Topics: - - Name: About MetalLB and the MetalLB Operator - File: about-metallb - - Name: Installing the MetalLB Operator - File: metallb-operator-install - - Name: Upgrading the MetalLB Operator - File: metallb-upgrading-operator - Name: Configuring MetalLB address pools File: metallb-configure-address-pools - Name: Advertising the IP address pools diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml index 204af6282f..e7a769c4ad 100644 --- a/_topic_maps/_topic_map_osd.yml +++ b/_topic_maps/_topic_map_osd.yml @@ -823,18 +823,14 @@ Distros: openshift-dedicated Topics: - Name: About networking File: about-managed-networking -# - Name: Networking Operators -# Dir: networking_operators -# Distros: openshift-dedicated -# Topics: -# - Name: Understanding the DNS Operator -# File: dns-operator -# - Name: Understanding the Ingress Operator -# File: ingress-operator -- Name: Understanding the DNS Operator - File: dns-operator -- Name: Understanding the Ingress Operator - File: ingress-operator +- Name: Networking Operators + Dir: networking_operators + Distros: openshift-dedicated + Topics: + - Name: Understanding the DNS Operator + File: dns-operator + - Name: Understanding the Ingress Operator + File: ingress-operator - Name: Network verification File: network-verification - Name: Configuring a cluster-wide proxy during installation diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml index 63bfd93b5e..340703acfd 100644 --- a/_topic_maps/_topic_map_rosa.yml +++ b/_topic_maps/_topic_map_rosa.yml @@ -1088,16 +1088,12 @@ Topics: Topics: - Name: AWS Load Balancer Operator File: aws-load-balancer-operator - # - Name: Understanding the DNS Operator - # File: dns-operator - # - Name: Understanding the Ingress Operator - # File: ingress-operator - # - Name: Understanding the Ingress Node Firewall Operator - # File: ingress-node-firewall-operator -- Name: Understanding the DNS Operator - File: dns-operator -- Name: Understanding the Ingress Operator - File: ingress-operator + - Name: Understanding the DNS Operator + File: dns-operator + - Name: Understanding the Ingress Operator + File: ingress-operator + - Name: Understanding the Ingress Node Firewall Operator + File: ingress-node-firewall-operator - Name: Network verification File: network-verification - Name: Configuring a cluster-wide proxy during installation @@ -1136,8 +1132,6 @@ Topics: File: default-network-policy - Name: Configuring multitenant isolation with network policy File: multitenant-network-policy - - Name: Understanding the Ingress Node Firewall Operator - File: ingress-node-firewall-operator - Name: OVN-Kubernetes network plugin Dir: ovn_kubernetes_network_provider Topics: diff --git a/_unused_topics/migrate-from-openshift-sdn.adoc b/_unused_topics/migrate-from-openshift-sdn.adoc index 5b59abfa02..cee1a31540 100644 --- a/_unused_topics/migrate-from-openshift-sdn.adoc +++ b/_unused_topics/migrate-from-openshift-sdn.adoc @@ -30,20 +30,35 @@ include::modules/live-migration-metrics-information.adoc[leveloffset=+3] == Additional resources * link:https://access.redhat.com/labs/ocpnc/[Red Hat OpenShift Network Calculator] -* xref:../../networking/cluster-network-operator.adoc#nw-operator-configuration-parameters-for-ovn-sdn_cluster-network-operator[Configuration parameters for the OVN-Kubernetes network plugin] + +* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-operator-cr_cluster-network-operator[Configuration for the OVN-Kubernetes network plugin] + * xref:../../backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc#backup-etcd[Backing up etcd] + * xref:../../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[About network policy] + * xref:../../networking/changing-cluster-network-mtu.adoc#nw-cluster-mtu-change_changing-cluster-network-mtu[Changing the cluster MTU] + * xref:../../networking/changing-cluster-network-mtu.adoc#mtu-value-selection_changing-cluster-network-mtu[MTU value selection] + * xref:../../networking/network_security/network_policy/about-network-policy.adoc#nw-networkpolicy-optimize-ovn_about-network-policy[About network policy] * OVN-Kubernetes capabilities + - xref:../../networking/ovn_kubernetes_network_provider/configuring-egress-ips-ovn.adoc#configuring-egress-ips-ovn[Configuring an egress IP address] + - xref:../../networking/network_security/egress_firewall/configuring-egress-firewall-ovn.adoc#configuring-egress-firewall-ovn[Configuring an egress firewall for a project] + - link:https://access.redhat.com/solutions/7078619[OVN-Kubernetes egress firewall blocks process to deploy application as DeploymentConfig] + - xref:../../networking/ovn_kubernetes_network_provider/enabling-multicast.adoc#nw-ovn-kubernetes-enabling-multicast[Enabling multicast for a project] * OpenShift SDN capabilities + - xref:../../networking/openshift_sdn/assigning-egress-ips.adoc#assigning-egress-ips[Configuring egress IPs for a project] + - xref:../../networking/openshift_sdn/configuring-egress-firewall.adoc#configuring-egress-firewall[Configuring an egress firewall for a project] + - xref:../../networking/openshift_sdn/enabling-multicast.adoc#enabling-multicast[Enabling multicast for a project] + - xref:../../networking/openshift_sdn/deploying-egress-router-layer3-redirection.adoc#deploying-egress-router-layer3-redirection[Deploying an egress router pod in redirect mode] -* xref:../../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[Network [operator.openshift.io/v1]] + +* xref:../../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[Network [operator.openshift.io/v1] diff --git a/cli_reference/rosa_cli/rosa-manage-objects-cli.adoc b/cli_reference/rosa_cli/rosa-manage-objects-cli.adoc index 2c27e2859e..8a85b8f772 100644 --- a/cli_reference/rosa_cli/rosa-manage-objects-cli.adoc +++ b/cli_reference/rosa_cli/rosa-manage-objects-cli.adoc @@ -29,7 +29,7 @@ include::modules/rosa-edit-objects.adoc[leveloffset=+1] [role="_additional-resources_1"] == Additional resources -* See xref:../../networking/ingress-operator.adoc#configuring-ingress-controller[Configuring the Ingress Controller] for information regarding editing non-default application routers. +* See xref:../../networking/networking_operators/ingress-operator.adoc#configuring-ingress-controller[Configuring the Ingress Controller] for information regarding editing non-default application routers. include::modules/rosa-delete-objects.adoc[leveloffset=+1] include::modules/rosa-install-uninstall-addon.adoc[leveloffset=+1] diff --git a/getting_started/openshift-overview.adoc b/getting_started/openshift-overview.adoc index b5030070c4..944684e536 100644 --- a/getting_started/openshift-overview.adoc +++ b/getting_started/openshift-overview.adoc @@ -90,7 +90,7 @@ of the {product-title} {product-version} control plane. See how {product-title} * **xref:../authentication/understanding-authentication.adoc#understanding-authentication[Manage authentication]**: Learn how user, group, and API authentication works in {product-title}. {product-title} supports multiple identity providers. -* **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/cluster-network-operator.adoc#cluster-network-operator[Cluster Network Operator] (CNO). The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. Using +* **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] (CNO). The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. Using xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[network policy] features, you can isolate your pods or permit selected traffic. * **xref:../storage/understanding-persistent-storage.adoc#understanding-persistent-storage[Manage storage]**: {product-title} allows cluster administrators to configure persistent storage. diff --git a/hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc b/hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc index 009161c7bb..ec78d4bcac 100644 --- a/hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc +++ b/hosted_control_planes/hcp-deploy/hcp-deploy-virt.adoc @@ -77,7 +77,7 @@ include::modules/hcp-metallb.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* For more information about MetalLB, see xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator]. +* For more information about MetalLB, see xref:../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#metallb-operator-install_metallb-operator-install[Installing the MetalLB Operator]. [id="hcp-virt-addl-resources"] == Configuring additional networks, guaranteed CPUs, and VM scheduling for node pools diff --git a/hosted_control_planes/hcp-manage/hcp-manage-bm.adoc b/hosted_control_planes/hcp-manage/hcp-manage-bm.adoc index 04b67cfbcd..2d4692a870 100644 --- a/hosted_control_planes/hcp-manage/hcp-manage-bm.adoc +++ b/hosted_control_planes/hcp-manage/hcp-manage-bm.adoc @@ -24,7 +24,7 @@ include::modules/hcp-bm-ingress.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../networking/metallb/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] +* xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb_about-metallb[About MetalLB and the MetalLB Operator] include::modules/hcp-bm-machine-health.adoc[leveloffset=+1] include::modules/hcp-bm-machine-health-disable.adoc[leveloffset=+1] diff --git a/hosted_control_planes/hcp-manage/hcp-manage-non-bm.adoc b/hosted_control_planes/hcp-manage/hcp-manage-non-bm.adoc index 61b639ea9b..c5d88ef71c 100644 --- a/hosted_control_planes/hcp-manage/hcp-manage-non-bm.adoc +++ b/hosted_control_planes/hcp-manage/hcp-manage-non-bm.adoc @@ -24,7 +24,7 @@ include::modules/hcp-bm-ingress.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../networking/metallb/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] +* xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb_about-metallb[About MetalLB and the MetalLB Operator] include::modules/hcp-bm-machine-health.adoc[leveloffset=+1] include::modules/hcp-bm-machine-health-disable.adoc[leveloffset=+1] diff --git a/installing/installing_bare_metal/ipi/ipi-install-overview.adoc b/installing/installing_bare_metal/ipi/ipi-install-overview.adoc index 7ead7ba182..0d661bff3a 100644 --- a/installing/installing_bare_metal/ipi/ipi-install-overview.adoc +++ b/installing/installing_bare_metal/ipi/ipi-install-overview.adoc @@ -37,7 +37,7 @@ For installer-provisioned infrastructure installations, CoreDNS exposes port 53 [role="_additional-resources"] .Additional resources -* xref:../../../networking/dns-operator.adoc#nw-dns-forward_dns-operator[Using DNS forwarding] +* xref:../../../networking/networking_operators/dns-operator.adoc#nw-dns-forward_dns-operator[Using DNS forwarding] [IMPORTANT] ==== diff --git a/installing/installing_bare_metal/ipi/ipi-install-prerequisites.adoc b/installing/installing_bare_metal/ipi/ipi-install-prerequisites.adoc index 11a7713182..822af97894 100644 --- a/installing/installing_bare_metal/ipi/ipi-install-prerequisites.adoc +++ b/installing/installing_bare_metal/ipi/ipi-install-prerequisites.adoc @@ -44,7 +44,7 @@ include::modules/ipi-install-network-requirements.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../../networking/dns-operator.adoc#nw-dns-forward_dns-operator[Using DNS forwarding] +* xref:../../../networking/networking_operators/dns-operator.adoc#nw-dns-forward_dns-operator[Using DNS forwarding] include::modules/ipi-install-configuring-nodes.adoc[leveloffset=+1] diff --git a/installing/installing_gcp/installing-gcp-user-infra.adoc b/installing/installing_gcp/installing-gcp-user-infra.adoc index 837d578225..4edb16d241 100644 --- a/installing/installing_gcp/installing-gcp-user-infra.adoc +++ b/installing/installing_gcp/installing-gcp-user-infra.adoc @@ -148,6 +148,6 @@ include::modules/cluster-telemetry.adoc[leveloffset=+1] == Next steps -* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster]. -* If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting]. -* xref:../../networking/ingress-operator.adoc#nw-ingress-controller-configuration-gcp-global-access_configuring-ingress[Configure Global Access for an Ingress Controller on GCP]. +* xref:../../post_installation_configuration/cluster-tasks.adoc#available_cluster_customizations[Customize your cluster] +* If necessary, you can xref:../../support/remote_health_monitoring/opting-out-of-remote-health-reporting.adoc#opting-out-remote-health-reporting_opting-out-remote-health-reporting[opt out of remote health reporting] +* xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-controller-configuration-gcp-global-access_configuring-ingress[Configuring Global Access for an Ingress Controller on {gcp-short}] diff --git a/networking/cidr-range-definitions.adoc b/networking/cidr-range-definitions.adoc index 46b1cfb56f..29dc2ee7b0 100644 --- a/networking/cidr-range-definitions.adoc +++ b/networking/cidr-range-definitions.adoc @@ -67,7 +67,7 @@ You can expand the range after cluster installation. [role="_additional-resources"] .Additional resources -* xref:../networking/cluster-network-operator.adoc#nw-operator-cr-cno-object_cluster-network-operator[Cluster Network Operator configuration] +* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-operator-cr_cluster-network-operator[Cluster Network Operator configuration] * xref:../networking/configuring-cluster-network-range.adoc#configuring-cluster-network-range[Configuring the cluster network range] endif::openshift-enterprise[] diff --git a/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc b/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc index 0fc454e0bb..f7b0979ad7 100644 --- a/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc +++ b/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc @@ -79,7 +79,7 @@ include::modules/nw-ingress-sharding-route-configuration.adoc[leveloffset=+2] * xref:../../scalability_and_performance/optimization/routing-optimization.adoc#baseline-router-performance_routing-optimization[Baseline Ingress Controller (router) performance] -* xref:../../networking/ingress-operator.adoc#configuring-ingress[Ingress Operator in {product-title}] +* xref:../../networking/networking_operators/ingress-operator.adoc#configuring-ingress-controller[Configuring the Ingress Controller] * xref:../../installing/installing_bare_metal/upi/installing-bare-metal.adoc#installing-bare-metal[Installing a cluster on bare metal] diff --git a/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-service-external-ip.adoc b/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-service-external-ip.adoc index b09e393c23..9a28ed6760 100644 --- a/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-service-external-ip.adoc +++ b/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-service-external-ip.adoc @@ -26,7 +26,7 @@ include::modules/nw-service-externalip-create.adoc[leveloffset=+1] [id="configuring-ingress-cluster-traffic-service-external-ip-additional-resources"] == Additional resources -* xref:../../networking/metallb/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] +* xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] * xref:../../networking/configuring-ipfailover.adoc#configuring-ipfailover[Configuring IP failover] diff --git a/networking/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc b/networking/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc index d876e6ff24..e478de3c40 100644 --- a/networking/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc +++ b/networking/configuring_ingress_cluster_traffic/nw-configuring-ingress-controller-endpoint-publishing-strategy.adoc @@ -30,7 +30,7 @@ include::modules/nw-ingress-controller-nodeportservice-projects.adoc[leveloffset [role="_additional-resources"] == Additional resources -* xref:../../networking/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] +* xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] * xref:../../installing/installing_openstack/installing-openstack-installer-custom.adoc#installation-osp-setting-cloud-provider-options_installing-openstack-installer-custom[Setting {rh-openstack} Cloud Controller Manager options] diff --git a/networking/configuring_ingress_cluster_traffic/overview-traffic.adoc b/networking/configuring_ingress_cluster_traffic/overview-traffic.adoc index 9244925a6a..f595345403 100644 --- a/networking/configuring_ingress_cluster_traffic/overview-traffic.adoc +++ b/networking/configuring_ingress_cluster_traffic/overview-traffic.adoc @@ -29,7 +29,7 @@ with the SNI header, use an Ingress Controller. |Allows traffic to non-standard ports through an IP address assigned from a pool. Most cloud platforms offer a method to start a service with a load-balancer IP address. -|xref:../../networking/metallb/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] +|xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] |Allows traffic to a specific IP address or address from a pool on the machine network. For bare-metal installations or platforms that are like bare metal, MetalLB provides a way to start a service with a load-balancer IP address. diff --git a/networking/hardware_networks/configuring-hardware-offloading.adoc b/networking/hardware_networks/configuring-hardware-offloading.adoc index 332b7d6d92..d0ccfaed89 100644 --- a/networking/hardware_networks/configuring-hardware-offloading.adoc +++ b/networking/hardware_networks/configuring-hardware-offloading.adoc @@ -22,7 +22,7 @@ include::modules/nw-sriov-hwol-supported-devices.adoc[leveloffset=+1] * Your cluster has at least one bare metal machine with a network interface controller that is supported for hardware offloading. * You xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sr-iov-operator_installing-sriov-operator[installed the SR-IOV Network Operator]. * Your cluster uses the xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin]. -* In your xref:../../networking/cluster-network-operator.adoc#gatewayConfig-object_cluster-network-operator[OVN-Kubernetes network plugin configuration], the `gatewayConfig.routingViaHost` field is set to `false`. +* In your xref:../../networking/networking_operators/cluster-network-operator.adoc#gatewayConfig-object_cluster-network-operator[OVN-Kubernetes network plugin configuration], the `gatewayConfig.routingViaHost` field is set to `false`. //Configure a machine config pool for hardware offloading include::modules/nw-sriov-hwol-configuring-systemd-mode.adoc[leveloffset=+1] diff --git a/networking/ingress-controller-dnsmgt.adoc b/networking/ingress-controller-dnsmgt.adoc index 21cc8fc143..c83891075d 100644 --- a/networking/ingress-controller-dnsmgt.adoc +++ b/networking/ingress-controller-dnsmgt.adoc @@ -36,4 +36,4 @@ include::modules/modifying-an-existing-ingress-controller.adoc[leveloffset=+1] [role="_additional-resources"] [id="configuring-ingress-controller-dns-management-additional-resources"] == Additional resources -* xref:../networking/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] +* xref:../networking/networking_operators/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] diff --git a/networking/cluster-network-operator.adoc b/networking/networking_operators/cluster-network-operator.adoc similarity index 67% rename from networking/cluster-network-operator.adoc rename to networking/networking_operators/cluster-network-operator.adoc index fc139c3db5..23fde6f941 100644 --- a/networking/cluster-network-operator.adoc +++ b/networking/networking_operators/cluster-network-operator.adoc @@ -23,5 +23,5 @@ include::modules/nw-operator-cr.adoc[leveloffset=+1] [role="_additional-resources"] [id="cluster-network-operator-additional-resources"] == Additional resources -* xref:../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[`Network` API in the `operator.openshift.io` API group] -* xref:../networking/configuring-cluster-network-range.adoc#nw-cluster-network-range-edit_configuring-cluster-network-range[Modifying the `clusterNetwork` IP address range] +* xref:../../rest_api/operator_apis/network-operator-openshift-io-v1.adoc#network-operator-openshift-io-v1[`Network` API in the `operator.openshift.io` API group] +* xref:../../networking/configuring-cluster-network-range.adoc#nw-cluster-network-range-edit_configuring-cluster-network-range[Expanding the cluster network IP address range] diff --git a/networking/dns-operator.adoc b/networking/networking_operators/dns-operator.adoc similarity index 100% rename from networking/dns-operator.adoc rename to networking/networking_operators/dns-operator.adoc diff --git a/networking/networking_operators/ebpf_manager/ebpf-manager-operator-install.adoc b/networking/networking_operators/ebpf_manager/ebpf-manager-operator-install.adoc index d093bc036f..956d2606ac 100644 --- a/networking/networking_operators/ebpf_manager/ebpf-manager-operator-install.adoc +++ b/networking/networking_operators/ebpf_manager/ebpf-manager-operator-install.adoc @@ -18,4 +18,4 @@ include::modules/nw-bpfman-operator-installing-console.adoc[leveloffset=+1] == Next steps * xref:../../../networking/networking_operators/ebpf_manager/ebpf-manager-operator-deploy.adoc#bpfman-operator-deploy[Deploying a containerized eBPF program] -* xref:../../../networking/network_security/ingress-node-firewall-operator.adoc#bpfman-infw-configure_ingress-node-firewall-operator[Configuring Ingress Node Firewall Operator to use the eBPF Manager Operator] +* xref:../../../networking/networking_operators/ingress-node-firewall-operator#bpfman-infw-configure_ingress-node-firewall-operator[Configuring Ingress Node Firewall Operator to use the eBPF Manager Operator] diff --git a/networking/network_security/ingress-node-firewall-operator.adoc b/networking/networking_operators/ingress-node-firewall-operator.adoc similarity index 99% rename from networking/network_security/ingress-node-firewall-operator.adoc rename to networking/networking_operators/ingress-node-firewall-operator.adoc index d67d420707..06727c73a9 100644 --- a/networking/network_security/ingress-node-firewall-operator.adoc +++ b/networking/networking_operators/ingress-node-firewall-operator.adoc @@ -37,3 +37,4 @@ ifndef::openshift-rosa[] * xref:../../networking/networking_operators/ebpf_manager/ebpf-manager-operator-about.adoc#bpfman-operator-about[About the eBPF Manager Operator] endif::openshift-rosa[] + diff --git a/networking/ingress-operator.adoc b/networking/networking_operators/ingress-operator.adoc similarity index 79% rename from networking/ingress-operator.adoc rename to networking/networking_operators/ingress-operator.adoc index e5d1d2c2fc..3a161896b4 100644 --- a/networking/ingress-operator.adoc +++ b/networking/networking_operators/ingress-operator.adoc @@ -57,15 +57,15 @@ ifndef::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] .Additional resources -* xref:../nodes/cma/nodes-cma-autoscaling-custom-install.adoc#nodes-cma-autoscaling-custom-install_nodes-cma-autoscaling-custom-install[Installing the custom metrics autoscaler] +* xref:../../nodes/cma/nodes-cma-autoscaling-custom-install.adoc#nodes-cma-autoscaling-custom-install_nodes-cma-autoscaling-custom-install[Installing the custom metrics autoscaler] -* xref:../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] +* xref:../../observability/monitoring/enabling-monitoring-for-user-defined-projects.adoc#enabling-monitoring-for-user-defined-projects_enabling-monitoring-for-user-defined-projects[Enabling monitoring for user-defined projects] -* xref:../nodes/cma/nodes-cma-autoscaling-custom-trigger-auth.adoc#nodes-cma-autoscaling-custom-trigger-auth[Understanding custom metrics autoscaler trigger authentications] +* xref:../../nodes/cma/nodes-cma-autoscaling-custom-trigger-auth.adoc#nodes-cma-autoscaling-custom-trigger-auth[Understanding custom metrics autoscaler trigger authentications] -* xref:../nodes/cma/nodes-cma-autoscaling-custom-trigger.adoc#nodes-cma-autoscaling-custom-prometheus[Configuring the custom metrics autoscaler to use {product-title} monitoring] +* xref:../../nodes/cma/nodes-cma-autoscaling-custom-trigger.adoc#nodes-cma-autoscaling-custom-prometheus[Understanding custom metrics autoscaler triggers] -* xref:../nodes/cma/nodes-cma-autoscaling-custom-adding.adoc#nodes-cma-autoscaling-custom-adding[Understanding how to add custom metrics autoscalers] +* xref:../../nodes/cma/nodes-cma-autoscaling-custom-adding.adoc#nodes-cma-autoscaling-custom-adding[Understanding how to add custom metrics autoscalers] endif::openshift-rosa,openshift-dedicated[] include::modules/nw-scaling-ingress-controller.adoc[leveloffset=+2] @@ -102,7 +102,7 @@ include::modules/nw-ingress-controller-configuration-proxy-protocol.adoc[levelof [role="_additional-resources"] .Additional resources -* xref:../networking/ingress-operator.adoc#nw-configure-ingress-access-logging_configuring-ingress[Configuring Ingress access logging] +* xref:../../networking/networking_operators/ingress-operator.adoc#nw-configure-ingress-access-logging_configuring-ingress[Configuring Ingress access logging] // Specifying an alternative cluster domain using the appsDomain option include::modules/nw-ingress-configuring-application-domain.adoc[leveloffset=+2] @@ -127,5 +127,5 @@ ifndef::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] == Additional resources -* xref:../networking/configuring-a-custom-pki.adoc#configuring-a-custom-pki[Configuring a custom PKI] +* xref:../../networking/configuring-a-custom-pki.adoc#configuring-a-custom-pki[Configuring a custom PKI] endif::openshift-rosa,openshift-dedicated[] \ No newline at end of file diff --git a/networking/networking_operators/metallb-operator/_attributes b/networking/networking_operators/metallb-operator/_attributes new file mode 120000 index 0000000000..20cc1dcb77 --- /dev/null +++ b/networking/networking_operators/metallb-operator/_attributes @@ -0,0 +1 @@ +../../_attributes/ \ No newline at end of file diff --git a/networking/metallb/about-metallb.adoc b/networking/networking_operators/metallb-operator/about-metallb.adoc similarity index 73% rename from networking/metallb/about-metallb.adoc rename to networking/networking_operators/metallb-operator/about-metallb.adoc index 2435aa9fdc..8fd3de52d8 100644 --- a/networking/metallb/about-metallb.adoc +++ b/networking/networking_operators/metallb-operator/about-metallb.adoc @@ -43,8 +43,8 @@ include::modules/nw-metallb-bgp-limitations.adoc[leveloffset=+2] [id="additional-resources_about-metallb-and-metallb-operator"] == Additional resources -* xref:../../networking/configuring_ingress_cluster_traffic/overview-traffic.adoc#overview-traffic-comparision_overview-traffic[Comparison: Fault tolerant access to external IP addresses] +* xref:../../../networking/configuring_ingress_cluster_traffic/overview-traffic.adoc#overview-traffic-comparision_overview-traffic[Comparison: Fault tolerant access to external IP addresses] -* xref:../../networking/configuring-ipfailover.adoc#nw-ipfailover-remove_configuring-ipfailover[Removing IP failover] +* xref:../../../networking/configuring-ipfailover.adoc#nw-ipfailover-remove_configuring-ipfailover[Removing IP failover] -* xref:../../networking/metallb/metallb-operator-install.adoc#nw-metallb-operator-deployment-specifications-for-metallb_metallb-operator-install[Deployment specifications for MetalLB] +* xref:../../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#nw-metallb-operator-deployment-specifications-for-metallb_metallb-operator-install[Deployment specifications for MetalLB] diff --git a/networking/networking_operators/metallb-operator/images b/networking/networking_operators/metallb-operator/images new file mode 120000 index 0000000000..847b03ed05 --- /dev/null +++ b/networking/networking_operators/metallb-operator/images @@ -0,0 +1 @@ +../../images/ \ No newline at end of file diff --git a/networking/metallb/metallb-operator-install.adoc b/networking/networking_operators/metallb-operator/metallb-operator-install.adoc similarity index 57% rename from networking/metallb/metallb-operator-install.adoc rename to networking/networking_operators/metallb-operator/metallb-operator-install.adoc index 4bb8c5f8a3..fc6ec1f7e4 100644 --- a/networking/metallb/metallb-operator-install.adoc +++ b/networking/networking_operators/metallb-operator/metallb-operator-install.adoc @@ -6,9 +6,9 @@ include::_attributes/common-attributes.adoc[] toc::[] -As a cluster administrator, you can add the MetallB Operator so that the Operator can manage the lifecycle for an instance of MetalLB on your cluster. +As a cluster administrator, you can add the MetalLB Operator so that the Operator can manage the lifecycle for an instance of MetalLB on your cluster. -MetalLB and IP failover are incompatible. If you configured IP failover for your cluster, perform the steps to xref:../../networking/configuring-ipfailover.adoc#nw-ipfailover-remove_configuring-ipfailover[remove IP failover] before you install the Operator. +MetalLB and IP failover are incompatible. If you configured IP failover for your cluster, perform the steps to xref:../../../networking/configuring-ipfailover.adoc#nw-ipfailover-remove_configuring-ipfailover[remove IP failover] before you install the Operator. // Install the Operator with console @@ -36,12 +36,12 @@ include::modules/nw-metallb-operator-setting-pod-CPU-limits.adoc[leveloffset=+2] [id="additional-resources_metallb-operator-install"] == Additional resources -* xref:../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] -* xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about[Understanding taints and tolerations] -* xref:../../nodes/pods/nodes-pods-priority.adoc#nodes-pods-priority-about_nodes-pods-priority[Understanding pod priority] -* xref:../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity-about_nodes-scheduler-pod-affinity[Understanding pod affinity] +* xref:../../../nodes/scheduling/nodes-scheduler-node-selectors.adoc#nodes-scheduler-node-selectors[Placing pods on specific nodes using node selectors] +* xref:../../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations-about[Controlling pod placement using node taints] +* xref:../../../nodes/pods/nodes-pods-priority.adoc#nodes-pods-priority-about_nodes-pods-priority[Understanding pod priority] +* xref:../../../nodes/scheduling/nodes-scheduler-pod-affinity.adoc#nodes-scheduler-pod-affinity-about_nodes-scheduler-pod-affinity[Understanding pod affinity] [id="next-steps_{context}"] == Next steps -* xref:../../networking/metallb/metallb-configure-address-pools.adoc#metallb-configure-address-pools[Configuring MetalLB address pools] +* xref:../../../networking/metallb/metallb-configure-address-pools.adoc#nw-metallb-configure-address-pool_configure-metallb-address-pools[Configuring MetalLB address pools] diff --git a/networking/metallb/metallb-upgrading-operator.adoc b/networking/networking_operators/metallb-operator/metallb-upgrading-operator.adoc similarity index 86% rename from networking/metallb/metallb-upgrading-operator.adoc rename to networking/networking_operators/metallb-operator/metallb-upgrading-operator.adoc index 02de16cace..2c50bd6d30 100644 --- a/networking/metallb/metallb-upgrading-operator.adoc +++ b/networking/networking_operators/metallb-operator/metallb-upgrading-operator.adoc @@ -36,7 +36,7 @@ include::modules/nw-metalLB-basic-upgrade-operator.adoc[leveloffset=+1] [id="additional-resources"] == Additional resources -* xref:../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster] +* xref:../../../operators/admin/olm-deleting-operators-from-cluster.adoc#olm-deleting-operators-from-a-cluster[Deleting Operators from a cluster] -* xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator] +* xref:../../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator] diff --git a/networking/networking_operators/metallb-operator/modules b/networking/networking_operators/metallb-operator/modules new file mode 120000 index 0000000000..36719b9de7 --- /dev/null +++ b/networking/networking_operators/metallb-operator/modules @@ -0,0 +1 @@ +../../modules/ \ No newline at end of file diff --git a/networking/networking_operators/metallb-operator/snippets b/networking/networking_operators/metallb-operator/snippets new file mode 120000 index 0000000000..5a3f5add14 --- /dev/null +++ b/networking/networking_operators/metallb-operator/snippets @@ -0,0 +1 @@ +../../snippets/ \ No newline at end of file diff --git a/networking/routes/route-configuration.adoc b/networking/routes/route-configuration.adoc index 78ec48e9fd..b73971b871 100644 --- a/networking/routes/route-configuration.adoc +++ b/networking/routes/route-configuration.adoc @@ -41,8 +41,7 @@ include::modules/nw-throughput-troubleshoot.adoc[leveloffset=+1] * xref:../../nodes/edge/nodes-edge-remote-workers.adoc#nodes-edge-remote-workers-latency[Latency spikes or temporary reduction in throughput to remote workers] - -* xref:../../networking/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration +* xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] endif::[] @@ -76,4 +75,4 @@ endif::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] .Additional resources -* xref:../../networking/ingress-operator.adoc#configuring-ingress[Specifying an alternative cluster domain using the appsDomain option] +* xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-configuring-application-domain_configuring-ingress[Specifying an alternative cluster domain using the appsDomain option] diff --git a/nodes/scheduling/nodes-scheduler-taints-tolerations.adoc b/nodes/scheduling/nodes-scheduler-taints-tolerations.adoc index d5ef03184b..3e7ce509bb 100644 --- a/nodes/scheduling/nodes-scheduler-taints-tolerations.adoc +++ b/nodes/scheduling/nodes-scheduler-taints-tolerations.adoc @@ -6,8 +6,6 @@ include::_attributes/common-attributes.adoc[] toc::[] - - Taints and tolerations allow the node to control which pods should (or should not) be scheduled on them. // The following include statements pull in the module files that comprise diff --git a/post_installation_configuration/cluster-tasks.adoc b/post_installation_configuration/cluster-tasks.adoc index 515d4d9c7e..8b302bfe1b 100644 --- a/post_installation_configuration/cluster-tasks.adoc +++ b/post_installation_configuration/cluster-tasks.adoc @@ -60,7 +60,7 @@ so that you can use Tech Preview features. |Configures how specific xref:../openshift_images/image-configuration.adoc#image-configuration[image registries] should be treated (allowed, disallowed, insecure, CA details). |`ingress.config.openshift.io` -|Configuration details related to xref:../networking/ingress-operator.adoc#nw-installation-ingress-config-asset_configuring-ingress[routing] such as the default domain for routes. +|Configuration details related to xref:../networking/networking_operators/ingress-operator.adoc#nw-installation-ingress-config-asset_ingress-operator[routing] such as the default domain for routes. |`oauth.config.openshift.io` |Configures identity providers and other behavior related to xref:../authentication/configuring-internal-oauth.adoc#configuring-internal-oauth[internal OAuth server] flows. @@ -124,7 +124,7 @@ documentation for details on how and when you can create additional resource ins |`ingresscontroller.operator.openshift.io` |`default` |`openshift-ingress-operator` -|Configures xref:../networking/ingress-operator.adoc#configuring-ingress[Ingress Operator] behavior such as domain, number of replicas, certificates, and controller placement. +|Configures xref:../networking/networking_operators/ingress-operator.adoc#configuring-ingress-controller[Ingress Operator] behavior such as domain, number of replicas, certificates, and controller placement. |=== @@ -147,7 +147,7 @@ xref:../updating/updating_a_cluster/updating-cluster-web-console.adoc#updating-c |`dns.config.openshift.io` |`cluster` |You cannot modify the DNS settings for your cluster. You can -xref:../networking/dns-operator.adoc#dns-operator[view the DNS Operator status]. +xref:../networking/networking_operators/dns-operator.adoc#nw-dns-operator-status_dns-operator[check the DNS Operator status]. |`infrastructure.config.openshift.io` |`cluster` diff --git a/post_installation_configuration/post-install-network-configuration.adoc b/post_installation_configuration/post-install-network-configuration.adoc index e830f416f7..e0fa02be37 100644 --- a/post_installation_configuration/post-install-network-configuration.adoc +++ b/post_installation_configuration/post-install-network-configuration.adoc @@ -12,7 +12,7 @@ After installing {product-title}, you can further expand and customize your netw == Using the Cluster Network Operator include::snippets/cluster-network-operator-abstract.adoc[] -For more information, see xref:../networking/cluster-network-operator.adoc#cluster-network-operator[Cluster Network Operator in {product-title}]. +For more information, see xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator in {product-title}]. [id="post-install-network-configuration-tasks"] == Network configuration tasks diff --git a/rosa_architecture/index.adoc b/rosa_architecture/index.adoc index 59f809d44a..89c9e946f1 100644 --- a/rosa_architecture/index.adoc +++ b/rosa_architecture/index.adoc @@ -244,7 +244,7 @@ Manage machines, provide services to users, and follow monitoring and logging re - **Manage xref:../security/certificates/replacing-default-ingress-certificate.adoc#replacing-default-ingress[ingress], xref:../security/certificates/api-server.adoc#api-server-certificates[API server], and xref:../security/certificates/service-serving-certificate.adoc#add-service-serving[service] certificates**: {product-title} creates certificates by default for the Ingress Operator, the API server, and for services needed by complex middleware applications that require encryption. You might need to change, add, or rotate these certificates. -- **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/cluster-network-operator.adoc#cluster-network-operator[Cluster Network Operator] (CNO). The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. By using +- **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] (CNO). The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. By using xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[network policy] features, you can isolate your pods or permit selected traffic. - **xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can be reviewed by cluster administrators and xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[installed on their clusters]. After you install them, you can xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[run], xref:../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[upgrade], back up, or otherwise manage the Operator on your cluster. diff --git a/scalability_and_performance/optimization/optimizing-networking.adoc b/scalability_and_performance/optimization/optimizing-networking.adoc index b743f6d90a..0782a10266 100644 --- a/scalability_and_performance/optimization/optimizing-networking.adoc +++ b/scalability_and_performance/optimization/optimizing-networking.adoc @@ -34,5 +34,7 @@ include::modules/ipsec-impact-networking.adoc[leveloffset=+1] == Additional resources * xref:../../installing/installing_aws/ipi/installing-aws-network-customizations.adoc#modifying-nwoperator-config-startup_installing-aws-network-customizations[Specifying advanced network configuration] -* xref:../../networking/cluster-network-operator.adoc#nw-operator-configuration-parameters-for-ovn-sdn_cluster-network-operator[Configuration parameters for the OVN-Kubernetes network plugin] + +* xref:../../networking/networking_operators/cluster-network-operator.adoc#nw-operator-cr_cluster-network-operator[Cluster Network Operator configuration] + * xref:../../scalability_and_performance/scaling-worker-latency-profiles.adoc#scaling-worker-latency-profiles[Improving cluster stability in high latency environments using worker latency profiles] diff --git a/scalability_and_performance/optimization/routing-optimization.adoc b/scalability_and_performance/optimization/routing-optimization.adoc index a087f585be..13ab2c44fc 100644 --- a/scalability_and_performance/optimization/routing-optimization.adoc +++ b/scalability_and_performance/optimization/routing-optimization.adoc @@ -12,7 +12,7 @@ include::modules/baseline-router-performance.adoc[leveloffset=+1] For more information on Ingress sharding, see xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc#nw-ingress-sharding-route-labels_configuring-ingress-cluster-traffic-ingress-controller[Configuring Ingress Controller sharding by using route labels] and xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.adoc#nw-ingress-sharding-namespace-labels_configuring-ingress-cluster-traffic-ingress-controller[Configuring Ingress Controller sharding by using namespace labels]. -You can modify the Ingress Controller deployment by using the information provided in xref:../../networking/ingress-operator.adoc#nw-ingress-setting-thread-count_configuring-ingress[Setting Ingress Controller thread count] for threads and xref:../../networking/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] for timeouts, and other tuning configurations in the Ingress Controller specification. +You can modify the Ingress Controller deployment by using the information provided in xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-setting-thread-count_configuring-ingress[Setting Ingress Controller thread count] for threads and xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-controller-configuration-parameters_configuring-ingress[Ingress Controller configuration parameters] for timeouts, and other tuning configurations in the Ingress Controller specification. include::modules/ingress-liveness-readiness-startup-probes.adoc[leveloffset=+1] include::modules/configuring-haproxy-interval.adoc[leveloffset=+1] diff --git a/scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-design-components.adoc b/scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-design-components.adoc index 3e414dc5d4..5679f034e2 100644 --- a/scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-design-components.adoc +++ b/scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-design-components.adoc @@ -39,14 +39,14 @@ include::modules/telco-core-cluster-network-operator.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../../networking/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] +* xref:../../../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] include::modules/telco-core-load-balancer.adoc[leveloffset=+1] [role="_additional-resources"] .Additional resources -* xref:../../../networking/metallb/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] +* xref:../../../networking/networking_operators/metallb-operator/about-metallb.adoc#nw-metallb-when-metallb_about-metallb-and-metallb-operator[When to use MetalLB] include::modules/telco-core-sriov.adoc[leveloffset=+1] diff --git a/security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc b/security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc index 9d840308c6..3e4ddda285 100644 --- a/security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc +++ b/security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc @@ -17,7 +17,7 @@ The Ingress Operator generates a default certificate for an Ingress Controller t == Location -The user-provided certificates must be provided in a `tls` type `Secret` resource in the `openshift-ingress` namespace. Update the `IngressController` CR in the `openshift-ingress-operator` namespace to enable the use of the user-provided certificate. For more information on this process, see xref:../../networking/ingress-operator.adoc#nw-ingress-setting-a-custom-default-certificate_configuring-ingress[Setting a custom default certificate]. +The user-provided certificates must be provided in a `tls` type `Secret` resource in the `openshift-ingress` namespace. Update the `IngressController` CR in the `openshift-ingress-operator` namespace to enable the use of the user-provided certificate. For more information on this process, see xref:../../networking/networking_operators/ingress-operator.adoc#nw-ingress-setting-a-custom-default-certificate_configuring-ingress[Setting a custom default certificate]. == Management diff --git a/service_mesh/v1x/ossm-custom-resources.adoc b/service_mesh/v1x/ossm-custom-resources.adoc index 500b9ffc93..0f6fb51a9a 100644 --- a/service_mesh/v1x/ossm-custom-resources.adoc +++ b/service_mesh/v1x/ossm-custom-resources.adoc @@ -24,7 +24,7 @@ include::modules/ossm-cr-istio-global.adoc[leveloffset=+2] include::modules/ossm-cr-gateway.adoc[leveloffset=+2] ifdef::openshift-enterprise[] -Cluster administrators can refer to xref:../../networking/ingress-operator.adoc#using-wildcard-routes_configuring-ingress[Using wildcard routes] for instructions on how to enable subdomains. +Cluster administrators can refer to "Using wildcard routes" in xref:../../networking/networking_operators/ingress-operator.adoc#using-wildcard-routes[Ingress Operator in {product-title}] for instructions on how to enable subdomains. endif::[] include::modules/ossm-cr-mixer.adoc[leveloffset=+2] diff --git a/service_mesh/v1x/ossm-traffic-manage.adoc b/service_mesh/v1x/ossm-traffic-manage.adoc index 12263bfd95..a155045cbb 100644 --- a/service_mesh/v1x/ossm-traffic-manage.adoc +++ b/service_mesh/v1x/ossm-traffic-manage.adoc @@ -37,5 +37,5 @@ include::modules/ossm-routing-bookinfo-route.adoc[leveloffset=+2] ifdef::openshift-enterprise[] [role="_additional-resources-traffic-management"] == Additional resources -For more information about configuring an {product-title} wildcard policy, see xref:../../networking/ingress-operator.adoc#using-wildcard-routes_configuring-ingress[Using wildcard routes]. +For more information about configuring an {product-title} wildcard policy, see "Using wildcard routes" in xref:../../networking/networking_operators/ingress-operator.adoc#using-wildcard-routes[Ingress Operator in {product-title}]. endif::[] diff --git a/service_mesh/v2x/ossm-traffic-manage.adoc b/service_mesh/v2x/ossm-traffic-manage.adoc index 3dc851741b..b90a4baa2a 100644 --- a/service_mesh/v2x/ossm-traffic-manage.adoc +++ b/service_mesh/v2x/ossm-traffic-manage.adoc @@ -48,7 +48,7 @@ Starting with {SMProductShortName} 2.5, automatic routes are disabled by default {SMProductName} creates the route with the subdomain, but {product-title} must be configured to enable it. Subdomains, for example `*.domain.com`, are supported, but not by default. Configure an {product-title} wildcard policy before configuring a wildcard host gateway. ifdef::openshift-enterprise[] -For more information, see xref:../../networking/ingress-operator.adoc#using-wildcard-routes_configuring-ingress[Using wildcard routes]. +For more information, see "Using wildcard routes" in xref:../../networking/networking_operators/ingress-operator.adoc#using-wildcard-routes[Ingress Operator in {product-title}]. endif::[] include::modules/ossm-auto-route.adoc[leveloffset=+2] diff --git a/virt/post_installation_configuration/virt-post-install-network-config.adoc b/virt/post_installation_configuration/virt-post-install-network-config.adoc index bc21234b08..bea53e0c37 100644 --- a/virt/post_installation_configuration/virt-post-install-network-config.adoc +++ b/virt/post_installation_configuration/virt-post-install-network-config.adoc @@ -20,11 +20,11 @@ You must install the xref:../../networking/networking_operators/k8s-nmstate-abou endif::openshift-rosa,openshift-dedicated[] ifndef::openshift-rosa,openshift-dedicated[] -You can install the xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[SR-IOV Operator] to manage SR-IOV network devices and network attachments. For installation instructions, see xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sriov-operator[Installing the SR-IOV Network Operator]. +You can install the xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[SR-IOV Operator] to manage SR-IOV network devices and network attachments. For installation instructions, see xref:../../networking/hardware_networks/installing-sriov-operator.adoc#installing-sr-iov-operator_installing-sriov-operator[Installing the SR-IOV Network Operator].. endif::openshift-rosa,openshift-dedicated[] ifndef::openshift-rosa,openshift-dedicated[] -You can add the xref:../../networking/metallb/about-metallb.adoc#about-metallb[MetalLB Operator] to manage the lifecycle for an instance of MetalLB on your cluster. For installation instructions, see xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator from the OperatorHub using the web console]. +You can add the xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb[About MetalLB and the MetalLB Operator] to manage the lifecycle for an instance of MetalLB on your cluster. For installation instructions, see xref:../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#installing-the-metallb-operator-using-web-console_metallb-operator-install[Installing the MetalLB Operator from the OperatorHub using the web console]. endif::openshift-rosa,openshift-dedicated[] [id="configuring-linux-bridge-network"] diff --git a/virt/vm_networking/virt-accessing-vm-secondary-network-fqdn.adoc b/virt/vm_networking/virt-accessing-vm-secondary-network-fqdn.adoc index 5aefb4059c..5f91e94be3 100644 --- a/virt/vm_networking/virt-accessing-vm-secondary-network-fqdn.adoc +++ b/virt/vm_networking/virt-accessing-vm-secondary-network-fqdn.adoc @@ -21,6 +21,6 @@ include::modules/virt-connecting-vm-secondarynw-using-fqdn.adoc[leveloffset=+1] // Hiding until OSDOCS-3691 is merged ifndef::openshift-rosa,openshift-dedicated[] * xref:../../networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-load-balancer.adoc#configuring-ingress-cluster-traffic-load-balancer[Configuring ingress cluster traffic using a load balancer] -* xref:../../networking/metallb/about-metallb.adoc#about-metallb[Load balancing with MetalLB] +* xref:../../networking/networking_operators/metallb-operator/about-metallb.adoc#about-metallb_about-metallb[About MetalLB and the MetalLB Operator] endif::openshift-rosa,openshift-dedicated[] * xref:../../virt/vm_networking/virt-configuring-viewing-ips-for-vms.adoc#configuring-ips_virt-configuring-viewing-ips-for-vms[Configuring IP addresses for virtual machines] diff --git a/virt/vm_networking/virt-exposing-vm-with-service.adoc b/virt/vm_networking/virt-exposing-vm-with-service.adoc index 4fab64b996..e6135b1cfd 100644 --- a/virt/vm_networking/virt-exposing-vm-with-service.adoc +++ b/virt/vm_networking/virt-exposing-vm-with-service.adoc @@ -14,7 +14,7 @@ include::modules/virt-about-services.adoc[leveloffset=+1] ifndef::openshift-rosa,openshift-dedicated[] [role="_additional-resources"] .Additional resources -* xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[Installing the MetalLB Operator] +* xref:../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#metallb-operator-install_metallb-operator-install[Installing the MetalLB Operator] * xref:../../networking/metallb/metallb-configure-services.adoc#metallb-configure-services[Configuring services to use MetalLB] endif::openshift-rosa,openshift-dedicated[] diff --git a/virt/vm_networking/virt-networking-overview.adoc b/virt/vm_networking/virt-networking-overview.adoc index 08f792394f..869a06039f 100644 --- a/virt/vm_networking/virt-networking-overview.adoc +++ b/virt/vm_networking/virt-networking-overview.adoc @@ -48,7 +48,7 @@ xref:../../virt/vm_networking/virt-exposing-vm-with-service.adoc#virt-exposing-v // Hiding from ROSA/OSD until OSDOCS-3691 is merged ifndef::openshift-rosa,openshift-dedicated[] -You can expose a VM within the cluster or outside the cluster by creating a `Service` object. For on-premise clusters, you can configure a load balancing service by using the MetalLB Operator. You can xref:../../networking/metallb/metallb-operator-install.adoc#metallb-operator-install[install the MetalLB Operator] by using the {product-title} web console or the CLI. +You can expose a VM within the cluster or outside the cluster by creating a `Service` object. For on-premise clusters, you can configure a load balancing service by using the MetalLB Operator. You can xref:../../networking/networking_operators/metallb-operator/metallb-operator-install.adoc#metallb-operator-install_metallb-operator-install[install the MetalLB Operator] by using the {product-title} web console or the CLI. endif::openshift-rosa,openshift-dedicated[] // Hiding from ROSA/OSD until OSDOCS-3691 is merged ifdef::openshift-rosa,openshift-dedicated[] diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc index e5f72b501f..cf68313243 100644 --- a/welcome/learn_more_about_openshift.adoc +++ b/welcome/learn_more_about_openshift.adoc @@ -153,7 +153,7 @@ a|* xref:../machine_management/index.adoc#machine-api-overview_overview-of-machi | | xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking] -a|* xref:../networking/cluster-network-operator.adoc#cluster-network-operator[Cluster Network Operator] +a|* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] * xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] * xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[network policy]