From 002a4b03a4dbada15ead8a58077eb5b5903c4603 Mon Sep 17 00:00:00 2001
From: Cristian Calin <6627509+cristicalin@users.noreply.github.com>
Date: Sat, 24 Apr 2021 09:43:14 +0300
Subject: [PATCH] Drop calico 3.15 (#7545)

* calico: drop support for version 3.15

* drop check for calico version >= 3.3, we are at 3.16 minimum now

* we moved to calico 3.16+ so we can default to /opt/cni/bin/install
---
 roles/download/defaults/main.yml                         | 4 ----
 roles/network_plugin/calico/tasks/install.yml            | 1 -
 roles/network_plugin/calico/templates/calico-node.yml.j2 | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 3ac125b0c..62673f8c7 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -321,22 +321,18 @@ calicoctl_binary_checksums:
     v3.18.1: 0
     v3.17.3: 0
     v3.16.9: 0
-    v3.15.2: 0
   amd64:
     v3.18.1: 29d0dc67458c1fb8950b5c157de41045d4f502eb80791d7858c7a6252c2390c1
     v3.17.3: c9ce1358694c251ef5f4d65e60255dc8d1376bb13c73a42a61085a2dc435465b
     v3.16.9: 3858748e3446f24f6176ef4125fa58bb6f934f6e838cf92f60eafee6aa8117e5
-    v3.15.2: 219ae954501cbe15daeda0ad52e13ec65f99c77548c7d3cbfc4ced5c7149fdf1
   arm64:
     v3.18.1: 2ba81451db3ef49708e2344f318fe60662bd344f91fd1a85ce1c5e8cffa830fb
     v3.17.3: 773288bb8d4580bd7a248e05bdd7140693a4ab3c29b1930f02c2e77189356034
     v3.16.9: beac9a1ac66fbed05000901aa883443397f05e0f6ffe10ceeccf89f427edc8ad
-    v3.15.2: 49165f9e4ad55402248b578310fcf68a57363f54e66be04ac24be9714899b4d5
 calico_crds_archive_checksums:
   v3.18.1: 4702a887db9014d1c208a4969e1a72e38803d757c2656d3e64376b96e4897556
   v3.17.3: ce3c74e20af86912e3116dcd995667b636178b091b0f890060eab4e9a4d50bd7
   v3.16.9: cc33648e3fffd973c8780f49589b1ecf57487f8693cfd12a335dcd2a606784c0
-  v3.15.2: 82e7122ec04a89c89861b8377c39ae357c7cdbbf60b5f0f1b8fc18ba6bda7dc2
 
 helm_archive_checksums:
   arm:
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index fd4926266..753f66bb2 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -179,7 +179,6 @@
   when:
     - inventory_hostname == groups['kube_control_plane'][0]
     - calico_conf_ipv6.stdout is defined and calico_conf_ipv6.stdout == "0"
-    - calico_version is version("v3.3.0", ">=")
     - enable_dual_stack_networks | bool
 
 - name: Populate Service External IPs
diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index 46367deb3..bcf92e46d 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -64,7 +64,7 @@ spec:
         # and CNI network config file on each node.
         - name: install-cni
           image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }}
-          command: ["{{ (calico_version is version('v3.16.0', '<'))|ternary('/install-cni.sh','/opt/cni/bin/install') }}"]
+          command: ["/opt/cni/bin/install"]
           env:
             # Name of the CNI config file to create.
             - name: CNI_CONF_NAME