diff --git a/build/dependencies.yaml b/build/dependencies.yaml index f3637bfe181..8639725f62b 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -18,7 +18,7 @@ dependencies: # CNI plugins - name: "cni" - version: 1.5.1 + version: 1.6.0 refPaths: - path: cluster/gce/config-common.sh match: WINDOWS_CNI_VERSION= diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh index cac93c17b1a..4506d18b630 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -136,7 +136,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config" # CNI storage path for Windows nodes export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release" # CNI version for Windows nodes -export WINDOWS_CNI_VERSION="v1.5.1" +export WINDOWS_CNI_VERSION="v1.6.0" # Pod manifests directory for Windows nodes on Windows nodes. export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests" # Directory where cert/key files will be stores on Windows nodes. diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index 947a79fc0f5..db941eef7db 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='v1.5.1' -DEFAULT_CNI_HASH='c7ee3e074e15d46dd6b58bc3ae8282e97e1b0d315bcdf252b98fe7b9fe04cc1cfa892e6663d9258b5271cf5f2ecd5cd7caed4503bad53de8142c0bc44b3fd7ba' +DEFAULT_CNI_VERSION='v1.6.0' +DEFAULT_CNI_HASH='3d9f34a43e0550d9f4f28c724e25bc5cfcfc601c329586bafe4910c3c72f918055151066e71e14e157276138e358344a1d815d957646df43a86d3673ab2849c3' DEFAULT_NPD_VERSION='v0.8.20' DEFAULT_NPD_HASH_AMD64='09029b62f8023885f3a856c20b5fafecabb880806467848ae25f578c4ee6afacd97c85a0c2d0c582c8d79d3716c83d0e7d324073c5816ae5a812812a6f21450b' DEFAULT_NPD_HASH_ARM64='233f7e4451de920b7ce8b0ac0e46da1a07ef559e628a75746ce7927492a1886ebd007875f76462d2d0bf3b1dc807a7e8321108cafbd7db9eee39c0e2cfb6c051' diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index 7ed47c5adbd..2bcc6f1e76e 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -56,7 +56,7 @@ LIMITED_SWAP=${LIMITED_SWAP:-""} # required for cni installation CNI_CONFIG_DIR=${CNI_CONFIG_DIR:-/etc/cni/net.d} -CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.5.1"} +CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.6.0"} # The arch of the CNI binary, if not set, will be fetched based on the value of `uname -m` CNI_TARGETARCH=${CNI_TARGETARCH:-""} CNI_PLUGINS_URL="https://github.com/containernetworking/plugins/releases/download" diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go index 14ab151461d..e2458c2aa3e 100644 --- a/test/e2e_node/remote/utils.go +++ b/test/e2e_node/remote/utils.go @@ -28,7 +28,7 @@ import ( // utils.go contains functions used across test suites. const ( - cniVersion = "v1.5.1" + cniVersion = "v1.6.0" cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin". cniConfDirectory = "cni/net.d"