Merge pull request #90643 from openshift-cherrypick-robot/cherry-pick-89565-to-enterprise-4.17

JoeAldinger · web-flow · commit 2d6506dec4c2 · 2025-03-19T10:13:20.000-04:00
[enterprise-4.17] :updates NAD JSON to include namespace
diff --git a/modules/nw-multus-create-network-apply.adoc b/modules/nw-multus-create-network-apply.adoc
@@ -8,8 +8,9 @@
 
 .Prerequisites
 
-* Install the OpenShift CLI (`oc`).
-* Log in as a user with `cluster-admin` privileges.
+* You have installed the {oc-first}.
+* You have logged in as a user with `cluster-admin` privileges.
+* You are working in the namespace where the NAD is to be deployed.
 
 .Procedure
 
@@ -26,13 +27,15 @@ spec:
     {
       "cniVersion": "0.3.1",
       "name": "work-network",
+      "namespace": "namespace2", #<1>
       "type": "host-device",
       "device": "eth1",
       "ipam": {
         "type": "dhcp"
       }
     }
 ----
+<1> Optional: You can specify a namespace to which the NAD is applied. If you are working in the namespace where the NAD is to be deployed, this spec is not necessary.
 
 . To create the additional network, enter the following command:
 +

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@`
`8`	`8`
`9`	`9`	`.Prerequisites`
`10`	`10`
`11`		-* Install the OpenShift CLI (`oc`).
`12`		-* Log in as a user with `cluster-admin` privileges.
	`11`	`+* You have installed the {oc-first}.`
	`12`	+* You have logged in as a user with `cluster-admin` privileges.
	`13`	`+* You are working in the namespace where the NAD is to be deployed.`
`13`	`14`
`14`	`15`	`.Procedure`
`15`	`16`
`@@ -26,13 +27,15 @@ spec:`
`26`	`27`	`{`
`27`	`28`	`"cniVersion": "0.3.1",`
`28`	`29`	`"name": "work-network",`
	`30`	`+ "namespace": "namespace2", #<1>`
`29`	`31`	`"type": "host-device",`
`30`	`32`	`"device": "eth1",`
`31`	`33`	`"ipam": {`
`32`	`34`	`"type": "dhcp"`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`----`
	`38`	`+<1> Optional: You can specify a namespace to which the NAD is applied. If you are working in the namespace where the NAD is to be deployed, this spec is not necessary.`
`36`	`39`
`37`	`40`	`. To create the additional network, enter the following command:`
`38`	`41`	`+`