C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add default routing to canal and disable bird checks (#4468)

Browse source 
Co-Author: Paweł Skrzyński
This commit is contained in:
Maxime Guyot 2019-04-09 11:45:07 +02:00 committed by Kubernetes Prow Robot
parent 4d39c1856e
commit b15f3e182d
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/network_plugin/canal/templates/canal-node.yaml.j2
View file

@ -263,7 +263,6 @@ spec:
exec: exec:
command: command:
- /bin/calico-node - /bin/calico-node
- -bird-ready
- -felix-ready - -felix-ready
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10

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

@ -6,6 +6,7 @@
"type": "flannel", "type": "flannel",
"delegate": { "delegate": {
"type": "calico", "type": "calico",
"include_default_routes": true,
"etcd_endpoints": "{{ etcd_access_addresses }}", "etcd_endpoints": "{{ etcd_access_addresses }}",
"etcd_key_file": "{{ canal_cert_dir }}/key.pem", "etcd_key_file": "{{ canal_cert_dir }}/key.pem",
"etcd_cert_file": "{{ canal_cert_dir }}/cert.crt", "etcd_cert_file": "{{ canal_cert_dir }}/cert.crt",