refact ip stack (#11953)

roles/network_plugin/calico/templates/calico-config.yml.j2

@@ -53,13 +53,15 @@ data:
               "type": "host-local",
               "subnet": "usePodCidr"
             },
-            {% else %}
+          {% else %}
             "ipam": {
               "type": "calico-ipam",
-              {%   if enable_dual_stack_networks %}
-              "assign_ipv6": "true",
-              {%   endif %}
-              "assign_ipv4": "true"
+            {% if ipv4_stack %}
+              "assign_ipv4": "true"{{ ',' if (ipv6_stack and ipv4_stack) }}
+            {% endif %}
+            {% if ipv6_stack %}
+              "assign_ipv6": "true"
+            {% endif %}
             },
           {% endif %}
           {% if calico_allow_ip_forwarding %}

roles/network_plugin/calico/templates/calico-node.yml.j2

@@ -265,7 +265,7 @@ spec:
             - name: CALICO_IPV4POOL_VXLAN
               value: "Never"
             - name: FELIX_IPV6SUPPORT
-              value: "{{ enable_dual_stack_networks | default(false) }}"
+              value: "{{ ipv6_stack | default(false) }}"
             # Set Felix logging to "info"
             - name: FELIX_LOGSEVERITYSCREEN
               value: "{{ calico_loglevel }}"
@@ -308,9 +308,18 @@ spec:
             - name: IP_AUTODETECTION_METHOD
               value: "can-reach=$(NODEIP)"
 {% endif %}
+{% if ipv4_stack %}
             - name: IP
               value: "autodetect"
-{% if calico_ip6_auto_method is defined and enable_dual_stack_networks %}
+{% else %}
+            - name: IP
+              value: none
+{% endif %}
+{% if ipv6_stack %}
+            - name: IP6
+              value: autodetect
+{% endif %}
+{% if calico_ip6_auto_method is defined and ipv6_stack %}
             - name: IP6_AUTODETECTION_METHOD
               value: "{{ calico_ip6_auto_method }}"
 {% endif %}
@@ -318,10 +327,6 @@ spec:
             - name: FELIX_MTUIFACEPATTERN
               value: "{{ calico_felix_mtu_iface_pattern }}"
 {% endif %}
-{% if enable_dual_stack_networks %}
-            - name: IP6
-              value: autodetect
-{% endif %}
 {% if calico_use_default_route_src_ipaddr | default(false) %}
             - name: FELIX_DEVICEROUTESOURCEADDRESS
               valueFrom: