Browse Source
Calico: use --allow-version-mismatch in calicoctl.sh to allow upgrades (#7873)
pull/7897/head
Cristian Calin
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
roles/network_plugin/calico/templates/calicoctl.etcd.sh.j2
-
roles/network_plugin/calico/templates/calicoctl.kdd.sh.j2
|
|
|
@ -3,4 +3,4 @@ ETCD_ENDPOINTS={{ etcd_access_addresses }} \ |
|
|
|
ETCD_CA_CERT_FILE={{ calico_cert_dir }}/ca_cert.crt \ |
|
|
|
ETCD_CERT_FILE={{ calico_cert_dir }}/cert.crt \ |
|
|
|
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 %} "$@" |
|
|
|
@ -5,4 +5,4 @@ KUBECONFIG=/etc/kubernetes/admin.conf \ |
|
|
|
{% else %} |
|
|
|
KUBECONFIG=/etc/cni/net.d/calico-kubeconfig \ |
|
|
|
{% endif %} |
|
|
|
{{ bin_dir }}/calicoctl "$@" |
|
|
|
{{ bin_dir }}/calicoctl {% if calico_version is version('v3.20.0', '>=') %}--allow-version-mismatch{% endif %} "$@" |
