From fb8662ec1937d075e8d9e1aa20bf46eddfd4af42 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Tue, 21 Sep 2021 03:40:23 +0300
Subject: [PATCH] Calico: update versions 3.20.1, 3.19.3 (#7984)

* make Calico 3.20.1 the default version
* drop Calico 3.17.x support
---
 README.md                                     |  2 +-
 roles/download/defaults/main.yml              | 22 ++++++++-----------
 roles/network_plugin/calico/tasks/install.yml |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b6674c66e..da9517408 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ Note: Upstart/SysV init based OS types are not supported.
   - [cri-o](http://cri-o.io/) v1.21 (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.1
-  - [calico](https://github.com/projectcalico/calico) v3.19.2
+  - [calico](https://github.com/projectcalico/calico) v3.20.1
   - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
   - [cilium](https://github.com/cilium/cilium) v1.9.10
   - [flanneld](https://github.com/flannel-io/flannel) v0.14.0
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index b585cab0e..bb04297fd 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -70,7 +70,7 @@ github_image_repo: "ghcr.io"
 
 # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v3.19.2"
+calico_version: "v3.20.1"
 calico_ctl_version: "{{ calico_version }}"
 calico_cni_version: "{{ calico_version }}"
 calico_flexvol_version: "{{ calico_version }}"
@@ -496,25 +496,21 @@ cni_binary_checksums:
   amd64: 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7
 calicoctl_binary_checksums:
   arm:
-    v3.20.0: 0
-    v3.19.2: 0
+    v3.20.1: 0
+    v3.19.3: 0
     v3.18.5: 0
-    v3.17.5: 0
   amd64:
-    v3.20.0: 5a1462e3d9c5bc3142b14788b5be427fae962863397a0176241afad02308f1a2
-    v3.19.2: 33d5fe72c4ad1a0300b4a8f8cc22a78a281379dc9b7140d7dc6db4e3a0637da8
+    v3.20.1: 2d9367f9ae81bb4bb677b991e2a558012e35a22607f32dd3898eab71f8f5a01c
+    v3.19.3: e9d91036764ec24f32025c3176efb2c2673b9936270e6165fb6583cce97bc43f
     v3.18.5: e5f810642c171dd80322529d1fda3eee6179010068d6c624ffad2c48311825ce
-    v3.17.5: aca1575872251dc7b5e0b9995055d6b5c8876584ffdd721a36ca4c830d26a313
   arm64:
-    v3.20.0: 9594125583723c9c631659ebfa00d76f66084a36af87eb08a388c1e614cfd741
-    v3.19.2: 2ff17ea293d7637bcd58838380f4782842788191da1932d67400228af3314a69
+    v3.20.1: 73dfe53573f4eaca73ff2f90bf546f8f2fad8825f80f81a1dc11d2fbd7acc14f
+    v3.19.3: ec3cfbd2dccbd614ac353be8c9abf8e336d8700fbd2b9b76da1c3c4c14a6dfe2
     v3.18.5: 2080b2cd8efb71df98dce8678edaba8fce9252801c4b8f987609a4f4d6ddb4e2
-    v3.17.5: 67f3e364b7d0467f8f63347d9f60d5649e65d4a2e606c30a531bad04a65e6ef4
 calico_crds_archive_checksums:
-  v3.20.0: e85db5eb747c6647bdc7bbf09ed2a0fcfe7db86a5ce8b8bb8a9fba054ffb8b46
-  v3.19.2: 2b5840530e10497f41901a1d5757feb3894fdfb3cad55e6d1352a370cd236ba3
+  v3.20.1: 9c4959783dfab3cae46d25c78c129238c72afab3f0b9714dce325a49f308a6e1
+  v3.19.3: 7066d0e6b0136920f82a75a5bd2d595e9f69bd3ab823403e920906569ec6be07
   v3.18.5: ed7065c5a90b71cf7b3b525d5107a4573bd051c3ff004a56ab6017c222b3e2d6
-  v3.17.5: 126dfbba4b90d72a19ccf61d9f2cbc31499cf98c95f12e2e5850e14b1e327741
 
 krew_archive_checksums:
   v0.4.1: a26deea175f70264260d59a4e061778a892f8a8e301ac261660dd7d24c551c99
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index 3b7e39c41..75a9e5eef 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -242,7 +242,7 @@
           "nodeToNodeMeshEnabled": {{ nodeToNodeMeshEnabled|default('true') }} ,
           {% if calico_advertise_cluster_ips|default(false) %}
           "serviceClusterIPs": [{"cidr": "{{ kube_service_addresses }}" } {{ ',{"cidr":"' + kube_service_addresses_ipv6 + '"}' if enable_dual_stack_networks else '' }}],{% endif %}
-          {% if calico_version is version('v3.18.0', '>') and calico_advertise_service_loadbalancer_ips|length > 0  %}"serviceLoadBalancerIPs": {{ _service_loadbalancer_ips }},{% endif %}
+          {% if calico_advertise_service_loadbalancer_ips|length > 0  %}"serviceLoadBalancerIPs": {{ _service_loadbalancer_ips }},{% endif %}
           "serviceExternalIPs": {{ _service_external_ips|default([]) }} }}
   changed_when: false
   when: