actualized for kubespray version 2.28.0

2025-06-15 20:25:45 +03:00
parent c819d4f51f
commit c2df2abc78
366 changed files with 9939 additions and 40388 deletions
--- a/kubespray/project/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/kubespray/project/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -30,12 +30,14 @@ data:
    }
  net-conf.json: |
    {
+{% if ipv4_stack %}
      "Network": "{{ kube_pods_subnet }}",
      "EnableIPv4": true,
-{%   if enable_dual_stack_networks %}
+{% endif %}
+{% if ipv6_stack %}
      "EnableIPv6": true,
      "IPv6Network": "{{ kube_pods_subnet_ipv6 }}",
-{%   endif %}
+{% endif %}
      "Backend": {
        "Type": "{{ flannel_backend_type }}"{% if flannel_backend_type == "vxlan" %},
        "VNI": {{ flannel_vxlan_vni }},