Skip to content

Revert "Update Tiltfile to use env variable to check aks cluster is being used" #5353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Revert "Update Tiltfile to use env variable to check aks cluster is being used" #5353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
Loading