Skip to content

Commit

Permalink
[backport] ci: Unblock k8s 1.30 | ACN v1.6 testing (#3011) (#3415)
Browse files Browse the repository at this point in the history
* ci: Unblock k8s 1.30 | ACN v1.6 testing (#3011)

* chore: turn off windows dualstack service tests

* ci: skip dualstack datapath test

* bump k8 to 1.29 for temp testing

---------

Co-authored-by: QxBytes <[email protected]>
  • Loading branch information
jpayne3506 and QxBytes authored Feb 13, 2025
1 parent eaf9121 commit 819e9bb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ stages:
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: windows
dependsOn: cni_linux
dualstack: true
# dualstack: true # Currently broken for scenario and blocking releases, HNS is investigating. Covered by go test in E2E step template
dns: true
portforward: true
service: true
# service: true # Currently broken for scenario and blocking releases, HNS is investigating.
hostport: true
hybridWin: true

Expand Down
6 changes: 1 addition & 5 deletions hack/aks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AZCLI ?= docker run --rm -v $(AZCFG):/root/.azure -v $(KUBECFG):/root/.kube -v

# overrideable defaults
AUTOUPGRADE ?= patch
K8S_VER ?= 1.28
K8S_VER ?= 1.29
NODE_COUNT ?= 2
NODE_COUNT_WIN ?= $(NODE_COUNT)
NODEUPGRADE ?= NodeImage
Expand Down Expand Up @@ -383,8 +383,6 @@ dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Over
--ip-families ipv4,ipv6 \
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
--no-ssh-key \
--tier premium \
--k8s-support-plan AKSLongTermSupport \
--yes
@$(MAKE) set-kubeconf

Expand Down Expand Up @@ -419,8 +417,6 @@ dualstack-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up a Dualstack o
--aks-custom-headers AKSHTTPCustomFeatures=Microsoft.ContainerService/AzureOverlayDualStackPreview \
--no-ssh-key \
--kube-proxy-config ./kube-proxy.json \
--tier premium \
--k8s-support-plan AKSLongTermSupport \
--yes
@$(MAKE) set-kubeconf

Expand Down

0 comments on commit 819e9bb

Please sign in to comment.