diff --git a/modules/configuration-ovnk-multi-network-policy.adoc b/modules/configuration-ovnk-multi-network-policy.adoc index 74e996a4ed6e..5efd18cec113 100644 --- a/modules/configuration-ovnk-multi-network-policy.adoc +++ b/modules/configuration-ovnk-multi-network-policy.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: CONCEPT [id="compatibility-with-multi-network-policy_{context}"] diff --git a/modules/configuration-ovnk-network-plugin-json-object.adoc b/modules/configuration-ovnk-network-plugin-json-object.adoc index 04ae04eb1599..c513ee7e2503 100644 --- a/modules/configuration-ovnk-network-plugin-json-object.adoc +++ b/modules/configuration-ovnk-network-plugin-json-object.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: REFERENCE [id="configuration-ovnk-network-plugin-json-object_{context}"] diff --git a/modules/configuring-egress-proxy.adoc b/modules/configuring-egress-proxy.adoc index 629820a0f243..743fb8b10706 100644 --- a/modules/configuring-egress-proxy.adoc +++ b/modules/configuring-egress-proxy.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/networking-operators/aws_load_balancer_operator/configuring-aws-load-balancer-operator/configure-egress-proxy-aws-load-balancer-operator.adoc +// * networking/networking-operators/aws_load_balancer_operator/configuring-aws-load-balancer-operator/configuring-aws-load-balancer-operator.adoc :_mod-docs-content-type: PROCEDURE [id="nw-configuring-cluster-wide-proxy_{context}"] diff --git a/modules/configuring-layer-two-switched-topology.adoc b/modules/configuring-layer-two-switched-topology.adoc index af575a2f7995..0d7466702e06 100644 --- a/modules/configuring-layer-two-switched-topology.adoc +++ b/modules/configuring-layer-two-switched-topology.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: CONCEPT [id="configuration-layer-two-switched-topology_{context}"] diff --git a/modules/configuring-ovnk-additional-networks.adoc b/modules/configuring-ovnk-additional-networks.adoc index cd3dbeeceb3c..d0e2b2bccc32 100644 --- a/modules/configuring-ovnk-additional-networks.adoc +++ b/modules/configuring-ovnk-additional-networks.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: CONCEPT [id="configuration-ovnk-additional-networks_{context}"] diff --git a/modules/configuring-pods-secondary-network.adoc b/modules/configuring-pods-secondary-network.adoc index 03e9adbe474c..8e6aac3d737b 100644 --- a/modules/configuring-pods-secondary-network.adoc +++ b/modules/configuring-pods-secondary-network.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: REFERENCE [id="configuring-pods-secondary-network_{context}"] diff --git a/modules/configuring-pods-static-ip.adoc b/modules/configuring-pods-static-ip.adoc index 8f2ac9ad65c6..37a63a3d7de8 100644 --- a/modules/configuring-pods-static-ip.adoc +++ b/modules/configuring-pods-static-ip.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-ovnk.adoc :_mod-docs-content-type: CONCEPT [id="configuring-pods-static-ip_{context}"] diff --git a/modules/nw-about-configuring-master-interface-container.adoc b/modules/nw-about-configuring-master-interface-container.adoc index cba5e7f09cfd..edcc71e9b88b 100644 --- a/modules/nw-about-configuring-master-interface-container.adoc +++ b/modules/nw-about-configuring-master-interface-container.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-master-interface.adoc :_mod-docs-content-type: CONCEPT [id="nw-about-configuring-master-interface-container_{context}"] diff --git a/modules/nw-multus-bridge-object.adoc b/modules/nw-multus-bridge-object.adoc index cfe98f45408e..260276b42cc0 100644 --- a/modules/nw-multus-bridge-object.adoc +++ b/modules/nw-multus-bridge-object.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-networks-other-cni.adoc // * microshift_networking/microshift_multiple_networks/microshift_cni_multus.adoc :_mod-docs-content-type: REFERENCE diff --git a/modules/nw-multus-configure-dualstack-ip-address.adoc b/modules/nw-multus-configure-dualstack-ip-address.adoc index 17e19aebe7ec..6c701a141670 100644 --- a/modules/nw-multus-configure-dualstack-ip-address.adoc +++ b/modules/nw-multus-configure-dualstack-ip-address.adoc @@ -1,6 +1,8 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc +// * networking/hardware_networks/configuring-sriov-net-attach.adoc +// * networking/hardware_networks/configuring-sriov-ib-attach.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-configure-dualstack-ip-address_{context}"] diff --git a/modules/nw-multus-configuring-whereabouts-ip-reconciler-schedule.adoc b/modules/nw-multus-configuring-whereabouts-ip-reconciler-schedule.adoc index d9b2a8a61e2b..a98af9270487 100644 --- a/modules/nw-multus-configuring-whereabouts-ip-reconciler-schedule.adoc +++ b/modules/nw-multus-configuring-whereabouts-ip-reconciler-schedule.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-configuring-whereabouts-ip-reconciler-schedule_{context}"] diff --git a/modules/nw-multus-create-master-interface-bridge-cni.adoc b/modules/nw-multus-create-master-interface-bridge-cni.adoc index aedd5998fafc..a4aeb537f68a 100644 --- a/modules/nw-multus-create-master-interface-bridge-cni.adoc +++ b/modules/nw-multus-create-master-interface-bridge-cni.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-master-interface.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-create-master-interface-bridge-cni_{context}"] diff --git a/modules/nw-multus-create-multiple-vlans-sriov.adoc b/modules/nw-multus-create-multiple-vlans-sriov.adoc index c969462ffb3f..8c593329c808 100644 --- a/modules/nw-multus-create-multiple-vlans-sriov.adoc +++ b/modules/nw-multus-create-multiple-vlans-sriov.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-master-interface.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-create-multiple-vlans-sriov_{context}"] diff --git a/modules/nw-multus-create-network-apply.adoc b/modules/nw-multus-create-network-apply.adoc index 3b1814a417b2..770714c97a17 100644 --- a/modules/nw-multus-create-network-apply.adoc +++ b/modules/nw-multus-create-network-apply.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/primary_networks/about-primary-nwt-nad.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-create-network-apply_{context}"] diff --git a/modules/nw-multus-create-network.adoc b/modules/nw-multus-create-network.adoc index 27b2c3b3c8ca..7eedbc99d249 100644 --- a/modules/nw-multus-create-network.adoc +++ b/modules/nw-multus-create-network.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/primary_networks/about-primary-nwt-nad.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-create-network_{context}"] diff --git a/modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc b/modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc index d6cd5c01e847..05f210c4e4e0 100644 --- a/modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc +++ b/modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc :_mod-docs-content-type: PROCEDURE [id="nw-multus-creating-whereabouts-reconciler-daemon-set_{context}"] diff --git a/modules/nw-multus-dummy-device-object.adoc b/modules/nw-multus-dummy-device-object.adoc deleted file mode 100644 index 64afe7227a75..000000000000 --- a/modules/nw-multus-dummy-device-object.adoc +++ /dev/null @@ -1,52 +0,0 @@ -// Module included in the following assemblies: -// -// * networking/multiple_networks/configuring-additional-network.adoc - -:_mod-docs-content-type: REFERENCE -[id="nw-multus-dummy-device-object_{context}"] -= Configuration for a dummy device additional network - -The dummy CNI plugin functions like a loopback device. The plugin is a virtual interface, and you can use the plugin to route the packets to a designated IP address. Unlike a loopback device, the IP address is arbitrary and is not restricted to the `127.0.0.0/8` address range. - -The following object describes the configuration parameters for the dummy CNI plugin: - -.Dummy device CNI plugin JSON configuration object -[cols=".^2,.^2,.^6",options="header"] -|==== -|Field|Type|Description - -|`cniVersion` -|`string` -|The CNI specification version. The required value is `0.3.1`. - -|`name` -|`string` -|The value for the `name` parameter that you previously specified for the CNO configuration. - -|`type` -|`string` -|The name of the CNI plugin that you want to configure. The required value is `dummy`. - -|`ipam` -|`object` -|The configuration object for the IPAM CNI plugin. The plugin manages the IP address assignment for the attachment definition. - -|==== - -[id="nw-multus-dummy-device-config-example_{context}"] -== dummy configuration example - -The following example configures an additional network named `hostdev-net`: - -[source,json] ----- -{ - "cniVersion": "0.3.1", - "name": "dummy-net", - "type": "dummy", - "ipam": { - "type": "host-local", - "subnet": "10.1.1.0/24" - } -} ----- diff --git a/modules/nw-multus-host-device-object.adoc b/modules/nw-multus-host-device-object.adoc index 49b68102e44d..c9e78619cd93 100644 --- a/modules/nw-multus-host-device-object.adoc +++ b/modules/nw-multus-host-device-object.adoc @@ -1,6 +1,7 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc + :_mod-docs-content-type: REFERENCE [id="nw-multus-host-device-object_{context}"] = Configuration for a host device secondary network diff --git a/modules/nw-multus-ipam-object.adoc b/modules/nw-multus-ipam-object.adoc index 0e5029a67366..76b25b456001 100644 --- a/modules/nw-multus-ipam-object.adoc +++ b/modules/nw-multus-ipam-object.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/hardware_networks/configuring-sriov-ib-attach.adoc // * networking/hardware_networks/configuring-sriov-net-attach.adoc -// * virt/vm_networking/virt-connecting-vm-to-sriov.adoc +// * networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc // Because the Cluster Network Operator abstracts the configuration for // Macvlan, including IPAM configuration, this must be provided as YAML diff --git a/modules/nw-multus-ipvlan-object.adoc b/modules/nw-multus-ipvlan-object.adoc index 7e633e2d359b..b96e76fbfc8c 100644 --- a/modules/nw-multus-ipvlan-object.adoc +++ b/modules/nw-multus-ipvlan-object.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc // * microshift_networking/microshift_multiple_networks/microshift_cni_multus.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc //37.1. IPVLAN overview // https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_and_managing_networking/getting-started-with-ipvlan_configuring-and-managing-networking#ipvlan-overview_getting-started-with-ipvlan diff --git a/modules/nw-multus-macvlan-object.adoc b/modules/nw-multus-macvlan-object.adoc index c9b03f09d4af..fadd49cac840 100644 --- a/modules/nw-multus-macvlan-object.adoc +++ b/modules/nw-multus-macvlan-object.adoc @@ -1,7 +1,7 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc // * microshift_networking/microshift_multiple_networks/microshift_cni_multus.adoc +// * networking/multiple_networks_secondary_networks_creating-secondary-nwt-other-cni.adoc :_mod-docs-content-type: REFERENCE [id="nw-multus-macvlan-object_{context}"] diff --git a/modules/nw-multus-tap-object.adoc b/modules/nw-multus-tap-object.adoc index d36f0cd41a7d..6016ca9fe7ad 100644 --- a/modules/nw-multus-tap-object.adoc +++ b/modules/nw-multus-tap-object.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc :_mod-docs-content-type: REFERENCE [id="nw-multus-tap-object_{context}"] diff --git a/modules/nw-multus-vlan-object.adoc b/modules/nw-multus-vlan-object.adoc index 478ef1ae28ce..b130ddbf3a71 100644 --- a/modules/nw-multus-vlan-object.adoc +++ b/modules/nw-multus-vlan-object.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc //37.1. VLAN overview // diff --git a/modules/nw-multus-whereabouts.adoc b/modules/nw-multus-whereabouts.adoc index 2ea483b65cde..58738d644571 100644 --- a/modules/nw-multus-whereabouts.adoc +++ b/modules/nw-multus-whereabouts.adoc @@ -1,8 +1,8 @@ // Module included in the following assemblies: // -// * networking/multiple_networks/configuring-additional-network.adoc +// * networking/multiple_networks/secondary_networks/configuring-ip-secondary-nwt.adoc // * networking/hardware_networks/configuring-sriov-net-attach.adoc -// * virt/vm_networking/virt-connecting-vm-to-sriov.adoc +// * networking/hardware_networks/configuring-sriov-ib-attach.adoc :_mod-docs-content-type: REFERENCE [id="nw-multus-whereabouts_{context}"] diff --git a/modules/nw-route-override-cni.adoc b/modules/nw-route-override-cni.adoc index 67f154f2fa47..36608b538e75 100644 --- a/modules/nw-route-override-cni.adoc +++ b/modules/nw-route-override-cni.adoc @@ -1,7 +1,6 @@ // Module included in the following assemblies: // // * networking/multiple_networks/secondary_networks/creating-secondary-nwt-other-cni.adoc -// * networking/multiple_networks/configuring-additional secondary-network.adoc :_mod-docs-content-type: REFERENCE [id="nw-route-override-cni_{context}"] diff --git a/modules/virt-viewing-graphical-representation-of-network-state-of-node-console.adoc b/modules/virt-viewing-graphical-representation-of-network-state-of-node-console.adoc index 0020fcdf602e..f2a95a8b5859 100644 --- a/modules/virt-viewing-graphical-representation-of-network-state-of-node-console.adoc +++ b/modules/virt-viewing-graphical-representation-of-network-state-of-node-console.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * networking/k8s_nmstate/k8s-observing-node-network-state.adoc // * networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/virt-viewing-list-of-nodenetworkstate-resources-console.adoc b/modules/virt-viewing-list-of-nodenetworkstate-resources-console.adoc index 684fbb374124..c9ae617ebe30 100644 --- a/modules/virt-viewing-list-of-nodenetworkstate-resources-console.adoc +++ b/modules/virt-viewing-list-of-nodenetworkstate-resources-console.adoc @@ -1,6 +1,5 @@ // Module included in the following assemblies: // -// * networking/k8s_nmstate/k8s-observing-node-network-state.adoc // * networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc :_mod-docs-content-type: PROCEDURE diff --git a/modules/virt-viewing-network-state-of-node.adoc b/modules/virt-viewing-network-state-of-node.adoc index 5252ad2497db..e6730f7ed187 100644 --- a/modules/virt-viewing-network-state-of-node.adoc +++ b/modules/virt-viewing-network-state-of-node.adoc @@ -1,6 +1,6 @@ // Module included in the following assemblies: // -// * networking/k8s_nmstate/k8s-observing-node-network-state.adoc +// * networking/k8s_nmstate/k8s-nmstate-updating-node-network-config.adoc :_mod-docs-content-type: PROCEDURE [id="virt-viewing-network-state-of-node_{context}"] diff --git a/networking/k8s_nmstate/k8s-nmstate-observing-node-network-state.adoc b/networking/k8s_nmstate/k8s-nmstate-observing-node-network-state.adoc deleted file mode 100644 index 5439ca98eea4..000000000000 --- a/networking/k8s_nmstate/k8s-nmstate-observing-node-network-state.adoc +++ /dev/null @@ -1,16 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="k8s-nmstate-observing-node-network-state"] -= Observing node network state -include::_attributes/common-attributes.adoc[] -:VirtProductName: OpenShift Container Platform -:context: k8s-nmstate-observing-node-network-state - -toc::[] - -Node network state is the network configuration for all nodes in the cluster. - -include::modules/virt-viewing-network-state-of-node.adoc[leveloffset=+1] - -include::modules/virt-viewing-graphical-representation-of-network-state-of-node-console.adoc[leveloffset=+1] - -include::modules/virt-viewing-list-of-nodenetworkstate-resources-console.adoc[leveloffset=+1] diff --git a/networking/multiple_networks/configuring-additional-network.adoc b/networking/multiple_networks/configuring-additional-network.adoc deleted file mode 100644 index cf6674fda18b..000000000000 --- a/networking/multiple_networks/configuring-additional-network.adoc +++ /dev/null @@ -1,267 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="configuring-additional-network"] -= Configuring a primary network -include::_attributes/common-attributes.adoc[] -:context: configuring-additional-network - -toc::[] - -As a cluster administrator, you can configure a primary network for your cluster. The following network types are supported: - -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-bridge-object_configuring-additional-network[Bridge] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-dummy-device-object_configuring-additional-network[Dummy device] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-host-device-object_configuring-additional-network[Host device] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-vlan-object_configuring-additional-network[VLAN] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-ipvlan-object_configuring-additional-network[IPVLAN] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-macvlan-object_configuring-additional-network[MACVLAN] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-tap-object_configuring-additional-network[TAP] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#configuration-ovnk-additional-networks_configuring-additional-network[OVN-Kubernetes] -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-route-override-cni_configuring-additional-network[Route-override] - -[id="approaches-managing-additional-network_{context}"] -== Approaches to managing a primary network - -You can manage the lifecycle of a primary network by choosing one of the two available approaches. Each approach is mutually exclusive and you can only use one approach for managing a primary network at a time. For either approach, the primary network is managed by a Container Network Interface (CNI) plugin that you configure. - -* Modify the Cluster Network Operator (CNO) configuration: The CNO automatically creates and manages the `NetworkAttachmentDefinition` custom resource definition (CRD). In addition to managing an object lifecycle the CNO ensures a DHCP is available for a primary network that uses a DHCP-assigned IP address. - -* Applying a YAML manifest: You can manage the primary network directly by creating a `NetworkAttachmentDefinition` CRD. This approach allows for the chaining of CNI plugins. - -For a primary network, IP addresses are provisioned through an IP Address Management (IPAM) CNI plugin that you configure as part of the primary network. The IPAM plugin supports a variety of IP address assignment approaches including Dynamic Host Configuration Protocol (DHCP) and static assignment. - -[NOTE] -==== -When deploying {product-title} nodes with multiple network interfaces on {rh-openstack-first} with OVN Kubernetes, DNS configuration of the primary interface might take precedence over the DNS configuration of the primary interface. In this case, remove the DNS nameservers for the subnet ID that is attached to the primary interface: - -[source,terminal] ----- -$ openstack subnet set --dns-nameserver 0.0.0.0 ----- -==== - -[id="ip-address-assignment-for-additional-networks_{context}"] -== IP address assignment for primary networks - -For primary networks, IP addresses can be assigned using an IP Address Management (IPAM) CNI plugin, which supports various assignment methods, including Dynamic Host Configuration Protocol (DHCP) and static assignment. - -The DHCP IPAM CNI plugin responsible for dynamic assignment of IP addresses operates with two distinct components: - -* *CNI Plugin*: Responsible for integrating with the Kubernetes networking stack to request and release IP addresses. -* *DHCP IPAM CNI Daemon*: A listener for DHCP events that coordinates with existing DHCP servers in the environment to handle IP address assignment requests. This daemon is _not_ a DHCP server itself. - -For networks requiring `type: dhcp` in their IPAM configuration, ensure the following: - -* A DHCP server is available and running in the environment. The DHCP server is external to the cluster and is expected to be part of the customer's existing network infrastructure. -* The DHCP server is appropriately configured to serve IP addresses to the nodes. - -In cases where a DHCP server is unavailable in the environment, it is recommended to use the Whereabouts IPAM CNI plugin instead. The Whereabouts CNI provides similar IP address management capabilities without the need for an external DHCP server. - -[NOTE] -==== -Use the Whereabouts CNI plugin when there is no external DHCP server or where static IP address management is preferred. The Whereabouts plugin includes a reconciler daemon to manage stale IP address allocations. -==== - -A DHCP lease must be periodically renewed throughout the container's lifetime, so a separate daemon, the DHCP IPAM CNI Daemon, is required. To deploy the DHCP IPAM CNI daemon, modify the Cluster Network Operator (CNO) configuration to trigger the deployment of this daemon as part of the primary network setup. - -[role="_additional-resources"] -.Additional resources - -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-dhcp_configuring-additional-network[Dynamic IP address (DHCP) assignment configuration] - -* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-whereabouts_configuring-additional-network[Dynamic IP address assignment configuration with Whereabouts] - -[id="configuration-additional-network-attachment_{context}"] -== Configuration for a primary network attachment - -A primary network is configured by using the `NetworkAttachmentDefinition` API in the `k8s.cni.cncf.io` API group. - -[IMPORTANT] -==== -Do not store any sensitive information or a secret in the `NetworkAttachmentDefinition` CRD because this information is accessible by the project administration user. -==== - -The configuration for the API is described in the following table: - -.`NetworkAttachmentDefinition` API fields -[cols=".^3,.^2,.^5",options="header"] -|==== -|Field|Type|Description - -|`metadata.name` -|`string` -|The name for the primary network. - -|`metadata.namespace` -|`string` -|The namespace that the object is associated with. - -|`spec.config` -|`string` -|The CNI plugin configuration in JSON format. - -|==== - -[id="configuration-additional-network-cno_{context}"] -=== Configuration of a primary network through the Cluster Network Operator - -The configuration for a primary network attachment is specified as part of the Cluster Network Operator (CNO) configuration. - -The following YAML describes the configuration parameters for managing a primary network with the CNO: - -.Cluster Network Operator configuration -[source,yaml] ----- -apiVersion: operator.openshift.io/v1 -kind: Network -metadata: - name: cluster -spec: - # ... - additionalNetworks: <1> - - name: <2> - namespace: <3> - rawCNIConfig: |- <4> - { - ... - } - type: Raw ----- -<1> An array of one or more primary network configurations. -<2> The name for the primary network attachment that you are creating. The name must be unique within the specified `namespace`. -<3> The namespace to create the network attachment in. If you do not specify a value then the `default` namespace is used. -+ -[IMPORTANT] -==== -To prevent namespace issues for the OVN-Kubernetes network plugin, do not name your primary network attachment `default`, because this namespace is reserved for the `default` primary network attachment. -==== -<4> A CNI plugin configuration in JSON format. - -[id="configuration-additional-network-yaml_{context}"] -=== Configuration of a primary network from a YAML manifest - -The configuration for a primary network is specified from a YAML configuration file, such as in the following example: - -[source,yaml] ----- -apiVersion: k8s.cni.cncf.io/v1 -kind: NetworkAttachmentDefinition -metadata: - name: <1> -spec: - config: |- <2> - { - ... - } ----- -<1> The name for the additional primary network attachment that you are creating. -<2> A CNI plugin configuration in JSON format. - -[id="configuration-additional-network-types_{context}"] -== Configurations for primary network types - -The specific configuration fields for primary networks is described in the following sections. - -// Configuration for a bridge additional network -include::modules/nw-multus-bridge-object.adoc[leveloffset=+2] - -// Configuration for a host device additional network -include::modules/nw-multus-host-device-object.adoc[leveloffset=+2] - -// Configure for a dummy additional network -include::modules/nw-multus-dummy-device-object.adoc[leveloffset=+2] - -// Configuration for an VLAN additional network -include::modules/nw-multus-vlan-object.adoc[leveloffset=+2] - -// Configuration for an ipvlan additional network -include::modules/nw-multus-ipvlan-object.adoc[leveloffset=+2] - -// Configuration for a macvlan additional network -include::modules/nw-multus-macvlan-object.adoc[leveloffset=+2] - -// Configuration for a TAP additional network -include::modules/nw-multus-tap-object.adoc[leveloffset=+2] - -// Configuration for route-override additional network -include::modules/nw-route-override-cni.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources - -* For more information about enabling an SELinux boolean on a node, see xref:../../nodes/nodes/nodes-nodes-managing.adoc#nodes-nodes-working-setting-booleans_nodes-nodes-managing[Setting SELinux booleans] - -// Set of includes pertains to OVN-Kubernetes additional network -// Configuration for an OVN-Kubernetes additional network -include::modules/configuring-ovnk-additional-networks.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources -* xref:../../networking/multiple_networks/understanding-multiple-networks.adoc#support-matrix-for-udn-nad_understanding-multiple-networks[`UserDefinedNetwork` and `NetworkAttachmentDefinition` support matrix] - -// OVN-Kubernetes network plugin JSON configuration table -include::modules/configuration-ovnk-network-plugin-json-object.adoc[leveloffset=+3] - -// Compatibility with multi-network policy -include::modules/configuration-ovnk-multi-network-policy.adoc[leveloffset=+3] - -//include::modules/configuring-layer-three-routed-topology.adoc[leveloffset=+3] -include::modules/configuring-layer-two-switched-topology.adoc[leveloffset=+3] - -[id="ovn-kubernetes-configuration-for-a-localnet-topology_{context}"] -==== Configuration for a localnet topology - -// Configuration for a localnet switched topology -include::modules/configuring-localnet-switched-topology.adoc[tag=localnet-intro] - -// Workaround lack of xref in modules -[id="configuration-additional-network-types-prerequisites_{context}"] -===== Prerequisites for configuring an OVN-Kubernetes primary network - -- The NMState Operator is installed. For more information, see xref:../../networking/networking_operators/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[Kubernetes NMState Operator]. - -[id="configuration-additional-network-interface_{context}"] -===== Configuration for an OVN-Kubernetes primary network mapping - -// Configuration for a localnet switched topology -include::modules/configuring-localnet-switched-topology.adoc[tag=localnet-content] - -// Configuring pods for additional networks -include::modules/configuring-pods-secondary-network.adoc[leveloffset=+3] - -// Configuring pods with a static IP address -include::modules/configuring-pods-static-ip.adoc[leveloffset=+3] -// end OVN-Kubernetes includes - -// Configuration of IP address assignment for an additional network -include::modules/nw-multus-ipam-object.adoc[leveloffset=+1] - -// Dynamic IP address assignment configuration with Whereabouts -include::modules/nw-multus-whereabouts.adoc[leveloffset=+2] - -// Creating a whereabouts-reconciler daemon set -include::modules/nw-multus-creating-whereabouts-reconciler-daemon-set.adoc[leveloffset=+2] - -// Configuring the Whereabouts IP reconciler schedule -include::modules/nw-multus-configuring-whereabouts-ip-reconciler-schedule.adoc[leveloffset=+2] - -// Creating a configuration for assignment of dual-stack IP addresses dynamically -include::modules/nw-multus-configure-dualstack-ip-address.adoc[leveloffset=+2] - -[role="_additional-resources"] -.Additional resources -* xref:../../networking/multiple_networks/attaching-pod.adoc#nw-multus-add-pod_attaching-pod[Attaching a pod to an additional network] - -// Creating an additional network attachment with the Cluster Network Operator -include::modules/nw-multus-create-network.adoc[leveloffset=+1] - -// Creating an additional network attachment by applying a YAML manifest -include::modules/nw-multus-create-network-apply.adoc[leveloffset=+1] - -// About configuring the master interface in the container network namespace -include::modules/nw-about-configuring-master-interface-container.adoc[leveloffset=+1] - -//Creating multiple VLANs on SR-IOV VFs -include::modules/nw-multus-create-multiple-vlans-sriov.adoc[leveloffset=+2] - -// Creating a subinterface based on a bridge master interface in a container namespace -include::modules/nw-multus-create-master-interface-bridge-cni.adoc[leveloffset=+2] diff --git a/networking/networking_operators/aws_load_balancer_operator/configure-egress-proxy-aws-load-balancer-operator.adoc b/networking/networking_operators/aws_load_balancer_operator/configure-egress-proxy-aws-load-balancer-operator.adoc deleted file mode 100644 index 4e789fd31def..000000000000 --- a/networking/networking_operators/aws_load_balancer_operator/configure-egress-proxy-aws-load-balancer-operator.adoc +++ /dev/null @@ -1,16 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY -[id="nw-aws-load-balancer-operator-cluster-wide-proxy"] -= Configuring cluster-wide proxy -include::_attributes/common-attributes.adoc[] -:context: aws-load-balancer-operator - -toc::[] - -You can configure the cluster-wide proxy in the AWS Load Balancer Operator. After configuring the cluster-wide proxy, Operator Lifecycle Manager (OLM) automatically updates all the deployments of the Operators with the environment variables such as `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`. These variables are populated to the managed controller by the AWS Load Balancer Operator. - -include::modules/configuring-egress-proxy.adoc[leveloffset=+1] - -[role="_additional-resources"] -== Additional resources - -* xref:../../../networking/configuring_network_settings/configuring-a-custom-pki.adoc#certificate-injection-using-operators_configuring-a-custom-pki[Certificate injection using Operators]