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

fix typo: #1273

pull/1282/head
gjmzj 2023-05-16 18:10:14 +08:00
parent b8b88fdb92
commit 59d214690e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/config.yml
View File

@ -123,8 +123,8 @@ CALICO_IPV4POOL_IPIP: "Always"
# [calico]设置 calico-node使用的host IP，bgp邻居通过该地址建立，可手工指定也可以自动发现 # [calico]设置 calico-node使用的host IP，bgp邻居通过该地址建立，可手工指定也可以自动发现
IP_AUTODETECTION_METHOD: "can-reach={{ groups['kube_master'][0] }}" IP_AUTODETECTION_METHOD: "can-reach={{ groups['kube_master'][0] }}"
# [calico]设置calico 网络 backend: brid, vxlan, none # [calico]设置calico 网络 backend: bird, vxlan, none
CALICO_NETWORKING_BACKEND: "brid" CALICO_NETWORKING_BACKEND: "bird"
# [calico]设置calico 是否使用route reflectors # [calico]设置calico 是否使用route reflectors
# 如果集群规模超过50个节点，建议启用该特性 # 如果集群规模超过50个节点，建议启用该特性

6
roles/calico/templates/calico-v3.19.yaml.j2
View File

@ -316,7 +316,7 @@ spec:
- name: IP_AUTODETECTION_METHOD - name: IP_AUTODETECTION_METHOD
value: "{{ IP_AUTODETECTION_METHOD }}" value: "{{ IP_AUTODETECTION_METHOD }}"
# Enable IPIP # Enable IPIP
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{ CALICO_IPV4POOL_IPIP }}" value: "{{ CALICO_IPV4POOL_IPIP }}"
{% endif %} {% endif %}
@ -378,7 +378,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-live - -felix-live
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-live - -bird-live
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10
@ -389,7 +389,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-ready - -felix-ready
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-ready - -bird-ready
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10

6
roles/calico/templates/calico-v3.23.yaml.j2
View File

@ -326,7 +326,7 @@ spec:
- name: IP_AUTODETECTION_METHOD - name: IP_AUTODETECTION_METHOD
value: "{{ IP_AUTODETECTION_METHOD }}" value: "{{ IP_AUTODETECTION_METHOD }}"
# Enable IPIP # Enable IPIP
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{ CALICO_IPV4POOL_IPIP }}" value: "{{ CALICO_IPV4POOL_IPIP }}"
{% endif %} {% endif %}
@ -393,7 +393,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-live - -felix-live
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-live - -bird-live
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10
@ -405,7 +405,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-ready - -felix-ready
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-ready - -bird-ready
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10

6
roles/calico/templates/calico-v3.24.yaml.j2
View File

@ -379,7 +379,7 @@ spec:
- name: IP_AUTODETECTION_METHOD - name: IP_AUTODETECTION_METHOD
value: "{{ IP_AUTODETECTION_METHOD }}" value: "{{ IP_AUTODETECTION_METHOD }}"
# Enable IPIP # Enable IPIP
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
value: "{{ CALICO_IPV4POOL_IPIP }}" value: "{{ CALICO_IPV4POOL_IPIP }}"
{% endif %} {% endif %}
@ -446,7 +446,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-live - -felix-live
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-live - -bird-live
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10
@ -458,7 +458,7 @@ spec:
command: command:
- /bin/calico-node - /bin/calico-node
- -felix-ready - -felix-ready
{% if CALICO_NETWORKING_BACKEND == "brid" %} {% if CALICO_NETWORKING_BACKEND == "bird" %}
- -bird-ready - -bird-ready
{% endif %} {% endif %}
periodSeconds: 10 periodSeconds: 10