github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Bump CNI consumers to latest version

Browse Source 
- vendored CNI plugins properly handle `DEL` on missing resources
- [based on v0.5.1](https://github.com/kubernetes/kubernetes/issues/43488#issuecomment-288525151)
This commit is contained in:
caleb miles 2017-03-22 15:43:43 -07:00
parent 7c24d1a665
commit f4d9bbc7d8
No known key found for this signature in database
GPG Key ID: 10D740CAB6AE0787
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WORKSPACE
View File

@ -62,6 +62,6 @@ debs = (
http_file( http_file(
name = "kubernetes_cni", name = "kubernetes_cni",
sha256 = "ddcb7a429f82b284a13bdb36313eeffd997753b6fa5191205f1e978dcfeb0792", sha256 = "05ab3937bc68562e989dc143362ec4d4275262ba9f359338aed720fc914457a5",
url = " https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz", url = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-amd64-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz",
) )

4
cluster/gce/container-linux/configure.sh
View File

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

4
cluster/gce/gci/configure.sh
View File

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

2
cluster/images/hyperkube/Makefile
View File

@ -20,7 +20,7 @@
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX) TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
CNI_RELEASE=07a8a28637e97b22eb8dfe710eeae1344f69d16e CNI_RELEASE=0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff
CACHEBUST?=1 CACHEBUST?=1
QEMUVERSION=v2.7.0 QEMUVERSION=v2.7.0

4
cluster/saltbase/salt/cni/init.sls
View File

@ -19,9 +19,9 @@ cni-tar:
- user: root - user: root
- name: /opt/cni - name: /opt/cni
- makedirs: True - makedirs: True
- source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz - source: https://storage.googleapis.com/kubernetes-release/network-plugins/cni-0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff.tar.gz
- tar_options: v - tar_options: v
- source_hash: md5=dd11b04dcb0b9aca00b5287ba18dcfaa - source_hash: md5=afbb526e7d976f98353ac96f73043031
- archive_format: tar - archive_format: tar
- if_missing: /opt/cni/bin - if_missing: /opt/cni/bin

2
test/e2e_node/remote/utils.go
View File

@ -27,7 +27,7 @@ import (
// utils.go contains functions used accross test suites. // utils.go contains functions used accross test suites.
const ( const (
cniRelease = "07a8a28637e97b22eb8dfe710eeae1344f69d16e" cniRelease = "0799f5732f2a11b329d9e3d51b9c8f2e3759f2ff"
cniDirectory = "cni" cniDirectory = "cni"
cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz" cniURL = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-" + cniRelease + ".tar.gz"
) )