fix wip

Signed-off-by: zhangzujian <[email protected]>

Author: zhangzujian

kind.mk

@@ -9,14 +9,14 @@ OS_LINUX = 1
 endif
 endif
 
-KIND_NETWORK_UNDERLAY = $(shell echo $${KIND_NETWORK_UNDERLAY:-kind})
-KIND_UNDERLAY_VAR_PREFIX = $(shell echo $(KIND_NETWORK_UNDERLAY) | tr '[:lower:]-' '[:upper:]_')
-KIND_UNDERLAY_IPV4_SUBNET = $(KIND_UNDERLAY_VAR_PREFIX)_IPV4_SUBNET
-KIND_UNDERLAY_IPV6_SUBNET = $(KIND_UNDERLAY_VAR_PREFIX)_IPV6_SUBNET
-KIND_UNDERLAY_IPV4_GATEWAY = $(KIND_UNDERLAY_VAR_PREFIX)_IPV4_GATEWAY
-KIND_UNDERLAY_IPV6_GATEWAY = $(KIND_UNDERLAY_VAR_PREFIX)_IPV6_GATEWAY
-KIND_UNDERLAY_IPV4_EXCLUDE_IPS = $(KIND_UNDERLAY_VAR_PREFIX)_IPV4_EXCLUDE_IPS
-KIND_UNDERLAY_IPV6_EXCLUDE_IPS = $(KIND_UNDERLAY_VAR_PREFIX)_IPV6_EXCLUDE_IPS
+DOCKER_NETWORK_UNDERLAY = $(shell echo $${DOCKER_NETWORK_UNDERLAY:-underlay})
+UNDERLAY_VAR_PREFIX = $(shell echo $(DOCKER_NETWORK_UNDERLAY) | tr '[:lower:]-' '[:upper:]_')
+UNDERLAY_IPV4_SUBNET = $(UNDERLAY_VAR_PREFIX)_IPV4_SUBNET
+UNDERLAY_IPV6_SUBNET = $(UNDERLAY_VAR_PREFIX)_IPV6_SUBNET
+UNDERLAY_IPV4_GATEWAY = $(UNDERLAY_VAR_PREFIX)_IPV4_GATEWAY
+UNDERLAY_IPV6_GATEWAY = $(UNDERLAY_VAR_PREFIX)_IPV6_GATEWAY
+UNDERLAY_IPV4_EXCLUDE_IPS = $(UNDERLAY_VAR_PREFIX)_IPV4_EXCLUDE_IPS
+UNDERLAY_IPV6_EXCLUDE_IPS = $(UNDERLAY_VAR_PREFIX)_IPV6_EXCLUDE_IPS
 
 KIND_VLAN_NIC = $(shell echo $${KIND_VLAN_NIC:-eth0})
 ifneq ($(KIND_NETWORK_UNDERLAY),kind)
@@ -391,9 +391,9 @@ kind-install-underlay-hairpin: kind-install-underlay-hairpin-ipv4
 .PHONY: kind-install-underlay-ipv4
 kind-install-underlay-ipv4: kind-disable-hairpin kind-load-image kind-untaint-control-plane
 	$(call docker_network_info,$(KIND_NETWORK_UNDERLAY))
-	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(KIND_UNDERLAY_IPV4_SUBNET))"@' \
-		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(KIND_UNDERLAY_IPV4_GATEWAY))"@' \
-		-e 's@^[[:space:]]*EXCLUDE_IPS=.*@EXCLUDE_IPS="$($(KIND_UNDERLAY_IPV4_EXCLUDE_IPS))"@' \
+	@sed -e 's@^[[:space:]]*POD_CIDR=.*@POD_CIDR="$($(UNDERLAY_IPV4_SUBNET))"@' \
+		-e 's@^[[:space:]]*POD_GATEWAY=.*@POD_GATEWAY="$($(UNDERLAY_IPV4_GATEWAY))"@' \
+		-e 's@^[[:space:]]*EXCLUDE_IPS=.*@EXCLUDE_IPS="$($(UNDERLAY_IPV4_EXCLUDE_IPS))"@' \
 		-e 's@^VLAN_ID=.*@VLAN_ID="0"@' \
 		-e 's/VERSION=.*/VERSION=$(VERSION)/' \
 		dist/images/install.sh | \