From da999fbc1b51269d8f96448fb9c9301266c47bdf Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 23 Jan 2025 10:50:58 +0100 Subject: [PATCH] Update CNI plugins to v1.6.2 and avoid using k8s-artifacts-cni bucket Updating the CNI plugins to the latest release and switch over to use GitHub releases instead of the `k8s-artifacts-cni` bucket. Follow-up on https://github.com/kubernetes/kubernetes/pull/129095 Signed-off-by: Sascha Grunert --- build/dependencies.yaml | 2 +- cluster/gce/config-common.sh | 4 ++-- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- cluster/gce/gci/configure.sh | 4 ++-- hack/local-up-cluster.sh | 6 +----- test/e2e_node/remote/utils.go | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build/dependencies.yaml b/build/dependencies.yaml index b4671213ae3..d1cf9a67cfd 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -18,7 +18,7 @@ dependencies: # CNI plugins - name: "cni" - version: 1.6.0 + version: 1.6.2 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 4506d18b630..125297b1c94 100644 --- a/cluster/gce/config-common.sh +++ b/cluster/gce/config-common.sh @@ -134,9 +134,9 @@ export WINDOWS_CNI_DIR="${WINDOWS_K8S_DIR}\cni" # Directory where CNI config files will be stored on Windows nodes. 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" +export WINDOWS_CNI_STORAGE_PATH="https://github.com/containernetworking/plugins/releases/download" # CNI version for Windows nodes -export WINDOWS_CNI_VERSION="v1.6.0" +export WINDOWS_CNI_VERSION="v1.6.2" # 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/config-default.sh b/cluster/gce/config-default.sh index 0d4b4d0f10e..ab7804bcfae 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -300,7 +300,7 @@ NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS="${NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS:-}" CNI_HASH="${CNI_HASH:-}" 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}" +CNI_STORAGE_URL_BASE="${CNI_STORAGE_URL_BASE:-https://github.com/containernetworking/plugins/releases/download}" # Optional: Create autoscaler for cluster's nodes. ENABLE_CLUSTER_AUTOSCALER="${KUBE_ENABLE_CLUSTER_AUTOSCALER:-false}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 98e7b9a1ba3..d950f67bddb 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -342,7 +342,7 @@ NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS=${NODE_PROBLEM_DETECTOR_CUSTOM_FLAGS:-} CNI_HASH=${CNI_HASH:-} 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} +CNI_STORAGE_URL_BASE=${CNI_STORAGE_URL_BASE:-https://github.com/containernetworking/plugins/releases/download} # Optional: Create autoscaler for cluster's nodes. export ENABLE_CLUSTER_AUTOSCALER=${KUBE_ENABLE_CLUSTER_AUTOSCALER:-false} diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index d14dda6e0e2..623537538fe 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.6.0' -DEFAULT_CNI_HASH='3d9f34a43e0550d9f4f28c724e25bc5cfcfc601c329586bafe4910c3c72f918055151066e71e14e157276138e358344a1d815d957646df43a86d3673ab2849c3' +DEFAULT_CNI_VERSION='v1.6.2' +DEFAULT_CNI_HASH='23036eea642c55cd38d6a2d8f18837fac78e3d2bc6ec86dc2047dad5e51323efdc8dfd0482ac78fe9f117e4e630d0015e190e4a6a3544fc50dc59e5083459629' 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 f30bb723d3d..2a89561b338 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -56,14 +56,10 @@ 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.6.0"} +CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.6.2"} # 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" -CNI_PLUGINS_AMD64_SHA256SUM=${CNI_PLUGINS_AMD64_SHA256SUM:-"57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5"} -CNI_PLUGINS_ARM64_SHA256SUM=${CNI_PLUGINS_ARM64_SHA256SUM:-"ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2"} -CNI_PLUGINS_PPC64LE_SHA256SUM=${CNI_PLUGINS_PPC64LE_SHA256SUM:-"5eea6e7033a337fd98df00fa8a72a8ca8d2d2c69f6637555828515de94158cab"} -CNI_PLUGINS_S390X_SHA256SUM=${CNI_PLUGINS_S390X_SHA256SUM:-"3d1b56d8b357ee593866cd9342a61fc797852da9ff75ae5ed7b5de125a30b253"} # enables testing eviction scenarios locally. EVICTION_HARD=${EVICTION_HARD:-"imagefs.available<15%,memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%"} diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go index b18ced6c126..39ad30cb686 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.6.0" + cniVersion = "v1.6.2" cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin". cniConfDirectory = "cni/net.d"