Skip to content

Commit 4aca09b

Browse files
authored
Merge pull request kubernetes#126966 from saschagrunert/cni-plugins
Update cni-plugins to v1.5.1
2 parents aa45153 + 931b9b3 commit 4aca09b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818

1919
# CNI plugins
2020
- name: "cni"
21-
version: 1.5.0
21+
version: 1.5.1
2222
refPaths:
2323
- path: cluster/gce/config-common.sh
2424
match: WINDOWS_CNI_VERSION=

cluster/gce/config-common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config"
136136
# CNI storage path for Windows nodes
137137
export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release"
138138
# CNI version for Windows nodes
139-
export WINDOWS_CNI_VERSION="v1.5.0"
139+
export WINDOWS_CNI_VERSION="v1.5.1"
140140
# Pod manifests directory for Windows nodes on Windows nodes.
141141
export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests"
142142
# Directory where cert/key files will be stores on Windows nodes.

cluster/gce/gci/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ set -o nounset
2424
set -o pipefail
2525

2626
### Hardcoded constants
27-
DEFAULT_CNI_VERSION='v1.5.0'
28-
DEFAULT_CNI_HASH='7e3d34d2de37a8fe72278ea796fcbe763e9e7f241ed1a6d3c5a9f613fe5895bf3bbea05e0b651d9e4d0e1c427a7b42f0ff5c07d29abfc2aee9967136347451bd'
27+
DEFAULT_CNI_VERSION='v1.5.1'
28+
DEFAULT_CNI_HASH='c7ee3e074e15d46dd6b58bc3ae8282e97e1b0d315bcdf252b98fe7b9fe04cc1cfa892e6663d9258b5271cf5f2ecd5cd7caed4503bad53de8142c0bc44b3fd7ba'
2929
DEFAULT_NPD_VERSION='v0.8.19'
3030
DEFAULT_NPD_HASH_AMD64='41e7816614a1e30c94cbe37a1d09c2ef6c3f2ad336b40d95378528deac9a8b811356e46bae268dab006132f2bdce22668a640517f000853109d1e3be77aef25e'
3131
DEFAULT_NPD_HASH_ARM64='678352d0544c166e86d3435c4f49b1ea5ce19c2d6f083f51f7688599377928e5b1425d1733006981d17e94ddede67f9fc1d2035577a87687701044950f697390'

hack/local-up-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ LIMITED_SWAP=${LIMITED_SWAP:-""}
5656

5757
# required for cni installation
5858
CNI_CONFIG_DIR=${CNI_CONFIG_DIR:-/etc/cni/net.d}
59-
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.5.0"}
59+
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.5.1"}
6060
# The arch of the CNI binary, if not set, will be fetched based on the value of `uname -m`
6161
CNI_TARGETARCH=${CNI_TARGETARCH:-""}
6262
CNI_PLUGINS_URL="https://github.com/containernetworking/plugins/releases/download"

test/e2e_node/remote/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
// utils.go contains functions used across test suites.
2929

3030
const (
31-
cniVersion = "v1.5.0"
31+
cniVersion = "v1.5.1"
3232
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
3333
cniConfDirectory = "cni/net.d"
3434

0 commit comments

Comments
 (0)