diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 2358cb0b13e..b237b14535f 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -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 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index a08185f66e9..b960bd73e06 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -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 ]*= diff --git a/build/rpms/kubeadm.spec b/build/rpms/kubeadm.spec index 6c25ee992f4..80e05d068d5 100644 --- a/build/rpms/kubeadm.spec +++ b/build/rpms/kubeadm.spec @@ -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 diff --git a/build/rpms/kubelet.spec b/build/rpms/kubelet.spec index 2603c4b07c8..8906bb6a7f8 100644 --- a/build/rpms/kubelet.spec +++ b/build/rpms/kubelet.spec @@ -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 diff --git a/build/workspace.bzl b/build/workspace.bzl index 2a6b54c62ac..2f73d71169c 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -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(): diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index edb13460566..821cda404e9 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -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. diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 4b4be5dda56..d161df31799 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -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. diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 0d152a7ac10..6adb3e6e381 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -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" diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index 5cf37201e08..011b926feba 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -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' diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go index 57d487626a7..fcff2349756 100644 --- a/test/e2e_node/remote/utils.go +++ b/test/e2e_node/remote/utils.go @@ -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 = `{