Skip to content

Commit 27bd6dc

Browse files
authored
Merge pull request #59607 from kquinn1204/TELCODOCS-1312
TELCODOCS-1312 Document VLAN plugin
2 parents 7cd62bf + 48a93af commit 27bd6dc

File tree

4 files changed

+85
-3
lines changed

4 files changed

+85
-3
lines changed

modules/nw-multus-ipvlan-object.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,4 @@ The following example configures an additional network named `ipvlan-net`:
7575
]
7676
}
7777
}
78-
----
79-
78+
----

modules/nw-multus-vlan-object.adoc

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * networking/multiple_networks/configuring-additional-network.adoc
4+
5+
//37.1. VLAN overview
6+
//
7+
:_content-type: REFERENCE
8+
[id="nw-multus-vlan-object_{context}"]
9+
= Configuration for an VLAN additional network
10+
11+
The following object describes the configuration parameters for the VLAN CNI plugin:
12+
13+
.VLAN CNI plugin JSON configuration object
14+
[cols=".^2,.^2,.^6",options="header"]
15+
|====
16+
|Field|Type|Description
17+
18+
|`cniVersion`
19+
|`string`
20+
|The CNI specification version. The `0.3.1` value is required.
21+
22+
|`name`
23+
|`string`
24+
|The value for the `name` parameter you provided previously for the CNO configuration.
25+
26+
|`type`
27+
|`string`
28+
|The name of the CNI plugin to configure: `vlan`.
29+
30+
|`master`
31+
|`string`
32+
|The Ethernet interface to associate with the network attachment. If a `master` is not specified, the interface for the default network route is used.
33+
34+
|`vlanId`
35+
|`integer`
36+
|Set the id of the vlan.
37+
38+
|`ipam`
39+
|`object`
40+
|The configuration object for the IPAM CNI plugin. The plugin manages IP address assignment for the attachment definition.
41+
42+
|`mtu`
43+
|`integer`
44+
|Optional: Set the maximum transmission unit (MTU) to the specified value. The default value is automatically set by the kernel.
45+
46+
|`dns`
47+
|`integer`
48+
|Optional: DNS information to return, for example, a priority-ordered list of DNS nameservers.
49+
50+
|`linkInContainer`
51+
|`boolean`
52+
|Optional: Specifies if the master interface is in the container network namespace or the main network namespace.
53+
54+
|====
55+
56+
[id="nw-multus-vlan-config-example_{context}"]
57+
== vlan configuration example
58+
59+
The following example configures an additional network named `vlan-net`:
60+
61+
[source,json]
62+
----
63+
{
64+
"name": "vlan-net",
65+
"cniVersion": "0.3.1",
66+
"type": "vlan",
67+
"master": "eth0",
68+
"mtu": 1500,
69+
"vlanId": 5,
70+
"linkInContainer": false,
71+
"ipam": {
72+
"type": "host-local",
73+
"subnet": "10.1.1.0/24"
74+
},
75+
"dns": {
76+
"nameservers": [ "10.1.1.1", "8.8.8.8" ]
77+
}
78+
}
79+
----

networking/multiple_networks/configuring-additional-network.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ As a cluster administrator, you can configure an additional network for your clu
1010

1111
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-bridge-object_configuring-additional-network[Bridge]
1212
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-host-device-object_configuring-additional-network[Host device]
13+
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-vlan-object_configuring-additional-network[VLAN]
1314
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-ipvlan-object_configuring-additional-network[IPVLAN]
1415
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-macvlan-object_configuring-additional-network[MACVLAN]
1516
* xref:../../networking/multiple_networks/configuring-additional-network.adoc#configuration-ovnk-additional-networks_configuring-additional-network[OVN-Kubernetes]
@@ -127,6 +128,7 @@ The specific configuration fields for additional networks is described in the fo
127128

128129
include::modules/nw-multus-bridge-object.adoc[leveloffset=+2]
129130
include::modules/nw-multus-host-device-object.adoc[leveloffset=+2]
131+
include::modules/nw-multus-vlan-object.adoc[leveloffset=+2]
130132
include::modules/nw-multus-ipvlan-object.adoc[leveloffset=+2]
131133
include::modules/nw-multus-macvlan-object.adoc[leveloffset=+2]
132134
include::modules/configuring-ovnk-additional-networks.adoc[leveloffset=+2]

networking/multiple_networks/understanding-multiple-networks.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ networks in your cluster:
5353

5454
* *ipvlan*: xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-ipvlan-object_configuring-additional-network[Configure an ipvlan-based additional network] to allow pods on a host to communicate with other hosts and pods on those hosts, similar to a macvlan-based additional network. Unlike a macvlan-based additional network, each pod shares the same MAC address as the parent physical network interface.
5555

56+
* *vlan*: xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-vlan-object_configuring-additional-network[Configure a vlan-based additional network] to allow VLAN-based network isolation and connectivity for pods.
57+
5658
* *macvlan*: xref:../../networking/multiple_networks/configuring-additional-network.adoc#nw-multus-macvlan-object_configuring-additional-network[Configure a macvlan-based additional network] to allow pods on a host to communicate with other hosts and pods on those hosts by using a physical network interface. Each pod that is attached to a macvlan-based additional network is provided a unique MAC address.
57-
59+
5860
* *SR-IOV*: xref:../../networking/hardware_networks/about-sriov.adoc#about-sriov[Configure an SR-IOV based additional network] to allow pods to attach to a virtual function (VF) interface on SR-IOV capable hardware on the host system.

0 commit comments

Comments
 (0)