From 1d23571bba73026e469f6a3f13dd0d34d95bbd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B3=BD=E8=BD=A9?= Date: Mon, 30 Sep 2024 10:20:29 +0800 Subject: [PATCH] enable dual stack by default (#741) So we can connect to IPv6 upstream Signed-off-by: spacewander --- e2e/Makefile | 2 +- e2e/kind_cluster.yaml | 4 ++++ manifests/charts/htnn-controller/README.md | 1 + manifests/charts/htnn-controller/values.schema.json | 8 +++++++- manifests/charts/htnn-controller/values.yaml | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 e2e/kind_cluster.yaml diff --git a/e2e/Makefile b/e2e/Makefile index 32feb15a..898fc5ab 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -34,7 +34,7 @@ helm: $(LOCALBIN) .PHONY: create-cluster create-cluster: kind kubectl - $(KIND) create cluster --name htnn --image kindest/node:v$(MIN_K8S_VERSION) + $(KIND) create cluster --name htnn --image kindest/node:v$(MIN_K8S_VERSION) --config=kind_cluster.yaml $(KUBECTL) apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v$(GATEWAY_API_VERSION)/standard-install.yaml $(KUBECTL) apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v$(GATEWAY_API_VERSION)/experimental-install.yaml diff --git a/e2e/kind_cluster.yaml b/e2e/kind_cluster.yaml new file mode 100644 index 00000000..ab9a0688 --- /dev/null +++ b/e2e/kind_cluster.yaml @@ -0,0 +1,4 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +networking: + ipFamily: dual diff --git a/manifests/charts/htnn-controller/README.md b/manifests/charts/htnn-controller/README.md index 9f42a169..dd2c1255 100644 --- a/manifests/charts/htnn-controller/README.md +++ b/manifests/charts/htnn-controller/README.md @@ -121,6 +121,7 @@ helm uninstall htnn-controller -n istio-system | pilot.cpu.targetAverageUtilization | int | `80` | | | pilot.deploymentLabels | object | `{}` | | | pilot.env.HTNN_ENABLE_LDS_PLUGIN_VIA_ECDS | string | `"false"` | | +| pilot.env.ISTIO_DUAL_STACK | string | `"true"` | | | pilot.env.PILOT_ENABLE_HTNN | string | `"true"` | | | pilot.env.PILOT_ENABLE_HTNN_STATUS | string | `"true"` | | | pilot.env.PILOT_SCOPE_GATEWAY_TO_NAMESPACE | string | `"true"` | | diff --git a/manifests/charts/htnn-controller/values.schema.json b/manifests/charts/htnn-controller/values.schema.json index 170d5b6d..7056b022 100644 --- a/manifests/charts/htnn-controller/values.schema.json +++ b/manifests/charts/htnn-controller/values.schema.json @@ -762,6 +762,11 @@ "title": "HTNN_ENABLE_LDS_PLUGIN_VIA_ECDS", "type": "string" }, + "ISTIO_DUAL_STACK": { + "default": "true", + "title": "ISTIO_DUAL_STACK", + "type": "string" + }, "PILOT_ENABLE_HTNN": { "default": "true", "title": "PILOT_ENABLE_HTNN", @@ -784,7 +789,8 @@ "PILOT_SCOPE_GATEWAY_TO_NAMESPACE", "PILOT_ENABLE_HTNN", "PILOT_ENABLE_HTNN_STATUS", - "HTNN_ENABLE_LDS_PLUGIN_VIA_ECDS" + "HTNN_ENABLE_LDS_PLUGIN_VIA_ECDS", + "ISTIO_DUAL_STACK" ] }, "extraContainerArgs": { diff --git a/manifests/charts/htnn-controller/values.yaml b/manifests/charts/htnn-controller/values.yaml index a982f30d..afe3a9c5 100644 --- a/manifests/charts/htnn-controller/values.yaml +++ b/manifests/charts/htnn-controller/values.yaml @@ -35,6 +35,7 @@ pilot: PILOT_ENABLE_HTNN: "true" PILOT_ENABLE_HTNN_STATUS: "true" HTNN_ENABLE_LDS_PLUGIN_VIA_ECDS: "false" + ISTIO_DUAL_STACK: "true" # Settings related to the untaint controller # This controller will remove `cni.istio.io/not-ready` from nodes when the istio-cni pod becomes ready