From b692502a9d55105ca412eb4f619b74b41fa01225 Mon Sep 17 00:00:00 2001
From: Stephen Augustus <saugustus@vmware.com>
Date: Fri, 22 May 2020 17:48:56 -0400
Subject: [PATCH] Update CNI to v0.8.6

Signed-off-by: Stephen Augustus <saugustus@vmware.com>
---
 build/dependencies.yaml       |  2 +-
 build/workspace.bzl           | 12 ++++++------
 cluster/gce/config-common.sh  |  2 +-
 cluster/gce/gci/configure.sh  |  4 ++--
 test/e2e_node/remote/utils.go |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 44d789d011b..fc0f57ba04d 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -1,6 +1,6 @@
 dependencies:
   - name: "cni"
-    version: 0.8.5
+    version: 0.8.6
     refPaths:
     - path: build/workspace.bzl
       match: CNI_VERSION =
diff --git a/build/workspace.bzl b/build/workspace.bzl
index 020098cecbe..769c8ef4fd6 100644
--- a/build/workspace.bzl
+++ b/build/workspace.bzl
@@ -17,13 +17,13 @@ load("//build:workspace_mirror.bzl", "mirror")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("@io_bazel_rules_docker//container:container.bzl", "container_pull")
 
-CNI_VERSION = "0.8.5"
+CNI_VERSION = "0.8.6"
 _CNI_TARBALL_ARCH_SHA256 = {
-    "amd64": "bd682ffcf701e8f83283cdff7281aad0c83b02a56084d6e601216210732833f9",
-    "arm": "86a868234045837cb3f5d58a0a4468ff42845d50b5e87bd128f050ef393d7495",
-    "arm64": "a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce",
-    "ppc64le": "a26cc3734f7cb980ab8fb3aaa64ccf2d67291478130009fa9542355fbdd94aa5",
-    "s390x": "033ea910a83144609083d5c3fb62bf4a379b0b17729a1a9e829feed9fa7a9d97",
+    "amd64": "994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5",
+    "arm": "28e61b5847265135dc1ca397bf94322ecce4acab5c79cc7d360ca3f6a655bdb7",
+    "arm64": "43fbf750c5eccb10accffeeb092693c32b236fb25d919cf058c91a677822c999",
+    "ppc64le": "61d6c6c15d3e4fa3eb85d128c9c0ff2658f38e59047ae359be47d193c673e116",
+    "s390x": "ca126a3bd2cd8dff1c7bbfc3c69933b284c4e77614391c7e1f74b0851fc3b289",
 }
 
 CRI_TOOLS_VERSION = "1.17.0"
diff --git a/cluster/gce/config-common.sh b/cluster/gce/config-common.sh
index 9f9b402f955..80f6a687464 100644
--- a/cluster/gce/config-common.sh
+++ b/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.5"
+export WINDOWS_CNI_VERSION="v0.8.6"
 # 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.
diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh
index ac25504bd4c..31406c9a181 100644
--- a/cluster/gce/gci/configure.sh
+++ b/cluster/gce/gci/configure.sh
@@ -24,8 +24,8 @@ set -o nounset
 set -o pipefail
 
 ### Hardcoded constants
-DEFAULT_CNI_VERSION="v0.8.5"
-DEFAULT_CNI_SHA1="677d218b62c0ef941c1d0b606d6570faa5277ffd"
+DEFAULT_CNI_VERSION="v0.8.6"
+DEFAULT_CNI_SHA1="a31251105250279fe57b4474d91d2db1d4d48b5a"
 DEFAULT_NPD_VERSION="v0.8.0"
 DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f"
 DEFAULT_CRICTL_VERSION="v1.17.0"
diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go
index 8d62c3ef38b..78c3afa5c14 100644
--- a/test/e2e_node/remote/utils.go
+++ b/test/e2e_node/remote/utils.go
@@ -27,7 +27,7 @@ import (
 // utils.go contains functions used across test suites.
 
 const (
-	cniVersion       = "v0.8.5"
+	cniVersion       = "v0.8.6"
 	cniArch          = "amd64"
 	cniDirectory     = "cni/bin" // The CNI tarball places binaries under directory under "cni/bin".
 	cniConfDirectory = "cni/net.d"