From 227e96469cc94a4d2c850a396055fed3ce226efc Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 29 Oct 2020 15:14:59 +0100
Subject: [PATCH] Minor update Calico and Cilium (#6871)
---
README.md | 4 ++--
roles/download/defaults/main.yml | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index b1ade72d0..51c7bcb0c 100644
--- a/README.md
+++ b/README.md
@@ -123,9 +123,9 @@ 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.8.7
- - [calico](https://github.com/projectcalico/calico) v3.16.2
+ - [calico](https://github.com/projectcalico/calico) v3.16.4
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- - [cilium](https://github.com/cilium/cilium) v1.8.4
+ - [cilium](https://github.com/cilium/cilium) v1.8.5
- [contiv](https://github.com/contiv/install) v1.2.1
- [flanneld](https://github.com/coreos/flannel) v0.13.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.3.0
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 218b4c646..50fad23c2 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -65,7 +65,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.2"
+calico_version: "v3.16.4"
calico_ctl_version: "{{ calico_version }}"
calico_cni_version: "{{ calico_version }}"
calico_policy_version: "{{ calico_version }}"
@@ -79,7 +79,7 @@ cni_version: "v0.8.7"
weave_version: 2.7.0
pod_infra_version: "3.3"
contiv_version: 1.2.1
-cilium_version: "v1.8.4"
+cilium_version: "v1.8.5"
kube_ovn_version: "v1.3.0"
kube_router_version: "v1.1.0"
multus_version: "v3.6"
@@ -387,12 +387,15 @@ cni_binary_checksums:
amd64: 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8
calicoctl_binary_checksums:
arm:
+ v3.16.4: 0
v3.16.2: 0
v3.15.2: 0
amd64:
+ v3.16.4: a502749420e7424090a73644a8bdc1270c6ef679f8f1d33f753d48d60c930377
v3.16.2: 801b059a4fd0dac8795693026c69a79a00dd2353eff597cc36b79fcb6ec53a0a
v3.15.2: 219ae954501cbe15daeda0ad52e13ec65f99c77548c7d3cbfc4ced5c7149fdf1
arm64:
+ v3.16.4: 003f16a501e876af0da67324b7fed6ca72f5547c15bbe3b798a8eeb707056d43
v3.16.2: aa5695940ec8a36393725a5ce7b156f776fed8da38b994c0828d7f3a60e59bc6
v3.15.2: 49165f9e4ad55402248b578310fcf68a57363f54e66be04ac24be9714899b4d5
--
GitLab