From 8df2c0a7c64a761b191ab15fc3aa606829dacecd Mon Sep 17 00:00:00 2001
From: Florent Monbillard <f.monbillard@gmail.com>
Date: Thu, 12 Mar 2020 10:22:38 -0400
Subject: [PATCH] Upgrade CNI plugins to 0.8.5 (#5717)

---
 README.md                        | 2 +-
 roles/download/defaults/main.yml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9fcf47a3c..d645176be 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ Note: Upstart/SysV init based OS types are not supported.
   - [containerd](https://containerd.io/) v1.2.13
   - [cri-o](http://cri-o.io/) v1.14.0 (experimental: see [CRI-O Note](docs/cri-o.md). Only on centos based OS)
 - Network Plugin
-  - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.1
+  - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.5
   - [calico](https://github.com/projectcalico/calico) v3.11.1
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
   - [cilium](https://github.com/cilium/cilium) v1.5.5
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 321798862..a1079964b 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -75,7 +75,7 @@ typha_enabled: false
 flannel_version: "v0.11.0"
 flannel_cni_version: "v0.3.0"
 
-cni_version: "v0.8.3"
+cni_version: "v0.8.5"
 
 weave_version: 2.5.2
 pod_infra_version: 3.1
@@ -313,9 +313,9 @@ etcd_binary_checksums:
   arm64: 170b848ac1a071fe7d495d404a868a2c0090750b2944f8a260ef1c6125b2b4f4
   amd64: dc5d82df095dae0a2970e4d870b6929590689dd707ae3d33e7b86da0f7f211b6
 cni_binary_checksums:
-  arm: 6094887394e0f10cfb538a0a052bc94a89a88b77af2e438b66e2c0bee26b52ee
-  arm64: aa931e78f08f00edd01f8b5ea2c9402cbf3877d91f9fbe9c132c05430cc7a493
-  amd64: 29a092bef9cb6f26c8d5340f3d56567b62c7ebdb1321245d94b1842c80ba20ba
+  arm: 86a868234045837cb3f5d58a0a4468ff42845d50b5e87bd128f050ef393d7495
+  arm64: a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce
+  amd64: bd682ffcf701e8f83283cdff7281aad0c83b02a56084d6e601216210732833f9
 calicoctl_binary_checksums:
   arm:
     v3.11.1: 0