From df00b1d69dee053038d1f8bd1ae71332a9cf4a84 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 18 Feb 2021 09:28:34 +0100
Subject: [PATCH] Minor update to cilium and calico

(cherry picked from commit de46f86137b978248b377c15038363bb35677d90)
---
 README.md                        |  6 +++---
 roles/download/defaults/main.yml | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2fbfb50bb..4e970d19a 100644
--- a/README.md
+++ b/README.md
@@ -123,11 +123,11 @@ Note: Upstart/SysV init based OS types are not supported.
   - [cri-o](http://cri-o.io/) v1.19 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
   - [cni-plugins](https://github.com/containernetworking/plugins) v0.9.0
-  - [calico](https://github.com/projectcalico/calico) v3.16.6
+  - [calico](https://github.com/projectcalico/calico) v3.16.8
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
-  - [cilium](https://github.com/cilium/cilium) v1.8.6
+  - [cilium](https://github.com/cilium/cilium) v1.8.7
   - [flanneld](https://github.com/coreos/flannel) v0.13.0
-  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.5.2
+  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.6.0
   - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.1.1
   - [multus](https://github.com/intel/multus-cni) v3.6.0
   - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 2ec9dbfe2..38657618f 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -64,7 +64,7 @@ quay_image_repo: "quay.io"
 
 # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v3.16.6"
+calico_version: "v3.16.8"
 calico_ctl_version: "{{ calico_version }}"
 calico_cni_version: "{{ calico_version }}"
 calico_policy_version: "{{ calico_version }}"
@@ -77,7 +77,7 @@ cni_version: "v0.9.0"
 
 weave_version: 2.7.0
 pod_infra_version: "3.3"
-cilium_version: "v1.8.6"
+cilium_version: "v1.8.7"
 kube_ovn_version: "v1.6.0"
 kube_router_version: "v1.1.1"
 multus_version: "v3.6"
@@ -410,13 +410,13 @@ cni_binary_checksums:
   amd64: 58a58d389895ba9f9bbd3ef330f186c0bb7484136d0bfb9b50152eed55d9ec24
 calicoctl_binary_checksums:
   arm:
-    v3.16.6: 0
+    v3.16.8: 0
     v3.15.2: 0
   amd64:
-    v3.16.6: 9b82230446d4749a1043dddd8d466d275a460e570a412e6ced003368ab9c72d8
+    v3.16.8: fceadd5058de5c9e9ec5b22b27daefb66aee8bc52c069715a1c82ab13f04973e
     v3.15.2: 219ae954501cbe15daeda0ad52e13ec65f99c77548c7d3cbfc4ced5c7149fdf1
   arm64:
-    v3.16.6: 4dd0548390a4ff7c6264c967da80498d10612dbd86f6d1ed4e5503352cdf947b
+    v3.16.8: 3d6569c54dbe1f1d2220824aaedb10e87631808ca3153eed3d2475d03bd81661
     v3.15.2: 49165f9e4ad55402248b578310fcf68a57363f54e66be04ac24be9714899b4d5
 
 helm_archive_checksums: