From c897f281cae780f473926acc41348603ef5b93ed Mon Sep 17 00:00:00 2001
From: Nawaz K <k.nawaz.h@gmail.com>
Date: Thu, 2 Jan 2025 20:35:17 -0800
Subject: [PATCH] Revert "Update Tiltfile to use env variable to check aks
 cluster is being used"

---
 Makefile | 2 --
 Tiltfile | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ddf5a50a1ac..5b25f24dc11 100644
--- a/Makefile
+++ b/Makefile
@@ -742,12 +742,10 @@ verify-container-images: ## Verify container images
 .PHONY: kind-create
 kind-create: $(KUBECTL) ## Create capz kind cluster if needed.
 	./scripts/kind-with-registry.sh
-	unset MGMT_CLUSTER_TYPE
 
 .PHONY: aks-create
 aks-create: $(KUBECTL) ## Create aks cluster as mgmt cluster.
 	./scripts/aks-as-mgmt.sh
-	export MGMT_CLUSTER_TYPE=aks
 
 .PHONY: tilt-up
 tilt-up: install-tools ## Start tilt and build kind cluster if needed.
diff --git a/Tiltfile b/Tiltfile
index bd2ea3bf9a4..b3a4c4a8ca1 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -50,9 +50,8 @@ if "allowed_contexts" in settings:
 if "default_registry" in settings:
     default_registry(settings.get("default_registry"))
 
-mgmt_cluster_type = os.getenv("MGMT_CLUSTER_TYPE", "")
 os_arch = str(local("go env GOARCH")).rstrip("\n")
-if mgmt_cluster_type == "aks":
+if "aks" in settings.get("kustomize_substitutions", {}).get("MGMT_CLUSTER_NAME", ""):
     print("Using AKS as management cluster, setting os_arch to amd64")
     os_arch = "amd64"