mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 20:00:07 +00:00
Merge pull request #137991 from yashsingh74/cni-bumps
Update CNI plugins to v1.9.1
This commit is contained in:
@@ -18,7 +18,7 @@ dependencies:
|
||||
|
||||
# CNI plugins
|
||||
- name: "cni"
|
||||
version: 1.9.0
|
||||
version: 1.9.1
|
||||
refPaths:
|
||||
- path: cluster/gce/config-common.sh
|
||||
match: WINDOWS_CNI_VERSION=
|
||||
|
||||
@@ -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.9.0"
|
||||
export WINDOWS_CNI_VERSION="v1.9.1"
|
||||
# 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.
|
||||
|
||||
@@ -24,9 +24,9 @@ set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
### Hardcoded constants
|
||||
DEFAULT_CNI_VERSION='v1.9.0'
|
||||
DEFAULT_CNI_VERSION='v1.9.1'
|
||||
# CNI HASH for amd64 sha512
|
||||
DEFAULT_CNI_HASH='fe6adcc7319f2d7f2307bb66a580789b24daf3e7856e41d0468324c40d5cf7a540dbecbc5ddb9ef5a12aac49ed94c63b36d926b332f2e2217475db1ab0b576b7'
|
||||
DEFAULT_CNI_HASH='3ea8a76852b7ddc62c087a34cccca2cb29822ca24214928cd172b28bf9d1486000ba3eb71a156445af31ff6a92c1dc3e01e702546c6ee016ef13fae06ccfb8fc'
|
||||
DEFAULT_NPD_VERSION='v1.34.0'
|
||||
DEFAULT_NPD_HASH_AMD64='3c55ff6ffadd77dbc3df3774d13164587103ca87c8b6914f5c71c87d8f498b78621e0c96538bb3c69f8f1b4194a6da553aa56b1b52001a7d9a67776ac24e80bd'
|
||||
DEFAULT_NPD_HASH_ARM64='ca1d34e64b80f6b2bdf86cfde95154122d6e14c707a748ea6fc414a55f391b1bb572a96b6b2c285996af0232917fa87e14e037125aa03a62247383af3e48c095'
|
||||
|
||||
@@ -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.9.0"}
|
||||
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.9.1"}
|
||||
# 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"
|
||||
|
||||
@@ -28,7 +28,7 @@ import (
|
||||
// utils.go contains functions used across test suites.
|
||||
|
||||
const (
|
||||
cniVersion = "v1.9.0"
|
||||
cniVersion = "v1.9.1"
|
||||
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
|
||||
cniConfDirectory = "cni/net.d"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user