Skip to content

Commit 6539f27

Browse files
authored
Merge pull request #5093 from nojnhuh/asoapi-flag-default
explicitly set EXP_ASO_API=true for controller-manager
2 parents 12d15fa + 2783c33 commit 6539f27

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- --leader-elect
2525
- "--diagnostics-address=${CAPZ_DIAGNOSTICS_ADDRESS:=:8443}"
2626
- "--insecure-diagnostics=${CAPZ_INSECURE_DIAGNOSTICS:=false}"
27-
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKSResourceHealth=${EXP_AKS_RESOURCE_HEALTH:=false},EdgeZone=${EXP_EDGEZONE:=false},ASOAPI=${EXP_ASO_API:=false}"
27+
- "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},AKSResourceHealth=${EXP_AKS_RESOURCE_HEALTH:=false},EdgeZone=${EXP_EDGEZONE:=false},ASOAPI=${EXP_ASO_API:=true}"
2828
- "--v=0"
2929
image: controller:latest
3030
imagePullPolicy: Always

test/e2e/config/azure-dev.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ variables:
204204
EXP_MACHINE_POOL: "true"
205205
EXP_CLUSTER_RESOURCE_SET: "true"
206206
EXP_EDGEZONE: "true"
207-
EXP_ASO_API: "true"
208207
CLUSTER_TOPOLOGY: "true"
209208
EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
210209
AZURE_EXTENDEDLOCATION_TYPE: "${AZURE_EXTENDEDLOCATION_TYPE:-EdgeZone}"

0 commit comments

Comments
 (0)