backport acn pipeline stability fix (#2833)

Fix ACN PR Pipeline failures related to swiftv2 (#2826)

fix stability of pr pipeline

Co-authored-by: Chloe Chen <[email protected]>

Author: jc2543

.pipelines/multitenancy/swiftv2-e2e-step-template.yaml

@@ -34,7 +34,7 @@ steps:
         kubectl get po -owide -A
         echo "Apply the pod network yaml to start the delegation"
         less test/integration/manifests/swiftv2/podnetwork.yaml
-        envsubst '${SUBNET_TOKEN},${SUBNET_GUID},${SUBNET_RESOURCE_ID},${VNET_GUID}' < test/integration/manifests/swiftv2/podnetwork.yaml | kubectl apply -f -
+        envsubst '${SUBNET_TOKEN},${SUBNET_RESOURCE_ID},${VNET_GUID}' < test/integration/manifests/swiftv2/podnetwork.yaml | kubectl apply -f -
         echo "Check the podnetwork yaml file"
         less test/integration/manifests/swiftv2/podnetwork.yaml
         kubectl get pn

.pipelines/pipeline.yaml

@@ -525,7 +525,7 @@ stages:
         clusterType: swiftv2-multitenancy-cluster-up
         clusterName: "mtacluster"
         nodePoolName: "mtapool"
-        vmSize: Standard_D4_v2
+        vmSize: $(SWIFTV2_MT_CLUSTER_SKU)
         dependsOn: "test"
         dummyClusterName: "swiftv2dummy"
         dummyClusterType: "swiftv2-dummy-cluster-up"

hack/aks/Makefile

@@ -239,7 +239,7 @@ swiftv2-multitenancy-cluster-up: rg-up
 		--network-plugin-mode overlay \
 		--kubernetes-version 1.28 \
 		--nodepool-name "mtapool" \
-		--node-vm-size Standard_D4_v2 \
+		--node-vm-size $(VM_SIZE) \
 		--node-count 2 \
 		--nodepool-tags fastpathenabled=true \
 		--no-ssh-key \

test/integration/manifests/swiftv2/podnetwork.yaml

@@ -5,6 +5,5 @@ metadata:
     kubernetes.azure.com/override-subnet-token: $SUBNET_TOKEN
   name: aksswiftvnetv20425
 spec:
-  subnetGUID: $SUBNET_GUID
   subnetResourceID: $SUBNET_RESOURCE_ID
   vnetGUID: $VNET_GUID