diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk index c468abe6c73..afb35abd98f 100644 --- a/Makefile.d/helm.mk +++ b/Makefile.d/helm.mk @@ -27,8 +27,12 @@ $(BINDIR)/helm: helm-docs/install: $(BINDIR)/helm-docs $(BINDIR)/helm-docs: + $(eval DARCH :=$(ARCH)) +ifeq ($(ARCH),aarch64) + $(eval DARCH = $(shell echo arm64)) +endif mkdir -p $(BINDIR) - TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \ + TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(DARCH).tar.gz \ && cd $(TEMP_DIR) \ && curl -fsSL "https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/$${TAR_NAME}" -o "$(TEMP_DIR)/$${TAR_NAME}"\ && tar xzvf "$(TEMP_DIR)/$${TAR_NAME}" \ @@ -155,9 +159,13 @@ $(ROOTDIR)/charts/vald-benchmark-operator/values.schema.json: \ yq/install: $(BINDIR)/yq $(BINDIR)/yq: + $(eval DARCH :=$(ARCH)) +ifeq ($(ARCH),aarch64) + $(eval DARCH = $(shell echo arm64)) +endif mkdir -p $(BINDIR) cd $(TEMP_DIR) \ - && curl -fsSL https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$(OS)_$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/yq \ + && curl -fsSL https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$(OS)_$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/yq \ && chmod a+x $(BINDIR)/yq .PHONY: helm/schema/crd/all diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk index 8693f9d2feb..cd13b7b62b2 100644 --- a/Makefile.d/k8s.mk +++ b/Makefile.d/k8s.mk @@ -533,9 +533,13 @@ k8s/monitoring/delete: \ telepresence/install: $(BINDIR)/telepresence $(BINDIR)/telepresence: + $(eval DARCH :=$(ARCH)) +ifeq ($(ARCH),aarch64) + $(eval DARCH = $(shell echo arm64)) +endif mkdir -p $(BINDIR) cd $(TEMP_DIR) \ - && curl -fsSL "https://app.getambassador.io/download/tel2oss/releases/download/v$(TELEPRESENCE_VERSION)/telepresence-$(OS)-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]'))" -o $(BINDIR)/telepresence \ + && curl -fsSL "https://app.getambassador.io/download/tel2oss/releases/download/v$(TELEPRESENCE_VERSION)/telepresence-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]'))" -o $(BINDIR)/telepresence \ && chmod a+x $(BINDIR)/telepresence .PHONY: telepresence/swap/agent-ngt diff --git a/Makefile.d/kind.mk b/Makefile.d/kind.mk index a2f15b52179..c6818a52c28 100644 --- a/Makefile.d/kind.mk +++ b/Makefile.d/kind.mk @@ -18,8 +18,12 @@ kind/install: $(BINDIR)/kind $(BINDIR)/kind: + $(eval DARCH :=$(ARCH)) +ifeq ($(ARCH),aarch64) + $(eval DARCH = $(shell echo arm64)) +endif mkdir -p $(BINDIR) - curl -fsSL https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/kind + curl -fsSL https://github.com/kubernetes-sigs/kind/releases/download/v$(KIND_VERSION)/kind-$(OS)-$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/kind chmod a+x $(BINDIR)/kind .PHONY: kind/start diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index f1071faf006..adc9cc22801 100644 --- a/Makefile.d/tools.mk +++ b/Makefile.d/tools.mk @@ -71,7 +71,11 @@ $(BINDIR)/reviewdog: kubectl/install: $(BINDIR)/kubectl $(BINDIR)/kubectl: - curl -fsSL "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(OS)/$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]'))/kubectl" -o $(BINDIR)/kubectl + $(eval DARCH :=$(ARCH)) +ifeq ($(ARCH),aarch64) + $(eval DARCH = $(shell echo arm64)) +endif + curl -fsSL "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(OS)/$(subst x86_64,amd64,$(shell echo $(DARCH) | tr '[:upper:]' '[:lower:]'))/kubectl" -o $(BINDIR)/kubectl chmod a+x $(BINDIR)/kubectl .PHONY: textlint/install