Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion content/plugins/current/ipam/host-local.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ deprecated but still supported.
We can test it out on the command-line:

```bash
$ echo '{ "cniVersion": "0.3.1", "name": "examplenet", "ipam": { "type": "host-local", "ranges": [ [{"subnet": "203.0.113.0/24"}], [{"subnet": "2001:db8:1::/64"}]], "dataDir": "/tmp/cni-example" } }' | CNI_COMMAND=ADD CNI_CONTAINERID=example CNI_NETNS=/dev/null CNI_IFNAME=dummy0 CNI_PATH=. ./host-local
$ echo '{ "cniVersion": "1.0.0", "name": "examplenet", "ipam": { "type": "host-local", "ranges": [ [{"subnet": "203.0.113.0/24"}], [{"subnet": "2001:db8:1::/64"}]], "dataDir": "/tmp/cni-example" } }' | CNI_COMMAND=ADD CNI_CONTAINERID=example CNI_NETNS=/dev/null CNI_IFNAME=dummy0 CNI_PATH=. ./host-local

```

Expand Down
8 changes: 4 additions & 4 deletions content/plugins/current/main/host-device.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ A sample configuration with `device` property looks like:

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "host-device",
"device": "enp0s1"
}
Expand All @@ -45,7 +45,7 @@ A sample configuration with `pciBusID` property looks like:

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "host-device",
"pciBusID": "0000:3d:00.1"
}
Expand All @@ -56,7 +56,7 @@ A sample configuration utilizing `deviceID` runtime configuration looks like:
1. From operator perspective:
```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "host-device",
"capabilities": {
"deviceID": true
Expand All @@ -66,7 +66,7 @@ A sample configuration utilizing `deviceID` runtime configuration looks like:
2. From plugin perspective:
```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "host-device",
"runtimeConfig": {
"deviceID": "0000:3d:00.1"
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/main/tap.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ the plugin will use the 'ip' tool to create the tap device when owner/group is n
```json
{
"name": "mynet",
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "tap",
"mac": "00:11:22:33:44:55",
"mtu": 1500,
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/main/vlan.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The host-local IPAM plugin can be used to allocate an IP address to the containe
```json
{
"name": "mynet",
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"type": "vlan",
"master": "eth0",
"mtu": 1500,
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/meta/bandwidth.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following is an example [json configuration list](https://github.com/contain

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "mynet",
"plugins": [
{
Expand Down
6 changes: 3 additions & 3 deletions content/plugins/current/meta/firewall.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The following network configuration file

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "bridge-firewalld",
"plugins": [
{
Expand Down Expand Up @@ -61,7 +61,7 @@ look like:

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "bridge-firewalld",
"plugins": [
{
Expand Down Expand Up @@ -100,7 +100,7 @@ look like:

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "bridge-firewalld",
"plugins": [
{
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/meta/portmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ look like:

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "mynet",
"plugins": [
{
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/meta/sbr.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ is the following.
```json
{
"name": "flannel-sbr",
"cniVersion": "0.3.0",
"cniVersion": "1.0.0",
"plugins":
[
{ "type": "flannel" },
Expand Down
2 changes: 1 addition & 1 deletion content/plugins/current/meta/vrf.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following network configuration file

```json
{
"cniVersion": "0.3.1",
"cniVersion": "1.0.0",
"name": "macvlan-vrf",
"plugins": [
{
Expand Down