External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-19 20:20:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update calico to 3.16.1 (#6644)

Browse Source
This commit is contained in:
Florian Ruynat
2020-09-10 12:45:46 +02:00
committed by GitHub
parent 34ff39e654
commit ae5328c500
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/network_plugin/calico/templates/calico-node.yml.j2
View File

@@ -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: ["/install-cni.sh"]
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME
@@ -97,7 +97,7 @@ spec:
{% if calico_version is version('v3.3.0', '>=') and calico_version is version('v3.4.0', '<') %}
- name: install-cni
image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }}
command: ["/install-cni.sh"]
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME

1
roles/network_plugin/calico/templates/cni-calico.conflist.j2
View File

@@ -15,6 +15,7 @@
{% endif %}
"type": "calico",
"log_level": "info",
"log_file_path": "/var/log/calico/cni/cni.log",
{% if calico_datastore == "etcd" %}
"etcd_endpoints": "{{ etcd_access_addresses }}",
"etcd_cert_file": "{{ calico_cert_dir }}/cert.crt",

4
roles/network_plugin/canal/templates/canal-node.yaml.j2
View File

@@ -59,7 +59,7 @@ spec:
# and CNI network config file on each node.
- name: install-cni
image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }}
command: ["/install-cni.sh"]
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME
@@ -83,7 +83,7 @@ spec:
{% if calico_version is version('v3.3.0', '>=') and calico_version is version('v3.4.0', '<') %}
- name: install-cni
image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }}
command: ["/install-cni.sh"]
command: ["/opt/cni/bin/install"]
env:
# Name of the CNI config file to create.
- name: CNI_CONF_NAME

1
roles/network_plugin/canal/templates/cni-canal.conflist.j2
View File

@@ -12,6 +12,7 @@
"etcd_cert_file": "{{ canal_cert_dir }}/cert.crt",
"etcd_ca_cert_file": "{{ canal_cert_dir }}/ca_cert.crt",
"log_level": "info",
"log_file_path": "/var/log/calico/cni/cni.log",
"policy": {
"type": "k8s"
},