easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复 calico 网络 backend 设置为 vxlan none 时，calico 部署失败 #959

pull/992/head
gjmzj 2021-01-18 10:07:05 +08:00
parent e97c65ce5f
commit 88bf729126
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/22.addnode.yml
View File

@ -17,6 +17,7 @@
copy: src={{ item }} dest=/opt/kube/images/
with_fileglob:
- "{{ base_dir }}/down/coredns*.tar"
- "{{ base_dir }}/down/k8s-dns-node-cache*.tar"
- "{{ base_dir }}/down/dashboard*.tar"
- "{{ base_dir }}/down/metrics-scraper*.tar"
- "{{ base_dir }}/down/metrics-server*.tar"

4
roles/calico/templates/calico-v3.15.yaml.j2
View File

@ -363,7 +363,9 @@ spec:
command:
- /bin/calico-node
- -felix-live
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-live
{% endif %}
periodSeconds: 10
initialDelaySeconds: 10
failureThreshold: 6
@ -372,7 +374,9 @@ spec:
command:
- /bin/calico-node
- -felix-ready
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-ready
{% endif %}
periodSeconds: 10
volumeMounts:
- mountPath: /lib/modules

2
roles/calico/templates/calico-v3.3.yaml.j2
View File

@ -206,7 +206,9 @@ spec:
exec:
command:
- /bin/calico-node
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-ready
{% endif %}
- -felix-ready
periodSeconds: 10
volumeMounts:

2
roles/calico/templates/calico-v3.4.yaml.j2
View File

@ -244,7 +244,9 @@ spec:
exec:
command:
- /bin/calico-node
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-ready
{% endif %}
- -felix-ready
periodSeconds: 10
volumeMounts:

4
roles/calico/templates/calico-v3.8.yaml.j2
View File

@ -337,7 +337,9 @@ spec:
command:
- /bin/calico-node
- -felix-live
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-live
{% endif %}
periodSeconds: 10
initialDelaySeconds: 10
failureThreshold: 6
@ -345,7 +347,9 @@ spec:
exec:
command:
- /bin/calico-node
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-ready
{% endif %}
- -felix-ready
periodSeconds: 10
volumeMounts: