Skip to content

Commit

Permalink
enable dual stack by default (#741)
Browse files Browse the repository at this point in the history
So we can connect to IPv6 upstream
Signed-off-by: spacewander <[email protected]>
  • Loading branch information
spacewander authored Sep 30, 2024
1 parent 269fb1f commit 1d23571
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion e2e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions e2e/kind_cluster.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
ipFamily: dual
1 change: 1 addition & 0 deletions manifests/charts/htnn-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"` | |
Expand Down
8 changes: 7 additions & 1 deletion manifests/charts/htnn-controller/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions manifests/charts/htnn-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1d23571

Please sign in to comment.