From bfd8ad32689c5054c5dc825d51f5be14df543119 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 18 Mar 2019 16:28:45 -0500
Subject: [PATCH] build/gci: bump CNI version to 0.7.5

---
 build/debian-hyperkube-base/Makefile |  2 +-
 build/rpms/kubeadm.spec              |  2 +-
 build/rpms/kubelet.spec              |  2 +-
 build/workspace.bzl                  | 12 ++++++------
 cluster/gce/gci/configure.sh         |  4 ++--
 test/e2e_node/remote/utils.go        |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile
index 7fe7170515..57728a4cc6 100644
--- a/build/debian-hyperkube-base/Makefile
+++ b/build/debian-hyperkube-base/Makefile
@@ -25,7 +25,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
 CACHEBUST?=1
 
 BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.1
-CNI_VERSION=v0.6.0
+CNI_VERSION=v0.7.5
 
 TEMP_DIR:=$(shell mktemp -d)
 CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz
diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec
index b5dc2c2dac..6c25ee992f 100644
--- a/build/rpms/kubeadm.spec
+++ b/build/rpms/kubeadm.spec
@@ -5,7 +5,7 @@ License: ASL 2.0
 Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
 Requires: kubelet >= 1.8.0
 Requires: kubectl >= 1.8.0
-Requires: kubernetes-cni >= 0.6.0
+Requires: kubernetes-cni >= 0.7.5
 Requires: cri-tools >= 1.11.0
 
 URL: https://kubernetes.io
diff --git a/build/rpms/kubelet.spec b/build/rpms/kubelet.spec
index 3828f2e2cf..2603c4b07c 100644
--- a/build/rpms/kubelet.spec
+++ b/build/rpms/kubelet.spec
@@ -11,7 +11,7 @@ Requires: ebtables
 Requires: ethtool
 Requires: iproute
 Requires: iptables >= 1.4.21
-Requires: kubernetes-cni >= 0.6.0
+Requires: kubernetes-cni >= 0.7.5
 Requires: socat
 Requires: util-linux
 
diff --git a/build/workspace.bzl b/build/workspace.bzl
index 0b281235a6..cffc0cb71a 100644
--- a/build/workspace.bzl
+++ b/build/workspace.bzl
@@ -17,13 +17,13 @@ load("//build:workspace_mirror.bzl", "mirror")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
 
-CNI_VERSION = "0.6.0"
+CNI_VERSION = "0.7.5"
 _CNI_TARBALL_ARCH_SHA256 = {
-    "amd64": "f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d",
-    "arm": "ffb62021d2fc6e1266dc6ef7f2058125b6e6b44c016291a2b04a15ed9b4be70a",
-    "arm64": "016bbc989877e35e3cd49fafe11415fb2717e52c74fde6b1650411154cb91b81",
-    "ppc64le": "dd38dec69b167cfe40ecbba4b18cfe5b4296f2e49b90c00804b3988ef968e859",
-    "s390x": "7708289eee7e52ad055407c421033d8e593f5cf1a0b43a872f09eb4e1508aafc",
+    "amd64": "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64",
+    "arm": "0eb4a528b5b2e4ce23ebc96e41b2f5280d5a64d41eec8dd8b16c3d66aaa0f6b8",
+    "arm64": "7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded",
+    "ppc64le": "9164a26ed8dd398b2fe3b15d9d456271dfa59aa537528d10572ea9fa2cef7679",
+    "s390x": "415cdcf02c65c22f5b7e55b0ab61208a10f2b95a0c8310176c771d07a9f448cf",
 }
 
 CRI_TOOLS_VERSION = "1.12.0"
diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index f24c24948c..f6b2501a0b 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -24,8 +24,8 @@ set -o nounset
 set -o pipefail
 
 ### Hardcoded constants
-DEFAULT_CNI_VERSION="v0.6.0"
-DEFAULT_CNI_SHA1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
+DEFAULT_CNI_VERSION="v0.7.5"
+DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d"
 DEFAULT_NPD_VERSION="v0.6.0"
 DEFAULT_NPD_SHA1="a28e960a21bb74bc0ae09c267b6a340f30e5b3a6"
 DEFAULT_CRICTL_VERSION="v1.12.0"
diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go
index fab3fbeb10..e7b1647a8f 100644
--- a/test/e2e_node/remote/utils.go
+++ b/test/e2e_node/remote/utils.go
@@ -27,7 +27,7 @@ import (
 // utils.go contains functions used across test suites.
 
 const (
-	cniVersion       = "v0.6.0"
+	cniVersion       = "v0.7.5"
 	cniArch          = "amd64"
 	cniDirectory     = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
 	cniConfDirectory = "cni/net.d"