Merge pull request #3152 from afbjorklund/cni

tstromberg · web-flow · commit 79e95f8e67cf · 2018-10-03T21:55:07.000-07:00
Upgrade cni and cni-plugins to release version
diff --git a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash
@@ -1,3 +1,3 @@
 sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d  cni-v0.3.0.tgz
 sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8  cni-v0.4.0.tgz
-sha256 d1e3c693903d498fcb89076f66410167eaa6d81df4a1051eba7565672f896543  cni-amd64-v0.6.0-rc1.tgz
+sha256 a7f84a742c8f3a95843b3cc636444742554a4853835649ec371a07c841daebab  cni-amd64-v0.6.0.tgz
diff --git a/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CNI_BIN_VERSION = v0.6.0-rc1
+CNI_BIN_VERSION = v0.6.0
 CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/$(CNI_BIN_VERSION)
 CNI_BIN_SOURCE = cni-amd64-$(CNI_BIN_VERSION).tgz
 
diff --git a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.hash
@@ -1 +1 @@
-sha256 49f14413c62f77d0ce5751934a28b291c4f04af47e591631d00e787ebcd07875  cni-plugins-amd64-v0.6.0-rc1.tgz
+sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d  cni-plugins-amd64-v0.6.0.tgz
diff --git a/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk b/deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CNI_PLUGINS_BIN_VERSION = v0.6.0-rc1
+CNI_PLUGINS_BIN_VERSION = v0.6.0
 CNI_PLUGINS_BIN_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_BIN_VERSION)
 CNI_PLUGINS_BIN_SOURCE = cni-plugins-amd64-$(CNI_PLUGINS_BIN_VERSION).tgz
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-CNI_BIN_VERSION = v0.6.0-rc1`
	`7`	`+CNI_BIN_VERSION = v0.6.0`
`8`	`8`	`CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/$(CNI_BIN_VERSION)`
`9`	`9`	`CNI_BIN_SOURCE = cni-amd64-$(CNI_BIN_VERSION).tgz`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sha256 49f14413c62f77d0ce5751934a28b291c4f04af47e591631d00e787ebcd07875 cni-plugins-amd64-v0.6.0-rc1.tgz`
	`1`	`+sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d cni-plugins-amd64-v0.6.0.tgz`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-CNI_PLUGINS_BIN_VERSION = v0.6.0-rc1`
	`7`	`+CNI_PLUGINS_BIN_VERSION = v0.6.0`
`8`	`8`	`CNI_PLUGINS_BIN_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_BIN_VERSION)`
`9`	`9`	`CNI_PLUGINS_BIN_SOURCE = cni-plugins-amd64-$(CNI_PLUGINS_BIN_VERSION).tgz`
`10`	`10`