From acee82264bd3a1f9a7871a36e5fdae939b66882b Mon Sep 17 00:00:00 2001 From: Cody Hoag Date: Thu, 13 Feb 2020 11:37:07 -0500 Subject: [PATCH] Add namespace param to Multus plug-in configs --- modules/nw-multus-bridge-object.adoc | 5 +++-- modules/nw-multus-create-network.adoc | 6 +++++- modules/nw-multus-host-device-object.adoc | 1 + modules/nw-multus-ipvlan-object.adoc | 3 ++- modules/nw-multus-macvlan-object.adoc | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/nw-multus-bridge-object.adoc b/modules/nw-multus-bridge-object.adoc index 7ba34bb0e374..9d9c20df0adc 100644 --- a/modules/nw-multus-bridge-object.adoc +++ b/modules/nw-multus-bridge-object.adoc @@ -24,7 +24,7 @@ The following YAML describes the configuration parameters for the CNO: name: <1> namespace: <2> rawCNIConfig: '{ <3> - ... + ... }' type: Raw ---- @@ -82,7 +82,7 @@ default value is `false`. <6> Set to `true` to configure the bridge as the default gateway for the virtual network. The default value is `false`. If `isDefaultGateway` is set to `true`, then `isGateway` is also set to `true` -automatically. +automatically. <7> Set to `true` to allow assignment of a previously assigned IP address to the virtual bridge. When set to `false`, if an IPv4 address or an @@ -110,6 +110,7 @@ The following example configures an additional network named `bridge-net`: [source,yaml] ---- name: bridge-net +namespace: work-network type: Raw rawCNIConfig: '{ <1> "cniVersion": "0.3.1", diff --git a/modules/nw-multus-create-network.adoc b/modules/nw-multus-create-network.adoc index 660adc287c3f..c0735fc23b6a 100644 --- a/modules/nw-multus-create-network.adoc +++ b/modules/nw-multus-create-network.adoc @@ -69,6 +69,7 @@ metadata: spec: additionalNetworks: <1> - name: test-network-1 + namespace: test-1 type: SimpleMacvlan simpleMacvlanConfig: ipamConfig: @@ -92,6 +93,7 @@ metadata: spec: additionalNetworks: <1> - name: test-network-1 + namespace: test-1 type: Raw rawCNIConfig: '{ "cniVersion": "0.3.1", @@ -118,6 +120,7 @@ metadata: spec: additionalNetworks: <1> - name: test-network-1 + namespace: test-1 type: Raw rawCNIConfig: '{ "cniVersion": "0.3.1", @@ -136,6 +139,7 @@ metadata: spec: additionalNetworks: <1> - name: test-network-1 + namespace: test-1 type: Raw rawCNIConfig: '{ "cniVersion": "0.3.1", @@ -162,7 +166,7 @@ running the following command. There might be a delay before the CNO creates the CR. + ---- -$ oc get network-attachment-definitions +$ oc get network-attachment-definitions -n NAME AGE test-network-1 14m ---- diff --git a/modules/nw-multus-host-device-object.adoc b/modules/nw-multus-host-device-object.adoc index 066a355999dd..3af60ea90369 100644 --- a/modules/nw-multus-host-device-object.adoc +++ b/modules/nw-multus-host-device-object.adoc @@ -82,6 +82,7 @@ The following example configures an additional network named `hostdev-net`: [source,yaml] ---- name: hostdev-net +namespace: work-network type: Raw rawCNIConfig: '{ <1> "cniVersion": "0.3.1", diff --git a/modules/nw-multus-ipvlan-object.adoc b/modules/nw-multus-ipvlan-object.adoc index 40e6dd6b61f0..39f9061640ed 100644 --- a/modules/nw-multus-ipvlan-object.adoc +++ b/modules/nw-multus-ipvlan-object.adoc @@ -24,7 +24,7 @@ The following YAML describes the configuration parameters for the CNO: name: <1> namespace: <2> rawCNIConfig: '{ <3> - ... + ... }' type: Raw ---- @@ -79,6 +79,7 @@ The following example configures an additional network named `ipvlan-net`: [source,yaml] ---- name: ipvlan-net +namespace: work-network type: Raw rawCNIConfig: '{ <1> "cniVersion": "0.3.1", diff --git a/modules/nw-multus-macvlan-object.adoc b/modules/nw-multus-macvlan-object.adoc index cb67104d7691..f65240432da3 100644 --- a/modules/nw-multus-macvlan-object.adoc +++ b/modules/nw-multus-macvlan-object.adoc @@ -49,6 +49,7 @@ The following example configures an additional network named `macvlan-net`: [source,yaml] ---- name: macvlan-net +namespace: work-network type: SimpleMacvlan simpleMacvlanConfig: ipamConfig: