From f2c8b393e1059d1fcb19d40b561ccae2ad576cde Mon Sep 17 00:00:00 2001
From: Hugo Blom <bl0m1@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:38:17 +0200
Subject: [PATCH] Upgrade calico to 3.14.1 (#6219)
* upgrade calico to 3.14.1
* add checksums for calico 3.14.1 and update readme
---
README.md | 2 +-
roles/download/defaults/main.yml | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 7cea60677..ee90fa45f 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ 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.14.0
+ - [calico](https://github.com/projectcalico/calico) v3.14.1
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- [cilium](https://github.com/cilium/cilium) v1.7.4
- [contiv](https://github.com/contiv/install) v1.2.1
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 9b761975f..2890ffe86 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -68,11 +68,11 @@ alauda_image_repo: "index.alauda.cn"
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
-calico_version: "v3.14.0"
-calico_ctl_version: "v3.14.0"
-calico_cni_version: "v3.14.0"
-calico_policy_version: "v3.14.0"
-calico_typha_version: "v3.14.0"
+calico_version: "v3.14.1"
+calico_ctl_version: "v3.14.1"
+calico_cni_version: "v3.14.1"
+calico_policy_version: "v3.14.1"
+calico_typha_version: "v3.14.1"
typha_enabled: false
flannel_version: "v0.12.0"
@@ -335,14 +335,17 @@ cni_binary_checksums:
amd64: 994fbfcdbb2eedcfa87e48d8edb9bb365f4e2747a7e47658482556c12fd9b2f5
calicoctl_binary_checksums:
arm:
+ v3.14.1: 0
v3.14.0: 0
v3.13.3: 0
v3.11.1: 0
amd64:
+ v3.14.1: 5fe8a7b00a45cf48879eff42b08dcdb85cf0121f3720ac8cbd06566aaa385667
v3.14.0: 4e38c7e81653faf3659b0afddabde4dff736bb1b4cc59ebe238907a9641816a7
v3.13.3: 570539d436df51bb349bb1a8c6b200a3a6f20803a9d391aa2c5cf19a70a083d4
v3.11.1: 045fdbfdb30789194c499ba17c8eac6d1704fe20d05e3c10027eb570767386db
arm64:
+ v3.14.1: 326da28cb726988029f70fbf3d4de424a4edd9949fd435fad81f2203c93e4c36
v3.14.0: 14272da8dbb82c0f823fbb50a88d4815513dfafa20a7e33f635a8068ae5b2db6
v3.13.3: 0c47acd6d200ba1f8348b389cd7a54771542158fef657afc633a30ddad97e272
v3.11.1: 770e0fce9acf1927726d64a885f8350d44a3fcbf248017d0aceec58bd41fa1b8
--
GitLab