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

Update CNI plugins v0.9.1

build/dependencies.yaml

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

cluster/gce/config-common.sh

@@ -142,7 +142,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="v0.8.7"
+export WINDOWS_CNI_VERSION="v0.9.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.

cluster/gce/gci/configure.sh

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

test/e2e_node/remote/utils.go

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