Skip to content

Commit ed6ac4e

Browse files
authored
Merge pull request kubernetes#94367 from justaugustus/cni
Update CNI plugins to v0.8.7
2 parents a28a692 + e59d9f3 commit ed6ac4e

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

build/dependencies.yaml

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

2727
# CNI plugins
2828
- name: "cni"
29-
version: 0.8.6
29+
version: 0.8.7
3030
refPaths:
3131
- path: build/workspace.bzl
3232
match: CNI_VERSION =

build/workspace.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ load("//build:workspace_mirror.bzl", "mirror")
1717
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
1818
load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
1919

20-
CNI_VERSION = "0.8.6"
20+
CNI_VERSION = "0.8.7"
2121
_CNI_TARBALL_ARCH_SHA256 = {
22-
"amd64": "994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5",
23-
"arm": "28e61b5847265135dc1ca397bf94322ecce4acab5c79cc7d360ca3f6a655bdb7",
24-
"arm64": "43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999",
25-
"ppc64le": "61d6c6c15d3e4fa3eb85d128c9c0ff2658f38e59047ae359be47d193c673e116",
26-
"s390x": "ca126a3bd2cd8dff1c7bbfc3c69933b284c4e77614391c7e1f74b0851fc3b289",
22+
"amd64": "977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8",
23+
"arm": "5757778f4c322ffd93d7586c60037b81a2eb79271af6f4edf9ff62b4f7868ed9",
24+
"arm64": "ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f",
25+
"ppc64le": "70a8c5448ed03a3b27c6a89499a05285760a45252ec7eae4190c70ba5400d4ba",
26+
"s390x": "3a0008f98ea5b4b6fd367cac3d8096f19bc080a779cf81fd0bcbc5bd1396ace7",
2727
}
2828

2929
CRI_TOOLS_VERSION = "1.19.0"

cluster/gce/config-common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config"
142142
# CNI storage path for Windows nodes
143143
export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release"
144144
# CNI version for Windows nodes
145-
export WINDOWS_CNI_VERSION="v0.8.6"
145+
export WINDOWS_CNI_VERSION="v0.8.7"
146146
# Pod manifests directory for Windows nodes on Windows nodes.
147147
export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests"
148148
# 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="v0.8.6"
28-
DEFAULT_CNI_SHA1="a31251105250279fe57b4474d91d2db1d4d48b5a"
27+
DEFAULT_CNI_VERSION="v0.8.7"
28+
DEFAULT_CNI_SHA1="96a30cb67e33da95fb1d99f93dd787c2a3c08627"
2929
DEFAULT_NPD_VERSION="v0.8.0"
3030
DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f"
3131
DEFAULT_CRICTL_VERSION="v1.19.0"

test/e2e_node/remote/utils.go

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

2929
const (
30-
cniVersion = "v0.8.6"
30+
cniVersion = "v0.8.7"
3131
cniArch = "amd64"
3232
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
3333
cniConfDirectory = "cni/net.d"

0 commit comments

Comments
 (0)