backport: ci: increase goldpinger replicas from 4 to 8 and add topolo…

…gy constraints (#3380) * increase datapath test goldpinger replicas from 4 to 8 * try topology constraints to balance * enable lts support for 1.28 on dualstack clusters
Azure · Feb 3, 2025 · 2ec0bfa · 2ec0bfa
1 parent 3f40aed
commit 2ec0bfa
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/hack/aks/Makefile b/hack/aks/Makefile
@@ -383,6 +383,8 @@ 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
 
@@ -417,6 +419,8 @@ 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
 

diff --git a/test/integration/manifests/datapath/linux-deployment-ipv6.yaml b/test/integration/manifests/datapath/linux-deployment-ipv6.yaml
@@ -4,7 +4,7 @@ metadata:
   name: goldpinger-deploy
   namespace: linux-datapath-test
 spec:
-  replicas: 4
+  replicas: 8
   selector:
     matchLabels:
       app: goldpinger
@@ -86,3 +86,10 @@ spec:
               periodSeconds: 5
         nodeSelector:
           kubernetes.io/os: linux
+        topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: ScheduleAnyway
+          labelSelector:
+            matchLabels:
+              app: "goldpinger"
diff --git a/test/integration/manifests/datapath/linux-deployment.yaml b/test/integration/manifests/datapath/linux-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: goldpinger-deploy
   namespace: linux-datapath-test
 spec:
-  replicas: 4
+  replicas: 8
   selector:
     matchLabels:
       app: goldpinger
@@ -84,3 +84,10 @@ spec:
               periodSeconds: 5
         nodeSelector:
           kubernetes.io/os: linux
+        topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: ScheduleAnyway
+          labelSelector:
+            matchLabels:
+              app: "goldpinger"
diff --git a/test/integration/manifests/datapath/windows-deployment.yaml b/test/integration/manifests/datapath/windows-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: windows-pod
   namespace: datapath-win
 spec:
-  replicas: 4
+  replicas: 8
   selector:
     matchLabels:
       app: datapod
@@ -20,3 +20,10 @@ spec:
           args: ["sleep", "5000"]
       nodeSelector:
         kubernetes.io/os: windows
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: ScheduleAnyway
+          labelSelector:
+            matchLabels:
+              app: "datapod"