/opt/cni/bin/install not before calico 3.16 (#6738)

2020-09-25 15:15:11 +02:00
parent 55d8ed093a
commit 081a9e7bd8
1 changed files with 1 additions and 1 deletions
--- 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