Skip to content

docs(bridge): show CNI 1.0 capability/runtimeConfig for mac #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
locker95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

docs(bridge): show CNI 1.0 capability/runtimeConfig for mac #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions content/plugins/current/main/bridge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,33 @@ The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/

Note: You may add `IgnoreUnknown=true` to allow loose CNI argument verification (see CNI's issue[#560](https://github.com/containernetworking/cni/issues/560)).

The plugin also support following [capability argument](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md).
The plugin also supports the following [capability](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md)
(passed by the runtime via `runtimeConfig` when the capability is enabled):

* `mac`: Pass MAC addresses for CNI interface
* `mac`: MAC address for the container interface

The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are supported:
Example (CNI 1.0.0 style — capability is declared and supplied under `runtimeConfig`,
not as a top-level network field):

* `mac` (string, optional): MAC address (i.e. hardware address) of interface
```json
{
"cniVersion": "1.0.0",
"name": "mynet",
"type": "bridge",
"bridge": "mynet0",
"capabilities": {
"mac": true
},
"runtimeConfig": {
"mac": "c2:11:22:33:44:55"
},
"ipam": {
"type": "host-local",
"subnet": "10.10.0.0/16"
}
}
```

The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are also supported:

* `mac` (string, optional): MAC address (hardware address) of the interface
31 changes: 27 additions & 4 deletions content/plugins/v1.1/main/bridge.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,33 @@ The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/

Note: You may add `IgnoreUnknown=true` to allow loose CNI argument verification (see CNI's issue[#560](https://github.com/containernetworking/cni/issues/560)).

The plugin also support following [capability argument](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md).
The plugin also supports the following [capability](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md)
(passed by the runtime via `runtimeConfig` when the capability is enabled):

* `mac`: Pass MAC addresses for CNI interface
* `mac`: MAC address for the container interface

The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are supported:
Example (CNI 1.0.0 style — capability is declared and supplied under `runtimeConfig`,
not as a top-level network field):

* `mac` (string, optional): MAC address (i.e. hardware address) of interface
```json
{
"cniVersion": "1.0.0",
"name": "mynet",
"type": "bridge",
"bridge": "mynet0",
"capabilities": {
"mac": true
},
"runtimeConfig": {
"mac": "c2:11:22:33:44:55"
},
"ipam": {
"type": "host-local",
"subnet": "10.10.0.0/16"
}
}
```

The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are also supported:

* `mac` (string, optional): MAC address (hardware address) of the interface