From f0be916f7a9ac942a85aa9b7a48e59daa3a0fea5 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 2 Sep 2025 08:39:57 +0200 Subject: [PATCH] Update CNI plugins to v1.8.0 Signed-off-by: Sascha Grunert --- build/dependencies.yaml | 2 +- cluster/gce/config-common.sh | 2 +- cluster/gce/gci/configure.sh | 4 ++-- hack/local-up-cluster.sh | 2 +- test/e2e_node/remote/utils.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 87a14eea66e..012510b8e56 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -18,7 +18,7 @@ dependencies: # CNI plugins - name: "cni" - version: 1.7.1 + version: 1.8.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 101848f3ffb..e50985fc54b 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://github.com/containernetworking/plugins/releases/download" # CNI version for Windows nodes -export WINDOWS_CNI_VERSION="v1.7.1" +export WINDOWS_CNI_VERSION="v1.8.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 e6bd2f8c6cd..7d49f62e47d 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -24,9 +24,9 @@ set -o nounset set -o pipefail ### Hardcoded constants -DEFAULT_CNI_VERSION='v1.7.1' +DEFAULT_CNI_VERSION='v1.8.0' # CNI HASH for amd64 sha512 -DEFAULT_CNI_HASH='22c1da53be05ecb8a1672c0a91b38f87d5218babeff0cd0f86e50fc127bf27970d977e748c7c8de765482ed353294b20a75392fb21885d6cae3da724b15c84d3' +DEFAULT_CNI_HASH='a2696f937b3433eee4a0de44a0994190166b108f2b29adf9f7005fa4fbfff56e78cbe8a2fe2607d99d4bcc0d4a8183e0c27fa748c2f8fb08ae40b62f198fd45b' DEFAULT_NPD_VERSION='v0.8.21' DEFAULT_NPD_HASH_AMD64='2805ee1da97e06a4b209c198f21763e8687c499687f1b712e4e8e767a75aee4385c9d7fc54f0b190610ea693293a09eded6661ecf15af7af3e787475540fae71' DEFAULT_NPD_HASH_ARM64='e2291bbb06d4e831267c2b2a316a668bdff36a502e89826a355cd7f3beeba804e62a2b59a8ec666f4e83042032a379aba9592bcbddf0d57c5a81b3bc1913517c' diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index fe6616f69ed..267dbafb39e 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -59,7 +59,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.7.1"} +CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.8.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 fa2edfc2948..53f1685945f 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.7.1" + cniVersion = "v1.8.0" cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin". cniConfDirectory = "cni/net.d"