mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
Update cni-plugins to v1.5.1
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
This commit is contained in:
parent
90c6cfd414
commit
312b0386e8
@ -18,7 +18,7 @@ dependencies:
|
||||
|
||||
# CNI plugins
|
||||
- name: "cni"
|
||||
version: 1.5.0
|
||||
version: 1.5.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://storage.googleapis.com/k8s-artifacts-cni/release"
|
||||
# CNI version for Windows nodes
|
||||
export WINDOWS_CNI_VERSION="v1.5.0"
|
||||
export WINDOWS_CNI_VERSION="v1.5.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,8 +24,8 @@ set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
### Hardcoded constants
|
||||
DEFAULT_CNI_VERSION='v1.5.0'
|
||||
DEFAULT_CNI_HASH='7e3d34d2de37a8fe72278ea796fcbe763e9e7f241ed1a6d3c5a9f613fe5895bf3bbea05e0b651d9e4d0e1c427a7b42f0ff5c07d29abfc2aee9967136347451bd'
|
||||
DEFAULT_CNI_VERSION='v1.5.1'
|
||||
DEFAULT_CNI_HASH='c7ee3e074e15d46dd6b58bc3ae8282e97e1b0d315bcdf252b98fe7b9fe04cc1cfa892e6663d9258b5271cf5f2ecd5cd7caed4503bad53de8142c0bc44b3fd7ba'
|
||||
DEFAULT_NPD_VERSION='v0.8.19'
|
||||
DEFAULT_NPD_HASH_AMD64='41e7816614a1e30c94cbe37a1d09c2ef6c3f2ad336b40d95378528deac9a8b811356e46bae268dab006132f2bdce22668a640517f000853109d1e3be77aef25e'
|
||||
DEFAULT_NPD_HASH_ARM64='678352d0544c166e86d3435c4f49b1ea5ce19c2d6f083f51f7688599377928e5b1425d1733006981d17e94ddede67f9fc1d2035577a87687701044950f697390'
|
||||
|
@ -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.0"}
|
||||
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.5.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.5.0"
|
||||
cniVersion = "v1.5.1"
|
||||
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
|
||||
cniConfDirectory = "cni/net.d"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user