Merge pull request kubernetes#295 from luxas/bump_cni

Bump CNI to v0.5.1
luxas · Mar 28, 2017 · 8fc5402 · 8fc5402
2 parents 76a9fb6 + d1f95bf
commit 8fc5402
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/debian/build.go b/debian/build.go
@@ -321,17 +321,17 @@ func main() {
 			Distros: serverDistros,
 			Versions: []version{
 				{
-					Version:  "0.3.0.1-07a8a2",
+					Version:  "0.3.0.1-0799f5",
 					Revision: "00",
 					Channel:  ChannelStable,
 				},
 				{
-					Version:  "0.3.0.1-07a8a2",
+					Version:  "0.3.0.1-0799f5",
 					Revision: "00",
 					Channel:  ChannelUnstable,
 				},
 				{
-					Version:  "0.3.0.1-07a8a2",
+					Version:  "0.3.0.1-0799f5",
 					Revision: "00",
 					Channel:  ChannelNightly,
 				},

diff --git a/debian/xenial/kubernetes-cni/debian/rules b/debian/xenial/kubernetes-cni/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 #export DH_VERBOSE=1
-CNI_RELEASE = 07a8a28637e97b22eb8dfe710eeae1344f69d16e
+CNI_RELEASE = 0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
 
 build:
 	echo noop

diff --git a/rpm/kubelet.spec b/rpm/kubelet.spec
@@ -1,5 +1,5 @@
 %global KUBE_VERSION 1.6.0
-%global CNI_RELEASE 07a8a28637e97b22eb8dfe710eeae1344f69d16e
+%global CNI_RELEASE 0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
 %global RPM_RELEASE 0
 
 Name: kubelet
@@ -32,8 +32,8 @@ The node agent of Kubernetes, the container cluster manager.
 
 %package -n kubernetes-cni
 
-Version: 0.3.0.1
-Release: %{RPM_RELEASE}.07a8a2
+Version: 0.3.0.2
+Release: %{RPM_RELEASE}.0799f5
 Summary: Binaries required to provision kubernetes container networking
 Requires: kubelet
 
@@ -120,6 +120,9 @@ mv bin/ %{buildroot}/opt/cni/
 
 
 %changelog
+* Wed Tue 28 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>
+- Bump CNI version to v0.5.1.
+
 * Wed Mar 15 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk> - 1.6.0
 - Bump version of kubelet, kubectl and kubeadm to v1.6.0.