github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

cni: Update CNI version to v0.8.5

Browse Source 
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
Stephen Augustus 2019-06-09 03:48:14 -04:00
parent b430f022fc
commit 1174e6698e
10 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/debian-hyperkube-base/Makefile
View File

@ -19,17 +19,16 @@
REGISTRY?=staging-k8s.gcr.io
IMAGE?=$(REGISTRY)/debian-hyperkube-base
TAG=0.12.1
TAG=0.12.2
ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
CACHEBUST?=1
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.1
CNI_VERSION=v0.7.5
CNI_VERSION=v0.8.5
TEMP_DIR:=$(shell mktemp -d)
# TODO(justaugustus): Post-0.7.5 CNI needs a "cni-plugins-linux-" prefix
CNI_TARBALL=cni-plugins-$(ARCH)-$(CNI_VERSION).tgz
CNI_TARBALL=cni-plugins-linux-$(ARCH)-$(CNI_VERSION).tgz
# This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled

4
build/dependencies.yaml
View File

@ -44,7 +44,7 @@ dependencies:
- name: "cni"
version: 0.7.5
version: 0.8.5
refPaths:
- path: build/debian-hyperkube-base/Makefile
match: CNI_VERSION=
@ -56,6 +56,8 @@ dependencies:
match: CNI_VERSION =
- path: cluster/gce/gci/configure.sh
match: DEFAULT_CNI_VERSION=
- path: cluster/gce/windows/k8s-node-setup.psm1
match: CNI_RELEASE_VERSION =
- path: test/e2e_node/remote/utils.go
match: cniVersion[\t\n\f\r ]*=

2
build/rpms/kubeadm.spec
View File

@ -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.7.5
Requires: kubernetes-cni >= 0.8.5
Requires: cri-tools >= 1.11.0
URL: https://kubernetes.io

2
build/rpms/kubelet.spec
View File

@ -11,7 +11,7 @@ Requires: ebtables
Requires: ethtool
Requires: iproute
Requires: iptables >= 1.4.21
Requires: kubernetes-cni >= 0.7.5
Requires: kubernetes-cni >= 0.8.5
Requires: socat
Requires: util-linux

15
build/workspace.bzl
View File

@ -17,13 +17,13 @@ load("//build:workspace_mirror.bzl", "mirror")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
CNI_VERSION = "0.7.5"
CNI_VERSION = "0.8.5"
_CNI_TARBALL_ARCH_SHA256 = {
"amd64": "3ca15c0a18ee830520cf3a95408be826cbd255a1535a38e0be9608b25ad8bf64",
"arm": "0eb4a528b5b2e4ce23ebc96e41b2f5280d5a64d41eec8dd8b16c3d66aaa0f6b8",
"arm64": "7fec91af78e9548df306f0ec43bea527c8c10cc3a9682c33e971c8522a7fcded",
"ppc64le": "9164a26ed8dd398b2fe3b15d9d456271dfa59aa537528d10572ea9fa2cef7679",
"s390x": "415cdcf02c65c22f5b7e55b0ab61208a10f2b95a0c8310176c771d07a9f448cf",
"amd64": "bd682ffcf701e8f83283cdff7281aad0c83b02a56084d6e601216210732833f9",
"arm": "86a868234045837cb3f5d58a0a4468ff42845d50b5e87bd128f050ef393d7495",
"arm64": "a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce",
"ppc64le": "a26cc3734f7cb980ab8fb3aaa64ccf2d67291478130009fa9542355fbdd94aa5",
"s390x": "033ea910a83144609083d5c3fb62bf4a379b0b17729a1a9e829feed9fa7a9d97",
}
CRI_TOOLS_VERSION = "1.17.0"
@ -53,14 +53,13 @@ def release_dependencies():
debian_image_dependencies()
etcd_tarballs()
# TODO(justaugustus): Post-0.7.5 CNI needs a "cni-plugins-linux-" prefix
def cni_tarballs():
for arch, sha in _CNI_TARBALL_ARCH_SHA256.items():
http_file(
name = "kubernetes_cni_%s" % arch,
downloaded_file_path = "kubernetes_cni.tgz",
sha256 = sha,
urls = ["https://storage.googleapis.com/k8s-artifacts-cni/release/v%s/cni-plugins-%s-v%s.tgz" % (CNI_VERSION, arch, CNI_VERSION)],
urls = ["https://storage.googleapis.com/k8s-artifacts-cni/release/v%s/cni-plugins-linux-%s-v%s.tgz" % (CNI_VERSION, arch, CNI_VERSION)],
)
def cri_tarballs():

3
cluster/gce/config-default.sh
View File

@ -291,8 +291,7 @@ NODE_PROBLEM_DETECTOR_RELEASE_PATH="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-}"
NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS="${NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS:-}"
CNI_SHA1="${CNI_SHA1:-}"
# TODO(justaugustus): Post-0.7.5 CNI needs a "cni-plugins-linux-" prefix
CNI_TAR_PREFIX="${CNI_TAR_PREFIX:-cni-plugins-amd64-}"
CNI_TAR_PREFIX="${CNI_TAR_PREFIX:-cni-plugins-linux-amd64-}"
CNI_STORAGE_URL_BASE="${CNI_STORAGE_URL_BASE:-https://storage.googleapis.com/k8s-artifacts-cni/release}"
# Optional: Create autoscaler for cluster's nodes.

3
cluster/gce/config-test.sh
View File

@ -322,8 +322,7 @@ NODE_PROBLEM_DETECTOR_RELEASE_PATH="${NODE_PROBLEM_DETECTOR_RELEASE_PATH:-}"
NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS="${NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS:-}"
CNI_SHA1="${CNI_SHA1:-}"
# TODO(justaugustus): Post-0.7.5 CNI needs a "cni-plugins-linux-" prefix
CNI_TAR_PREFIX="${CNI_TAR_PREFIX:-cni-plugins-amd64-}"
CNI_TAR_PREFIX="${CNI_TAR_PREFIX:-cni-plugins-linux-amd64-}"
CNI_STORAGE_URL_BASE="${CNI_STORAGE_URL_BASE:-https://storage.googleapis.com/k8s-artifacts-cni/release}"
# Optional: Create autoscaler for cluster's nodes.

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

@ -24,8 +24,8 @@ set -o nounset
set -o pipefail
### Hardcoded constants
DEFAULT_CNI_VERSION="v0.7.5"
DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d"
DEFAULT_CNI_VERSION="v0.8.5"
DEFAULT_CNI_SHA1="677d218b62c0ef941c1d0b606d6570faa5277ffd"
DEFAULT_NPD_VERSION="v0.8.0"
DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f"
DEFAULT_CRICTL_VERSION="v1.17.0"

2
cluster/gce/windows/k8s-node-setup.psm1
View File

@ -953,7 +953,7 @@ function Configure-CniNetworking {
# CLUSTER_IP_RANGE
# SERVICE_CLUSTER_IP_RANGE
function Configure_Dockerd_CniNetworking {
$CNI_RELEASE_VERSION = 'v0.8.2'
$CNI_RELEASE_VERSION = 'v0.8.5'
if ((ShouldWrite-File ${env:CNI_DIR}\win-bridge.exe) -or
(ShouldWrite-File ${env:CNI_DIR}\host-local.exe)) {
$tmp_dir = 'C:\cni_tmp'

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

@ -27,12 +27,11 @@ import (
// utils.go contains functions used across test suites.
const (
cniVersion = "v0.7.5"
cniVersion = "v0.8.5"
cniArch = "amd64"
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
cniConfDirectory = "cni/net.d"
// TODO(justaugustus): Post-0.7.5 CNI needs a "cni-plugins-linux-" prefix
cniURL = "https://storage.googleapis.com/k8s-artifacts-cni/release/" + cniVersion + "/" + "cni-plugins-" + cniArch + "-" + cniVersion + ".tgz"
cniURL = "https://storage.googleapis.com/k8s-artifacts-cni/release/" + cniVersion + "/" + "cni-plugins-linux-" + cniArch + "-" + cniVersion + ".tgz"
)
const cniConfig = `{