address feedback

Author: QxBytes

.pipelines/pipeline.yaml

@@ -286,7 +286,7 @@ stages:
         name: "linux_azure_overlay_e2e"
         displayName: Azure Overlay Linux
         os: linux
-        clusterType: linux-overlay-byocni-up
+        clusterType: overlay-byocni-up
         clusterName: "linuxazovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
@@ -298,7 +298,7 @@ stages:
         name: "win_azure_overlay_e2e"
         displayName: Azure Overlay Windows
         os: windows
-        clusterType: windows-overlay-byocni-up
+        clusterType: overlay-byocni-up
         clusterName: "winazovere2e"
         vmSize: Standard_B2ms
         k8sVersion: ""
@@ -373,7 +373,7 @@ stages:
         name: "linux_dualstackoverlay_e2e"
         displayName: AKS DualStack Overlay Linux
         os: linux
-        clusterType: linux-dualstack-overlay-byocni-up
+        clusterType: dualstack-overlay-byocni-up
         clusterName: "linuxdsovere2e"
         vmSize: Standard_B2ms
         dependsOn: "containerize"
@@ -384,7 +384,7 @@ stages:
         name: "win_dualstackoverlay_e2e"
         displayName: AKS DualStack Overlay Windows
         os: windows
-        clusterType: windows-dualstack-overlay-byocni-up
+        clusterType: dualstack-overlay-byocni-up
         clusterName: "windsovere2e"
         vmSize: Standard_B2ms
         dependsOn: "containerize"

.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml

@@ -7,6 +7,7 @@ parameters:
   k8sVersion: ""
   dependsOn: ""
   scaleup: ""
+  os: ""
 
 stages:
   - stage: ${{ parameters.clusterName }}
@@ -29,6 +30,7 @@ stages:
           vmSizeWin: ${{ parameters.vmSize }}
           k8sVersion: ${{ parameters.k8sVersion }}
           dependsOn: ${{ parameters.dependsOn }}
+          os: ${{ parameters.os }}
           region: $(REGION_AKS_CLUSTER_TEST)
 
   - stage: ${{ parameters.name }}

.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml

@@ -30,6 +30,7 @@ stages:
           vmSizeWin: ${{ parameters.vmSize }}
           k8sVersion: ${{ parameters.k8sVersion }}
           dependsOn: ${{ parameters.dependsOn }}
+          os: ${{ parameters.os }}
           region: $(REGION_DUALSTACKOVERLAY_CLUSTER_TEST) # Dualstack has a specific region requirement
 
   - stage: ${{ parameters.name }}

hack/aks/Makefile

@@ -114,10 +114,7 @@ nodesubnet-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an NodeSubne
 		--yes
 	@$(MAKE) set-kubeconf
 
-# alias for linux-overlay-byocni-up
-overlay-byocni-up: linux-overlay-byocni-up
-
-linux-overlay-byocni-up: rg-up overlay-net-up ## Brings up a Linux Overlay BYO CNI cluster
+overlay-byocni-up: rg-up overlay-net-up ## Brings up a Linux Overlay BYO CNI cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--auto-upgrade-channel $(AUTOUPGRADE) \
 		--node-os-upgrade-channel $(NODEUPGRADE) \
@@ -133,11 +130,10 @@ linux-overlay-byocni-up: rg-up overlay-net-up ## Brings up a Linux Overlay BYO C
 		--os-sku $(OS_SKU) \
 		--yes
 	@$(MAKE) set-kubeconf
-
-windows-overlay-byocni-up: linux-overlay-byocni-up rg-up overlay-net-up ## Brings up a Windows Overlay BYO CNI cluster
+ifeq ($(OS),windows)
 	AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh
 	$(MAKE) windows-nodepool-up
-	@$(MAKE) set-kubeconf
+endif
 
 overlay-byocni-nokubeproxy-up: rg-up overlay-net-up ## Brings up an Overlay BYO CNI cluster without kube-proxy
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
@@ -394,10 +390,7 @@ dualstack-overlay-up: rg-up overlay-net-up ## Brings up an dualstack Overlay clu
 		--yes
 	@$(MAKE) set-kubeconf
 
-# alias for linux-dualstack-overlay-byocni-up
-dualstack-overlay-byocni-up: linux-dualstack-overlay-byocni-up
-
-linux-dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster
+dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstack Overlay BYO CNI cluster
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \
 		--auto-upgrade-channel $(AUTOUPGRADE) \
 		--node-os-upgrade-channel $(NODEUPGRADE) \
@@ -412,11 +405,10 @@ linux-dualstack-overlay-byocni-up: rg-up overlay-net-up ## Brings up an dualstac
 		--no-ssh-key \
 		--yes
 	@$(MAKE) set-kubeconf
-
-windows-dualstack-overlay-byocni-up: linux-dualstack-overlay-byocni-up
+ifeq ($(OS),windows)
 	AZCLI="az" GROUP="$(GROUP)" CLUSTER="$(CLUSTER)" sh ../scripts/wait-cluster-update.sh
 	$(MAKE) windows-nodepool-up
-	@$(MAKE) set-kubeconf
+endif
 
 cilium-dualstack-up: rg-up overlay-net-up ## Brings up a Cilium Dualstack Overlay cluster with Linux node only
 	$(AZCLI) aks create -n $(CLUSTER) -g $(GROUP) -l $(REGION) \