From 50fc82acdc5c83f37055e46da5f7d78a465d60f1 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Wed, 22 Jul 2020 08:58:33 +0200
Subject: [PATCH] Minor update to Cilium and Calico (#6438)
---
README.md | 4 ++--
roles/download/defaults/main.yml | 13 +++++--------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index cb2bdbef4..31bd0b48d 100644
--- a/README.md
+++ b/README.md
@@ -122,9 +122,9 @@ Note: Upstart/SysV init based OS types are not supported.
- [cri-o](http://cri-o.io/) v1.17 (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.6
- - [calico](https://github.com/projectcalico/calico) v3.15.0
+ - [calico](https://github.com/projectcalico/calico) v3.15.1
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- - [cilium](https://github.com/cilium/cilium) v1.8.0
+ - [cilium](https://github.com/cilium/cilium) v1.8.1
- [contiv](https://github.com/contiv/install) v1.2.1
- [flanneld](https://github.com/coreos/flannel) v0.12.0
- [kube-ovn](https://github.com/alauda/kube-ovn) v1.2.1
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 5e152f27c..f908093a5 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.15.0"
+calico_version: "v3.15.1"
calico_ctl_version: "{{ calico_version }}"
calico_cni_version: "{{ calico_version }}"
calico_policy_version: "{{ calico_version }}"
@@ -79,7 +79,7 @@ cni_version: "v0.8.6"
weave_version: 2.6.5
pod_infra_version: "3.2"
contiv_version: 1.2.1
-cilium_version: "v1.8.0"
+cilium_version: "v1.8.1"
kube_ovn_version: "v1.2.1"
kube_router_version: "v1.0.0"
multus_version: "v3.4.2"
@@ -384,21 +384,18 @@ cni_binary_checksums:
amd64: 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5
calicoctl_binary_checksums:
arm:
- v3.15.0: 0
+ v3.15.1: 0
v3.14.1: 0
- v3.14.0: 0
v3.13.3: 0
v3.11.1: 0
amd64:
- v3.15.0: 4600d5d7f08ed9cf479fc8fa87518dbbca32a473d0a4a212cfecb610c18216aa
+ v3.15.1: 0aa333986e221e6fadb74fb3dbed327fe016790a8c09e0092c8b75d5f77a843a
v3.14.1: 5fe8a7b00a45cf48879eff42b08dcdb85cf0121f3720ac8cbd06566aaa385667
- v3.14.0: 4e38c7e81653faf3659b0afddabde4dff736bb1b4cc59ebe238907a9641816a7
v3.13.3: 570539d436df51bb349bb1a8c6b200a3a6f20803a9d391aa2c5cf19a70a083d4
v3.11.1: 045fdbfdb30789194c499ba17c8eac6d1704fe20d05e3c10027eb570767386db
arm64:
- v3.15.0: 9b3d000801987599bee58e0dc4906d5cde87dc9dc4c9b410097a9b1c19e916ba
+ v3.15.1: 275dc0fa6ce924cd1ff6c2011bb59a62a618350ef0d0549e65f7aa53058d2c57
v3.14.1: 326da28cb726988029f70fbf3d4de424a4edd9949fd435fad81f2203c93e4c36
- v3.14.0: 14272da8dbb82c0f823fbb50a88d4815513dfafa20a7e33f635a8068ae5b2db6
v3.13.3: 0c47acd6d200ba1f8348b389cd7a54771542158fef657afc633a30ddad97e272
v3.11.1: 770e0fce9acf1927726d64a885f8350d44a3fcbf248017d0aceec58bd41fa1b8
--
GitLab