Merge pull request #1574 from mikebrow/cherrypick-#1573-release-1.4

fuweid · web-flow · commit a462784da94e · 2020-09-12T11:38:50.000+08:00
[release/1.4] update cni config version #1573
diff --git a/hack/install/install-cni-config.sh b/hack/install/install-cni-config.sh
@@ -23,7 +23,7 @@ CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d
 ${SUDO} mkdir -p ${CNI_CONFIG_DIR}
 ${SUDO} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF
 {
-  "cniVersion": "0.3.1",
+  "cniVersion": "0.4.0",
   "name": "containerd-net",
   "plugins": [
     {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ CNI_CONFIG_DIR=${DESTDIR}/etc/cni/net.d`
`23`	`23`	`${SUDO} mkdir -p ${CNI_CONFIG_DIR}`
`24`	`24`	`${SUDO} bash -c 'cat >'${CNI_CONFIG_DIR}'/10-containerd-net.conflist <<EOF`
`25`	`25`	`{`
`26`		`- "cniVersion": "0.3.1",`
	`26`	`+ "cniVersion": "0.4.0",`
`27`	`27`	`"name": "containerd-net",`
`28`	`28`	`"plugins": [`
`29`	`29`	`{`