Skip to content

Commit

Permalink
Revert "Update Tiltfile to use env variable to check aks cluster is b…
Browse files Browse the repository at this point in the history
…eing used"
  • Loading branch information
nawazkh authored Jan 3, 2025
1 parent 6bce7f8 commit c897f28
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit c897f28

Please sign in to comment.