Skip to content

Commit 7a08a48

Browse files
Copilotvipul-21
andcommitted
Add dual-stack support and comprehensive testing for BYO CNI automation
Co-authored-by: vipul-21 <[email protected]>
1 parent b771da8 commit 7a08a48

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

hack/aks/Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ CILIUM_DIR ?= 1.14
4242
CILIUM_VERSION_TAG ?= v1.14.8
4343
CILIUM_IMAGE_REGISTRY ?= acnpublic.azurecr.io
4444
IPV6_HP_BPF_VERSION ?= v0.0.3
45+
DUALSTACK ?= false
4546
REPO_ROOT ?= $(shell git rev-parse --show-toplevel)
4647

4748
# Long Term Support (LTS)
@@ -128,6 +129,7 @@ vars: ## Show the input vars configured for the cluster commands
128129
@echo CILIUM_VERSION_TAG=$(CILIUM_VERSION_TAG)
129130
@echo CILIUM_IMAGE_REGISTRY=$(CILIUM_IMAGE_REGISTRY)
130131
@echo IPV6_HP_BPF_VERSION=$(IPV6_HP_BPF_VERSION)
132+
@echo DUALSTACK=$(DUALSTACK)
131133
@echo REPO_ROOT=$(REPO_ROOT)
132134

133135

@@ -480,7 +482,12 @@ deploy-cilium: ## Deploy Cilium to the cluster
480482
echo "Available versions: $$(ls $(REPO_ROOT)/test/integration/manifests/cilium/ | grep '^v' | tr '\n' ' ')"; \
481483
exit 1; \
482484
fi
485+
ifeq ($(DUALSTACK),true)
486+
@echo "Deploying Cilium with dual-stack configuration..."
487+
kubectl apply -f $(REPO_ROOT)/test/integration/manifests/cilium/v$(CILIUM_DIR)/cilium-config/cilium-config-dualstack.yaml
488+
else
483489
kubectl apply -f $(REPO_ROOT)/test/integration/manifests/cilium/v$(CILIUM_DIR)/cilium-config/cilium-config.yaml
490+
endif
484491
kubectl apply -f $(REPO_ROOT)/test/integration/manifests/cilium/v$(CILIUM_DIR)/cilium-operator/files
485492
kubectl apply -f $(REPO_ROOT)/test/integration/manifests/cilium/v$(CILIUM_DIR)/cilium-agent/files
486493
@export CILIUM_VERSION_TAG=$(CILIUM_VERSION_TAG) && \
@@ -511,6 +518,7 @@ byocni-cluster-vars: ## Show variables for BYO CNI cluster setup
511518
@echo " CILIUM_VERSION_TAG=$(CILIUM_VERSION_TAG)"
512519
@echo " CILIUM_IMAGE_REGISTRY=$(CILIUM_IMAGE_REGISTRY)"
513520
@echo " IPV6_HP_BPF_VERSION=$(IPV6_HP_BPF_VERSION)"
521+
@echo " DUALSTACK=$(DUALSTACK)"
514522
@echo ""
515523
@echo "Repository root:"
516524
@echo " REPO_ROOT=$(REPO_ROOT)"

hack/aks/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ make byocni-cluster-up \
8888
- `CILIUM_VERSION_TAG`: Cilium image tag (default: v1.14.8)
8989
- `CILIUM_IMAGE_REGISTRY`: Cilium image registry (default: acnpublic.azurecr.io)
9090
- `IPV6_HP_BPF_VERSION`: IPv6 HP BPF version for dual stack (default: v0.0.3)
91+
- `DUALSTACK`: Enable dual-stack configuration (default: false)
9192

9293
View all configuration variables:
9394
```bash

0 commit comments

Comments
 (0)