Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#4926 from jackfrancis/tilt-asoapi
Browse files Browse the repository at this point in the history
set EXP_ASO_API=true for CI
  • Loading branch information
k8s-ci-robot authored Jun 17, 2024
2 parents 772d354 + cab67d2 commit a52056d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ create-cluster: ## Create a workload development Kubernetes cluster on Azure in
EXP_CLUSTER_RESOURCE_SET=true \
EXP_MACHINE_POOL=true \
EXP_EDGEZONE=true \
EXP_ASO_API=true \
$(MAKE) create-management-cluster \
create-workload-cluster

Expand Down Expand Up @@ -730,7 +731,7 @@ tilt-up: install-tools kind-create ## Start tilt and build kind cluster if neede
@if [ -z "${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}" ]; then \
export AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY=$(shell cat $(AZURE_IDENTITY_ID_FILEPATH)); \
fi; \
CLUSTER_TOPOLOGY=true EXP_CLUSTER_RESOURCE_SET=true EXP_MACHINE_POOL=true EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION=true EXP_EDGEZONE=true tilt up
CLUSTER_TOPOLOGY=true EXP_ASO_API=true EXP_CLUSTER_RESOURCE_SET=true EXP_MACHINE_POOL=true EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION=true EXP_EDGEZONE=true tilt up

.PHONY: delete-cluster
delete-cluster: delete-workload-cluster ## Deletes the example kind cluster "capz".
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ spec:
- "--diagnostics-address=:8080"
- "--insecure-diagnostics"
- "--leader-elect"
- "--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}"
- "--enable-tracing"
4 changes: 2 additions & 2 deletions templates/flavors/aks-aso/credentials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
stringData:
AZURE_SUBSCRIPTION_ID: ${AZURE_SUBSCRIPTION_ID}
AZURE_TENANT_ID: ${AZURE_TENANT_ID}
AZURE_CLIENT_ID: ${AZURE_CLIENT_ID}
AUTH_MODE: ${ASO_CREDENTIAL_SECRET_MODE}
AZURE_CLIENT_ID: ${AZURE_CLIENT_ID_USER_ASSIGNED_IDENTITY}
AUTH_MODE: ${ASO_CREDENTIAL_SECRET_MODE:-workloadidentity}

0 comments on commit a52056d

Please sign in to comment.