github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102328 from lentzi90/update-cni-plugins

Browse Source 
Update CNI plugins v0.9.1
This commit is contained in:
Kubernetes Prow Robot 2021-05-28 10:16:46 -07:00 committed by GitHub
commit bc8acbc43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -34,7 +34,7 @@ dependencies:
# CNI plugins # CNI plugins
- name: "cni" - name: "cni"
version: 0.8.7 version: 0.9.1
refPaths: refPaths:
- path: cluster/gce/gci/configure.sh - path: cluster/gce/gci/configure.sh
match: DEFAULT_CNI_VERSION= match: DEFAULT_CNI_VERSION=

2
cluster/gce/config-common.sh
View File

@ -142,7 +142,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config"
# CNI storage path for Windows nodes # CNI storage path for Windows nodes
export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release" export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release"
# CNI version for Windows nodes # CNI version for Windows nodes
export WINDOWS_CNI_VERSION="v0.8.7" export WINDOWS_CNI_VERSION="v0.9.1"
# Pod manifests directory for Windows nodes on Windows nodes. # Pod manifests directory for Windows nodes on Windows nodes.
export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests" export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests"
# Directory where cert/key files will be stores on Windows nodes. # Directory where cert/key files will be stores on Windows nodes.

4
cluster/gce/gci/configure.sh
View File

@ -24,8 +24,8 @@ set -o nounset
set -o pipefail set -o pipefail
### Hardcoded constants ### Hardcoded constants
DEFAULT_CNI_VERSION='v0.8.7' DEFAULT_CNI_VERSION='v0.9.1'
DEFAULT_CNI_HASH='8f2cbee3b5f94d59f919054dccfe99a8e3db5473b553d91da8af4763e811138533e05df4dbeab16b3f774852b4184a7994968f5e036a3f531ad1ac4620d10ede' DEFAULT_CNI_HASH='b5a59660053a5f1a33b5dd5624d9ed61864482d9dc8e5b79c9b3afc3d6f62c9830e1c30f9ccba6ee76f5fb1ff0504e58984420cc0680b26cb643f1cb07afbd1c'
DEFAULT_NPD_VERSION='v0.8.7' DEFAULT_NPD_VERSION='v0.8.7'
DEFAULT_NPD_HASH='853576423077bf72e7bd8e96cd782cf272f7391379f8121650c1448531c0d3a0991dfbd0784a1157423976026806ceb14ca8fb35bac1249127dbf00af45b7eea' DEFAULT_NPD_HASH='853576423077bf72e7bd8e96cd782cf272f7391379f8121650c1448531c0d3a0991dfbd0784a1157423976026806ceb14ca8fb35bac1249127dbf00af45b7eea'
DEFAULT_CRICTL_VERSION='v1.21.0' DEFAULT_CRICTL_VERSION='v1.21.0'

2
test/e2e_node/remote/utils.go
View File

@ -26,7 +26,7 @@ import (
// utils.go contains functions used across test suites. // utils.go contains functions used across test suites.
const ( const (
cniVersion = "v0.8.7" cniVersion = "v0.9.1"
cniArch = "amd64" cniArch = "amd64"
cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin". cniDirectory = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
cniConfDirectory = "cni/net.d" cniConfDirectory = "cni/net.d"