From 07abb1aa094c3397c81fbb16ed29b25a3ba7afeb Mon Sep 17 00:00:00 2001 From: Kevin Quinn Date: Mon, 10 Nov 2025 10:39:12 +0000 Subject: [PATCH 1/3] OCPBUGS-59577 Correcting inaccurate description --- modules/nw-multus-macvlan-object.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nw-multus-macvlan-object.adoc b/modules/nw-multus-macvlan-object.adoc index fadd49cac840..a275f15181c3 100644 --- a/modules/nw-multus-macvlan-object.adoc +++ b/modules/nw-multus-macvlan-object.adoc @@ -20,7 +20,7 @@ The following object describes the configuration parameters for the MAC Virtual |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` From ae652bb9bb2ab1359c2e914b7a476e9322668d9c Mon Sep 17 00:00:00 2001 From: Kevin Quinn Date: Mon, 10 Nov 2025 11:03:30 +0000 Subject: [PATCH 2/3] Correcting name description --- modules/nw-multus-bond-cni-object.adoc | 22 +++++++++++----------- modules/nw-multus-bridge-object.adoc | 2 +- modules/nw-multus-dummy-device-object.adoc | 2 +- modules/nw-multus-host-device-object.adoc | 2 +- modules/nw-multus-ipvlan-object.adoc | 2 +- modules/nw-multus-tap-object.adoc | 2 +- modules/nw-multus-vlan-object.adoc | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/nw-multus-bond-cni-object.adoc b/modules/nw-multus-bond-cni-object.adoc index f3aee2ed557f..9c974abb9fef 100644 --- a/modules/nw-multus-bond-cni-object.adoc +++ b/modules/nw-multus-bond-cni-object.adoc @@ -18,7 +18,7 @@ The following table describes the configuration parameters for the Bond CNI plug |`name` |`string` -|Specifies the name given to this CNI network attachment definition. This name is used to identify and reference the interface within the container. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`cniVersion` |`string` @@ -34,7 +34,7 @@ The following table describes the configuration parameters for the Bond CNI plug |`mtu` |`integer` -|Optional: Specifies the maximum transmission unit (MTU) of the bond. The default is 1500. +|Optional: Specifies the maximum transmission unit (MTU) of the bond. The default is 1500. |`failOverMac` |`integer` @@ -42,7 +42,7 @@ The following table describes the configuration parameters for the Bond CNI plug |`mode` |`string` -|Specifies the bonding policy. +|Specifies the bonding policy. |`xmitHashPolicy` |`string` @@ -75,15 +75,15 @@ The following example configures a secondary network named `bond-net1`: [source,json] ---- { - "type": "bond", + "type": "bond", "cniVersion": "0.3.1", "name": "bond-net1", - "mode": "active-backup", - "failOverMac": 1, - "linksInContainer": true, + "mode": "active-backup", + "failOverMac": 1, + "linksInContainer": true, "miimon": "100", "mtu": 1500, - "links": [ + "links": [ {"name": "net1"}, {"name": "net2"} ], @@ -106,9 +106,9 @@ The following example configures a secondary network named `bond-tlb-net` with t "type": "bond", "cniVersion": "0.3.1", "name": "bond-tlb-net", - "mode": "tlb", + "mode": "tlb", "xmitHashPolicy": "layer2+3", <1> - "failOverMac": 0, + "failOverMac": 0, "linksInContainer": true, "miimon": "100", "mtu": 1500, @@ -118,7 +118,7 @@ The following example configures a secondary network named `bond-tlb-net` with t ], "ipam": { "type": "host-local", - "subnet": "10.57.218.0/24", + "subnet": "10.57.218.0/24", "routes": [{ "dst": "0.0.0.0/0" }], diff --git a/modules/nw-multus-bridge-object.adoc b/modules/nw-multus-bridge-object.adoc index 260276b42cc0..41ece8002a4e 100644 --- a/modules/nw-multus-bridge-object.adoc +++ b/modules/nw-multus-bridge-object.adoc @@ -21,7 +21,7 @@ ifndef::microshift[] |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. endif::microshift[] ifdef::microshift[] diff --git a/modules/nw-multus-dummy-device-object.adoc b/modules/nw-multus-dummy-device-object.adoc index 64afe7227a75..cbf1661596bc 100644 --- a/modules/nw-multus-dummy-device-object.adoc +++ b/modules/nw-multus-dummy-device-object.adoc @@ -21,7 +21,7 @@ The following object describes the configuration parameters for the dummy CNI pl |`name` |`string` -|The value for the `name` parameter that you previously specified for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` diff --git a/modules/nw-multus-host-device-object.adoc b/modules/nw-multus-host-device-object.adoc index c9e78619cd93..0d2a22f8ebc3 100644 --- a/modules/nw-multus-host-device-object.adoc +++ b/modules/nw-multus-host-device-object.adoc @@ -25,7 +25,7 @@ The following object describes the configuration parameters for the host-device |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` diff --git a/modules/nw-multus-ipvlan-object.adoc b/modules/nw-multus-ipvlan-object.adoc index b96e76fbfc8c..cc882bb6e011 100644 --- a/modules/nw-multus-ipvlan-object.adoc +++ b/modules/nw-multus-ipvlan-object.adoc @@ -23,7 +23,7 @@ The following object describes the configuration parameters for the IPVLAN, `ipv |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` diff --git a/modules/nw-multus-tap-object.adoc b/modules/nw-multus-tap-object.adoc index 6016ca9fe7ad..e085a578bce5 100644 --- a/modules/nw-multus-tap-object.adoc +++ b/modules/nw-multus-tap-object.adoc @@ -20,7 +20,7 @@ plugin: |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` diff --git a/modules/nw-multus-vlan-object.adoc b/modules/nw-multus-vlan-object.adoc index b130ddbf3a71..e546e2a66cba 100644 --- a/modules/nw-multus-vlan-object.adoc +++ b/modules/nw-multus-vlan-object.adoc @@ -21,7 +21,7 @@ The following object describes the configuration parameters for the VLAN, `vlan` |`name` |`string` -|The value for the `name` parameter you provided previously for the CNO configuration. +|The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. |`type` |`string` From 97a699e6a3527fc517fa194b9af6fc36e9617b99 Mon Sep 17 00:00:00 2001 From: Kevin Quinn Date: Mon, 10 Nov 2025 11:10:23 +0000 Subject: [PATCH 3/3] Correcting incorrect pickup of MicroShift --- modules/nw-multus-bridge-object.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nw-multus-bridge-object.adoc b/modules/nw-multus-bridge-object.adoc index 41ece8002a4e..29b3b47343b9 100644 --- a/modules/nw-multus-bridge-object.adoc +++ b/modules/nw-multus-bridge-object.adoc @@ -22,6 +22,7 @@ ifndef::microshift[] |`name` |`string` |The mandatory, unique identifier assigned to this CNI network attachment definition. It is used by the container runtime to select the correct network configuration and serves as the key for persistent resource state management, such as IP address allocations. + endif::microshift[] ifdef::microshift[]