Skip to content

Commit c85e921

Browse files
palonsorojboxman
authored andcommitted
1 parent 2b29ae9 commit c85e921

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

modules/nw-multus-advanced-annotations.adoc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -125,41 +125,42 @@ you do not specify a value, then the `default` namespace is used.
125125
<3> Specify the CNI plug-in configuration in JSON format, which
126126
is based on the following template.
127127

128-
The following object describes the configuration parameters for utilizing static MAC address
129-
and IP address using the macvlan CNI plug-in:
128+
The following object describes the configuration parameters for utilizing static MAC address and IP address using the macvlan CNI plug-in:
130129

131130
.macvlan CNI plug-in JSON configuration object using static IP and MAC address
132131
[source,json]
133132
----
134133
{
135134
"cniVersion": "0.3.1",
136-
"plugins": [{ <1>
135+
"name": "<name>", <1>
136+
"plugins": [{ <2>
137137
"type": "macvlan",
138-
"capabilities": { "ips": true }, <2>
139-
"master": "eth0", <3>
138+
"capabilities": { "ips": true }, <3>
139+
"master": "eth0", <4>
140140
"mode": "bridge",
141141
"ipam": {
142142
"type": "static"
143143
}
144144
}, {
145-
"capabilities": { "mac": true }, <4>
145+
"capabilities": { "mac": true }, <5>
146146
"type": "tuning"
147147
}]
148148
}
149149
----
150150

151-
<1> The `plugins` field specifies a configuration list of CNI configurations.
151+
<1> Specifies the name for the additional network attachment to create. The name must be unique within the specified `namespace`.
152152

153-
<2> The `capabilities` key denotes that a request is being made to enable the static IP functionality of a CNI plug-ins runtime configuration capabilities.
153+
<2> Specifies an array of CNI plug-in configurations. The first object specifies a macvlan plug-in configuration and the second object specifies a tuning plug-in configuration.
154154

155-
<3> The `master` field is specific to the macvlan plug-in.
155+
<3> Specifies that a request is made to enable the static IP address functionality of the CNI plug-in runtime configuration capabilities.
156156

157-
<4> Here the `capabilities` key denotes that a request is made to enable the static MAC address functionality of a CNI plug-in.
157+
<4> Specifies the interface that the macvlan plug-in uses.
158158

159-
The above network attachment may then be referenced in a JSON formatted annotation, along with keys to specify which
160-
static IP and MAC address will be assigned to a given pod.
159+
<5> Specifies that a request is made to enable the static MAC address functionality of a CNI plug-in.
161160

162-
Edit the desired pod with:
161+
The above network attachment can be referenced in a JSON formatted annotation, along with keys to specify which static IP and MAC address will be assigned to a given pod.
162+
163+
Edit the pod with:
163164

164165
[source,terminal]
165166
----
@@ -186,14 +187,13 @@ metadata:
186187

187188
<1> Use the `<name>` as provided when creating the `rawCNIConfig` above.
188189

189-
<2> Provide the desired IP address.
190+
<2> Provide an IP address including the subnet mask.
190191

191-
<3> Provide the desired MAC address.
192+
<3> Provide the MAC address.
192193

193194
[NOTE]
194195
====
195-
Static IP addresses and MAC addresses do not have to be used at the same time, you may use them
196-
individually, or together.
196+
Static IP addresses and MAC addresses do not have to be used at the same time, you may use them individually, or together.
197197
====
198198

199199
To verify the IP address and MAC properties of a pod with additional networks, use the `oc` command to execute the ip command within a pod.

0 commit comments

Comments
 (0)