fix: add ipv6 support in cri-dockerd (#3125)

Signed-off-by: redscholar <blacktiledhouse@gmail.com>

Author: redscholar

builtin/core/roles/cni/defaults/main.yaml

@@ -4,7 +4,7 @@ Documentation=https://docs.mirantis.com
 
 [Service]
 Type=notify
-ExecStart=/usr/local/bin/cri-dockerd --pod-infra-container-image "{{ .kubernetes.sandbox_image.registry }}/{{ .kubernetes.sandbox_image.repository }}:{{ .kubernetes.sandbox_image.tag }}"
+ExecStart=/usr/local/bin/cri-dockerd --pod-infra-container-image "{{ .kubernetes.sandbox_image.registry }}/{{ .kubernetes.sandbox_image.repository }}:{{ .kubernetes.sandbox_image.tag }}"{{if .cni.ipv6_support }} --ipv6-dual-stack{{ end }}
 ExecReload=/bin/kill -s HUP $MAINPID
 TimeoutSec=0
 RestartSec=2

builtin/core/roles/cri/docker/templates/cri-dockerd.service

@@ -10,6 +10,22 @@ cni:
   ipv6_mask_size: 64
   # The complete Service IP pool for the cluster. Supports IPv4, IPv6, and dual-stack.
   service_cidr: 10.233.0.0/18
+  # In Kubernetes, Pod CIDR supports IPv4, IPv6, and dual-stack. Specify as:
+  # "Single-stack IPv4": pod_cidr in "ipv4" format
+  # "Single-stack IPv6": pod_cidr in "ipv6" format
+  # "Dual-stack": pod_cidr in "ipv4,ipv6" format
+  ipv4_support: >-
+    {{ eq (.cni.pod_cidr | splitList "," | first | ipFamily) "IPv4" }}
+  ipv4_pods_cidr: >-
+    {{- if eq (.cni.pod_cidr | splitList "," | first | ipFamily) "IPv4" -}}
+    {{ .cni.pod_cidr | splitList "," | first }}
+    {{- end -}}
+  ipv6_support: >-
+    {{- eq (.cni.pod_cidr | default "10.233.64.0/18" | splitList "," | last | ipFamily) "IPv6" }}
+  ipv6_pods_cidr: >-
+    {{- if eq (.cni.pod_cidr | default "10.233.64.0/18" | splitList "," | last | ipFamily) "IPv6" -}}
+    {{ .cni.pod_cidr | default "10.233.64.0/18" | splitList "," | last }}
+    {{- end -}}
 
   # Multi-CNI type. Supported: multus, none.
   multi_cni: "none"

builtin/core/roles/defaults/defaults/main/04-cni.yaml

@@ -23,7 +23,7 @@ etcd:
       - {{ printf "https://%s:%d" $internalIPv4 $.etcd.port }}
         {{- end }}
         {{- if $internalIPv6 | empty | not }}
-      - https://{{ printf "https://[%s]:%d" $internalIPv6 $.etcd.port }}
+      - {{ printf "https://[%s]:%d" $internalIPv6 $.etcd.port }}
         {{- end }}
       {{- end }}
     {{- end }}

builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta3

@@ -24,7 +24,7 @@ etcd:
       - {{ printf "https://%s:%d" $internalIPv4 $.etcd.port }}
         {{- end }}
         {{- if $internalIPv6 | empty | not }}
-      - https://{{ printf "https://[%s]:%d" $internalIPv6 $.etcd.port }}
+      - {{ printf "https://[%s]:%d" $internalIPv6 $.etcd.port }}
         {{- end }}
       {{- end }}
     {{- end }}