Merge pull request #159 from sipsma/doc-cni-ip

sipsma · web-flow · commit 654fb0554e00 · 2019-11-06T12:36:31.000-08:00
Include the firewall CNI plugin in sample configuration.
diff --git a/README.md b/README.md
@@ -70,6 +70,9 @@ With the following file at `/etc/cni/conf.d/fcnet.conflist`:
         "resolvConf": "/etc/resolv.conf"
       }
     },
+    {
+      "type": "firewall"
+    },
     {
       "type": "tc-redirect-tap"
     }
@@ -79,7 +82,8 @@ With the following file at `/etc/cni/conf.d/fcnet.conflist`:
 
 and the 
 [`ptp`](https://github.com/containernetworking/plugins/tree/master/plugins/main/ptp), 
-[`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local) 
+[`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local),
+[`firewall`](https://github.com/containernetworking/plugins/tree/master/plugins/meta/firewall),
 and [`tc-redirect-tap`](cni/Makefile)
 CNI plugin binaries installed under `/opt/cni/bin`, you can specify, in the Go SDK API, 
 a `Machine` with the following `NetworkInterface`:

Original file line number	Diff line number	Diff line change
@@ -70,6 +70,9 @@ With the following file at `/etc/cni/conf.d/fcnet.conflist`:
`70`	`70`	`"resolvConf": "/etc/resolv.conf"`
`71`	`71`	`}`
`72`	`72`	`},`
	`73`	`+ {`
	`74`	`+ "type": "firewall"`
	`75`	`+ },`
`73`	`76`	`{`
`74`	`77`	`"type": "tc-redirect-tap"`
`75`	`78`	`}`
@@ -79,7 +82,8 @@ With the following file at `/etc/cni/conf.d/fcnet.conflist`:
`79`	`82`
`80`	`83`	`and the`
`81`	`84`	[`ptp`](https://github.com/containernetworking/plugins/tree/master/plugins/main/ptp),
`82`		-[`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local)
	`85`	+[`host-local`](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/host-local),
	`86`	+[`firewall`](https://github.com/containernetworking/plugins/tree/master/plugins/meta/firewall),
`83`	`87`	and [`tc-redirect-tap`](cni/Makefile)
`84`	`88`	CNI plugin binaries installed under `/opt/cni/bin`, you can specify, in the Go SDK API,
`85`	`89`	a `Machine` with the following `NetworkInterface`: