Merge pull request #19791 from openshift-cherrypick-robot/cherry-pick…

…-19723-to-enterprise-4.4 [enterprise-4.4] BZ#1789125 Add namespace param to Multus plug-in YAML config
openshift · Feb 18, 2020 · 8726dc9 · 8726dc9
2 parents 510e73c + acee822
commit 8726dc9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git 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: <name> <1>
 namespace: <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
@@ -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 <namespace>
 NAME                 AGE
 test-network-1       14m
 ----

diff --git 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
@@ -24,7 +24,7 @@ The following YAML describes the configuration parameters for the CNO:
 name: <name> <1>
 namespace: <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
@@ -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: