fix dual stack cluster created by kind

kubeovn · Aug 13, 2021 · 5e9e41a · 5e9e41a
1 parent bdfe708
commit 5e9e41a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -116,7 +116,7 @@ kind-init-ipv6:
 .PHONY: kind-init-dual
 kind-init-dual:
 	kind delete cluster --name=kube-ovn
-	kube_proxy_mode=iptables ip_family=DualStack ha=false single=false j2 yamls/kind.yaml.j2 -o yamls/kind.yaml
+	kube_proxy_mode=iptables ip_family=dual ha=false single=false j2 yamls/kind.yaml.j2 -o yamls/kind.yaml
 	kind create cluster --config yamls/kind.yaml --name kube-ovn
 	kubectl describe no
 	docker exec kube-ovn-worker sysctl -w net.ipv6.conf.all.disable_ipv6=0

diff --git a/yamls/kind.yaml.j2 b/yamls/kind.yaml.j2
@@ -1,3 +1,7 @@
+{% set nodeTag = "v1.19.11" -%}
+{% if ip_family is equalto "dual" -%}
+  {% set nodeTag = "v1.21.2" -%}
+{% endif -%}
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 networking:
@@ -16,15 +20,15 @@ kubeadmConfigPatches:
 
 nodes:
   - role: control-plane
-    image: kindest/node:v1.19.11
+    image: kindest/node:{{ nodeTag }}
   {%- if ha is equalto "true" %}
   - role: control-plane
-    image: kindest/node:v1.19.11
+    image: kindest/node:{{ nodeTag }}
   - role: control-plane
-    image: kindest/node:v1.19.11
+    image: kindest/node:{{ nodeTag }}
   {%- elif single is equalto "true" %}
 
   {%- else %}
   - role: worker
-    image: kindest/node:v1.19.11
+    image: kindest/node:{{ nodeTag }}
   {%- endif %}