Merge pull request #75462 from philips/automated-cherry-pick-of-#75455-upstream-release-1.13

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.0
-CNI_VERSION=v0.6.0
+CNI_VERSION=v0.7.5
 
 TEMP_DIR:=$(shell mktemp -d)
 CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz

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.5.1
+Requires: kubernetes-cni >= 0.7.5
 Requires: cri-tools >= 1.11.0
 
 URL: https://kubernetes.io

build/rpms/kubelet.spec

@@ -7,7 +7,7 @@ Summary: Container Cluster Manager - Kubernetes Node Agent
 URL: https://kubernetes.io
 
 Requires: iptables >= 1.4.21
-Requires: kubernetes-cni >= 0.5.1
+Requires: kubernetes-cni >= 0.7.5
 Requires: socat
 Requires: util-linux
 Requires: ethtool

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"

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"