Skip to content

Commit 855551d

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #51250 from dixudx/bump_cni_v0.6.0
Automatic merge from submit-queue (batch tested with PRs 53106, 52193, 51250, 52449, 53861). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. bump CNI to v0.6.0 **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49480 **Special notes for your reviewer**: /assign @luxas @bboreham @feiskyer **Release note**: ```release-note bump CNI to v0.6.0 ```
2 parents ef87482 + 94b70b7 commit 855551d

File tree

15 files changed

+103
-131
lines changed

15 files changed

+103
-131
lines changed

‎Godeps/Godeps.json‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/cni/Makefile‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎build/debian-hyperkube-base/Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ ARCH?=amd64
2424
CACHEBUST?=1
2525

2626
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.2
27-
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
27+
CNI_VERSION=v0.6.0
2828

2929
TEMP_DIR:=$(shell mktemp -d)
30-
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
30+
CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz
3131

3232
.PHONY: all build push clean
3333

@@ -48,8 +48,8 @@ ifeq ($(CACHEBUST),1)
4848
cd ${TEMP_DIR} && sed -i.back "s|CACHEBUST|$(shell uuidgen)|g" Dockerfile
4949
endif
5050

51-
mkdir -p ${TEMP_DIR}/cni-bin
52-
tar -xz -C ${TEMP_DIR}/cni-bin -f "cni-tars/${CNI_TARBALL}"
51+
mkdir -p ${TEMP_DIR}/cni-bin/bin
52+
tar -xz -C ${TEMP_DIR}/cni-bin/bin -f "cni-tars/${CNI_TARBALL}"
5353

5454
# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
5555
docker run --rm --privileged multiarch/qemu-user-static:register --reset

‎build/root/WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ docker_repositories()
5656

5757
http_file(
5858
name = "kubernetes_cni",
59-
sha256 = "05ab3937bc68562e989dc143362ec4d4275262ba9f359338aed720fc914457a5",
60-
url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz",
59+
sha256 = "f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d",
60+
url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz",
6161
)
6262

6363
docker_pull(

‎build/rpms/kubernetes-cni.spec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ URL: https://kubernetes.io
1010
Binaries required to provision container networking.
1111

1212
%prep
13-
tar xzfv cni-*.tar.gz
13+
mkdir -p ./bin
14+
tar -C ./bin -xz -f cni-plugins-amd64-v0.6.0.tgz
1415

1516
%install
1617

‎cluster/gce/container-linux/configure.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ function install-kube-binary-config {
110110

111111
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
112112
[[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
113-
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
114-
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
115-
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
113+
local -r cni_version="v0.6.0"
114+
local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
115+
local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
116116
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
117117
local -r cni_dir="${KUBE_HOME}/cni"
118-
mkdir -p "${cni_dir}"
119-
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
118+
mkdir -p "${cni_dir}/bin"
119+
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
120120
mv "${cni_dir}/bin"/* "${kube_bin}"
121121
rmdir "${cni_dir}/bin"
122122
rm -f "${KUBE_HOME}/${cni_tar}"

‎cluster/gce/gci/configure.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,9 @@ function install-node-problem-detector {
170170
}
171171

172172
function install-cni-binaries {
173-
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
174-
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
175-
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
173+
local -r cni_version="v0.6.0"
174+
local -r cni_tar="cni-plugins-amd64-${cni_version}.tgz"
175+
local -r cni_sha1="d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
176176
if is-preloaded "${cni_tar}" "${cni_sha1}"; then
177177
echo "${cni_tar} is preloaded."
178178
return
@@ -181,8 +181,8 @@ function install-cni-binaries {
181181
echo "Downloading cni binaries"
182182
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
183183
local -r cni_dir="${KUBE_HOME}/cni"
184-
mkdir -p "${cni_dir}"
185-
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}" --overwrite
184+
mkdir -p "${cni_dir}/bin"
185+
tar xzf "${KUBE_HOME}/${cni_tar}" -C "${cni_dir}/bin" --overwrite
186186
mv "${cni_dir}/bin"/* "${KUBE_BIN}"
187187
rmdir "${cni_dir}/bin"
188188
rm -f "${KUBE_HOME}/${cni_tar}"

‎cluster/saltbase/salt/cni/init.sls‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ cni-tar:
1717
archive:
1818
- extracted
1919
- user: root
20-
- name: /home/kubernetes
20+
- name: /home/kubernetes/bin
2121
- makedirs: True
22-
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
22+
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz
2323
- tar_options: v
24-
- source_hash: md5=afbb526e7d976f98353ac96f73043031
24+
- source_hash: md5=9534876FAE7DBE813CDAB404DC1F9219
2525
- archive_format: tar
2626
- if_missing: /home/kubernetes/bin
2727

‎test/e2e_node/remote/utils.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ import (
2727
// utils.go contains functions used across test suites.
2828

2929
const (
30-
cniRelease = "0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff"
31-
cniDirectory = "cni" // The CNI tarball creates the "bin" directory under "cni".
30+
cniVersion = "v0.6.0"
31+
cniArch = "amd64"
32+
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
3233
cniConfDirectory = "cni/net.d"
33-
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz"
34+
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
3435
)
3536

3637
const cniConfig = `{

‎vendor/github.com/containernetworking/cni/pkg/invoke/args.go‎

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)