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 部署失败

pull/968/head
aohan.yang 2020-12-22 17:40:24 +08:00 committed by jmgao
parent 3ba59a3374
commit 576eabc086
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

6
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,8 +347,10 @@ spec:
exec:
command:
- /bin/calico-node
- -bird-ready
- -felix-ready
{% if CALICO_NETWORKING_BACKEND == "brid" %}
- -bird-ready
{% endif %}
periodSeconds: 10
volumeMounts:
- mountPath: /lib/modules