kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Calico: use --allow-version-mismatch in calicoctl.sh to allow upgrades (#7873)

pull/7897/head
Cristian Calin 2021-08-21 00:30:48 +03:00 committed by GitHub
parent dfd35892f2
commit 0ac364dfae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/templates/calicoctl.etcd.sh.j2
View File

@ -3,4 +3,4 @@ ETCD_ENDPOINTS={{ etcd_access_addresses }} \
ETCD_CA_CERT_FILE={{ calico_cert_dir }}/ca_cert.crt \ ETCD_CA_CERT_FILE={{ calico_cert_dir }}/ca_cert.crt \
ETCD_CERT_FILE={{ calico_cert_dir }}/cert.crt \ ETCD_CERT_FILE={{ calico_cert_dir }}/cert.crt \
ETCD_KEY_FILE={{ calico_cert_dir }}/key.pem \ ETCD_KEY_FILE={{ calico_cert_dir }}/key.pem \
{{ bin_dir }}/calicoctl "$@" {{ bin_dir }}/calicoctl {% if calico_version is version('v3.20.0', '>=') %}--allow-version-mismatch{% endif %} "$@"

2
roles/network_plugin/calico/templates/calicoctl.kdd.sh.j2
View File

@ -5,4 +5,4 @@ KUBECONFIG=/etc/kubernetes/admin.conf \
{% else %} {% else %}
KUBECONFIG=/etc/cni/net.d/calico-kubeconfig \ KUBECONFIG=/etc/cni/net.d/calico-kubeconfig \
{% endif %} {% endif %}
{{ bin_dir }}/calicoctl "$@" {{ bin_dir }}/calicoctl {% if calico_version is version('v3.20.0', '>=') %}--allow-version-mismatch{% endif %} "$@"