Skip to content

Commit 5bb3aa3

Browse files
authored
Merge pull request kubernetes#131602 from adrianmoisey/bump_cni
Update CNI plugins to v1.7.1
2 parents 2ac0bdf + e5ffec2 commit 5bb3aa3

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-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.6.2
21+
version: 1.7.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://github.com/containernetworking/plugins/releases/download"
138138
# CNI version for Windows nodes
139-
export WINDOWS_CNI_VERSION="v1.6.2"
139+
export WINDOWS_CNI_VERSION="v1.7.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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ set -o nounset
2424
set -o pipefail
2525

2626
### Hardcoded constants
27-
DEFAULT_CNI_VERSION='v1.6.2'
28-
DEFAULT_CNI_HASH='23036eea642c55cd38d6a2d8f18837fac78e3d2bc6ec86dc2047dad5e51323efdc8dfd0482ac78fe9f117e4e630d0015e190e4a6a3544fc50dc59e5083459629'
27+
DEFAULT_CNI_VERSION='v1.7.1'
28+
# CNI HASH for amd64 sha512
29+
DEFAULT_CNI_HASH='22c1da53be05ecb8a1672c0a91b38f87d5218babeff0cd0f86e50fc127bf27970d977e748c7c8de765482ed353294b20a75392fb21885d6cae3da724b15c84d3'
2930
DEFAULT_NPD_VERSION='v0.8.20'
3031
DEFAULT_NPD_HASH_AMD64='09029b62f8023885f3a856c20b5fafecabb880806467848ae25f578c4ee6afacd97c85a0c2d0c582c8d79d3716c83d0e7d324073c5816ae5a812812a6f21450b'
3132
DEFAULT_NPD_HASH_ARM64='233f7e4451de920b7ce8b0ac0e46da1a07ef559e628a75746ce7927492a1886ebd007875f76462d2d0bf3b1dc807a7e8321108cafbd7db9eee39c0e2cfb6c051'

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.6.2"}
59+
CNI_PLUGINS_VERSION=${CNI_PLUGINS_VERSION:-"v1.7.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.6.2"
31+
cniVersion = "v1.7.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)