Skip to content

Commit bfd8ad3

Browse files
committed
build/gci: bump CNI version to 0.7.5
1 parent a4f2590 commit bfd8ad3

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

build/debian-hyperkube-base/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
2525
CACHEBUST?=1
2626

2727
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.1
28-
CNI_VERSION=v0.6.0
28+
CNI_VERSION=v0.7.5
2929

3030
TEMP_DIR:=$(shell mktemp -d)
3131
CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz

build/rpms/kubeadm.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ License: ASL 2.0
55
Summary: Container Cluster Manager - Kubernetes Cluster Bootstrapping Tool
66
Requires: kubelet >= 1.8.0
77
Requires: kubectl >= 1.8.0
8-
Requires: kubernetes-cni >= 0.6.0
8+
Requires: kubernetes-cni >= 0.7.5
99
Requires: cri-tools >= 1.11.0
1010

1111
URL: https://kubernetes.io

build/rpms/kubelet.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Requires: ebtables
1111
Requires: ethtool
1212
Requires: iproute
1313
Requires: iptables >= 1.4.21
14-
Requires: kubernetes-cni >= 0.6.0
14+
Requires: kubernetes-cni >= 0.7.5
1515
Requires: socat
1616
Requires: util-linux
1717

build/workspace.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ load("//build:workspace_mirror.bzl", "mirror")
1717
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
1818
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
1919

20-
CNI_VERSION = "0.6.0"
20+
CNI_VERSION = "0.7.5"
2121
_CNI_TARBALL_ARCH_SHA256 = {
22-
"amd64": "f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d",
23-
"arm": "ffb62021d2fc6e1266dc6ef7f2058125b6e6b44c016291a2b04a15ed9b4be70a",
24-
"arm64": "016bbc989877e35e3cd49fafe11415fb2717e52c74fde6b1650411154cb91b81",
25-
"ppc64le": "dd38dec69b167cfe40ecbba4b18cfe5b4296f2e49b90c00804b3988ef968e859",
26-
"s390x": "7708289eee7e52ad055407c421033d8e593f5cf1a0b43a872f09eb4e1508aafc",
22+
"amd64": "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64",
23+
"arm": "0eb4a528b5b2e4ce23ebc96e41b2f5280d5a64d41eec8dd8b16c3d66aaa0f6b8",
24+
"arm64": "7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded",
25+
"ppc64le": "9164a26ed8dd398b2fe3b15d9d456271dfa59aa537528d10572ea9fa2cef7679",
26+
"s390x": "415cdcf02c65c22f5b7e55b0ab61208a10f2b95a0c8310176c771d07a9f448cf",
2727
}
2828

2929
CRI_TOOLS_VERSION = "1.12.0"

cluster/gce/gci/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ set -o nounset
2424
set -o pipefail
2525

2626
### Hardcoded constants
27-
DEFAULT_CNI_VERSION="v0.6.0"
28-
DEFAULT_CNI_SHA1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
27+
DEFAULT_CNI_VERSION="v0.7.5"
28+
DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d"
2929
DEFAULT_NPD_VERSION="v0.6.0"
3030
DEFAULT_NPD_SHA1="a28e960a21bb74bc0ae09c267b6a340f30e5b3a6"
3131
DEFAULT_CRICTL_VERSION="v1.12.0"

test/e2e_node/remote/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
// utils.go contains functions used across test suites.
2828

2929
const (
30-
cniVersion = "v0.6.0"
30+
cniVersion = "v0.7.5"
3131
cniArch = "amd64"
3232
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
3333
cniConfDirectory = "cni/net.d"

0 commit comments

Comments
 (0)