Skip to content

Commit f4d9bbc

Browse files
author
caleb miles
committedMar 22, 2017
Bump CNI consumers to latest version
- vendored CNI plugins properly handle `DEL` on missing resources - [based on v0.5.1](kubernetes#43488 (comment))
1 parent 7c24d1a commit f4d9bbc

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed
 

‎WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ debs = (
6262

6363
http_file(
6464
name = "kubernetes_cni",
65-
sha256 = "ddcb7a429f82b284a13bdb36313eeffd997753b6fa5191205f1e978dcfeb0792",
66-
url = " https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz",
65+
sha256 = "05ab3937bc68562e989dc143362ec4d4275262ba9f359338aed720fc914457a5",
66+
url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz",
6767
)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ function install-kube-binary-config {
111111
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
112112
[[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
113113
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
114-
local -r cni_tar="cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz"
115-
local -r cni_sha1="19d49f7b2b99cd2493d5ae0ace896c64e289ccbb"
114+
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
115+
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
116116
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
117117
local -r cni_dir="${KUBE_HOME}/cni"
118118
mkdir -p "${cni_dir}"

‎cluster/gce/gci/configure.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ function install-kube-binary-config {
184184
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]] || \
185185
[[ "${NETWORK_PROVIDER:-}" == "cni" ]]; then
186186
#TODO(andyzheng0831): We should make the cni version number as a k8s env variable.
187-
local -r cni_tar="cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz"
188-
local -r cni_sha1="19d49f7b2b99cd2493d5ae0ace896c64e289ccbb"
187+
local -r cni_tar="cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz"
188+
local -r cni_sha1="1d9788b0f5420e1a219aad2cb8681823fc515e7c"
189189
download-or-bust "${cni_sha1}" "https://storage.googleapis.com/kubernetes-release/network-plugins/${cni_tar}"
190190
local -r cni_dir="${KUBE_HOME}/cni"
191191
mkdir -p "${cni_dir}"

‎cluster/images/hyperkube/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
REGISTRY?=gcr.io/google_containers
2121
ARCH?=amd64
2222
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
23-
CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e
23+
CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
2424
CACHEBUST?=1
2525
QEMUVERSION=v2.7.0
2626

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ cni-tar:
1919
- user: root
2020
- name: /opt/cni
2121
- makedirs: True
22-
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz
22+
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
2323
- tar_options: v
24-
- source_hash: md5=dd11b04dcb0b9aca00b5287ba18dcfaa
24+
- source_hash: md5=afbb526e7d976f98353ac96f73043031
2525
- archive_format: tar
2626
- if_missing: /opt/cni/bin
2727

‎test/e2e_node/remote/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
// utils.go contains functions used accross test suites.
2828

2929
const (
30-
cniRelease = "07a8a28637e97b22eb8dfe710eeae1344f69d16e"
30+
cniRelease = "0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff"
3131
cniDirectory = "cni"
3232
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz"
3333
)

0 commit comments

Comments
 (0)