From 081a9e7bd87796145499feb416c9d1c486c80dd6 Mon Sep 17 00:00:00 2001
From: emiran-orange <71817149+emiran-orange@users.noreply.github.com>
Date: Fri, 25 Sep 2020 15:15:11 +0200
Subject: [PATCH] /opt/cni/bin/install not before calico 3.16 (#6738)

---
 roles/network_plugin/calico/templates/calico-node.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index 8070d7747..056f26dd4 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -63,7 +63,7 @@ spec:
         # and CNI network config file on each node.
         - name: install-cni
           image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }}
-          command: ["/opt/cni/bin/install"]
+          command: ["{{ (calico_version is version('v3.16.0', '<'))|ternary('/install-cni.sh','/opt/cni/bin/install') }}"]
           env:
             # Name of the CNI config file to create.
             - name: CNI_CONF_NAME