fix calico config error

easzlab · Feb 1, 2021 · f2924ad · f2924ad
1 parent ede9681
commit f2924ad
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/roles/calico/templates/calico-v3.15.yaml.j2 b/roles/calico/templates/calico-v3.15.yaml.j2
@@ -305,11 +305,15 @@ spec:
             - name: IP_AUTODETECTION_METHOD
               value: "{{ IP_AUTODETECTION_METHOD }}"
             # Enable IPIP
+{% if CALICO_NETWORKING_BACKEND == "brid" %}
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ CALICO_IPV4POOL_IPIP }}"
+{% endif %}
             # Enable or Disable VXLAN on the default IP pool.
+{% if CALICO_NETWORKING_BACKEND == "vxlan" %}
             - name: CALICO_IPV4POOL_VXLAN
               value: "Never"
+{% endif %}
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom:

diff --git a/roles/calico/templates/calico-v3.3.yaml.j2 b/roles/calico/templates/calico-v3.3.yaml.j2
@@ -156,8 +156,15 @@ spec:
             - name: IP_AUTODETECTION_METHOD
               value: "{{ IP_AUTODETECTION_METHOD }}"
             # Enable IPIP
+{% if CALICO_NETWORKING_BACKEND == "brid" %}
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ CALICO_IPV4POOL_IPIP }}"
+{% endif %}
+            # Enable or Disable VXLAN on the default IP pool.
+{% if CALICO_NETWORKING_BACKEND == "vxlan" %}
+            - name: CALICO_IPV4POOL_VXLAN
+              value: "Never"
+{% endif %}
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom:

diff --git a/roles/calico/templates/calico-v3.4.yaml.j2 b/roles/calico/templates/calico-v3.4.yaml.j2
@@ -194,8 +194,15 @@ spec:
             - name: IP_AUTODETECTION_METHOD
               value: "{{ IP_AUTODETECTION_METHOD }}"
             # Enable IPIP
+{% if CALICO_NETWORKING_BACKEND == "brid" %}
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ CALICO_IPV4POOL_IPIP }}"
+{% endif %}
+            # Enable or Disable VXLAN on the default IP pool.
+{% if CALICO_NETWORKING_BACKEND == "vxlan" %}
+            - name: CALICO_IPV4POOL_VXLAN
+              value: "Never"
+{% endif %}
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom:

diff --git a/roles/calico/templates/calico-v3.8.yaml.j2 b/roles/calico/templates/calico-v3.8.yaml.j2
@@ -294,8 +294,15 @@ spec:
             - name: IP_AUTODETECTION_METHOD
               value: "{{ IP_AUTODETECTION_METHOD }}"
             # Enable IPIP
+{% if CALICO_NETWORKING_BACKEND == "brid" %}
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ CALICO_IPV4POOL_IPIP }}"
+{% endif %}
+            # Enable or Disable VXLAN on the default IP pool.
+{% if CALICO_NETWORKING_BACKEND == "vxlan" %}
+            - name: CALICO_IPV4POOL_VXLAN
+              value: "Never"
+{% endif %}
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom: