From 3c01429c5bf1d5ad7ccc1bb601ab268d6ec42f23 Mon Sep 17 00:00:00 2001
From: Jon Huhn <johuhn@microsoft.com>
Date: Mon, 26 Aug 2024 15:50:36 -0500
Subject: [PATCH 1/2] testing implicit default for ASOAPI feature flag

---
 test/e2e/config/azure-dev.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
index 70d9096b326..bf1786a7d5e 100644
--- a/test/e2e/config/azure-dev.yaml
+++ b/test/e2e/config/azure-dev.yaml
@@ -204,7 +204,6 @@ variables:
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   EXP_EDGEZONE: "true"
-  EXP_ASO_API: "true"
   CLUSTER_TOPOLOGY: "true"
   EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
   AZURE_EXTENDEDLOCATION_TYPE: "${AZURE_EXTENDEDLOCATION_TYPE:-EdgeZone}"

From 0e174cfa2988a5877af5c0813ebc55b692dc9e97 Mon Sep 17 00:00:00 2001
From: Jon Huhn <johuhn@microsoft.com>
Date: Mon, 26 Aug 2024 16:32:02 -0500
Subject: [PATCH 2/2] explicitly set EXP_ASO_API=true for controller-manager

---
 config/manager/manager.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 20e88ffab2c..b70a13a0bd6 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -24,7 +24,7 @@ spec:
             - --leader-elect
             - "--diagnostics-address=${CAPZ_DIAGNOSTICS_ADDRESS:=:8443}"
             - "--insecure-diagnostics=${CAPZ_INSECURE_DIAGNOSTICS:=false}"
-            - "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKSResourceHealth=${EXP_AKS_RESOURCE_HEALTH:=false},EdgeZone=${EXP_EDGEZONE:=false},ASOAPI=${EXP_ASO_API:=false}"
+            - "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKSResourceHealth=${EXP_AKS_RESOURCE_HEALTH:=false},EdgeZone=${EXP_EDGEZONE:=false},ASOAPI=${EXP_ASO_API:=true}"
             - "--v=0"
           image: controller:latest
           imagePullPolicy: Always