Skip to content
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.

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

Fix installation command for arm64 #2729

Merged
merged 3 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
8 changes: 4 additions & 4 deletions Makefile.d/helm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ helm-docs/install: $(BINDIR)/helm-docs

$(BINDIR)/helm-docs:
mkdir -p $(BINDIR)
TAR_NAME=helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
$(eval DARH := $(subst aarch64,arm64,$(ARCH)))
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}" \
Expand Down Expand Up @@ -153,11 +154,10 @@ $(ROOTDIR)/charts/vald-benchmark-operator/values.schema.json: \
.PHONY: yq/install
## install yq
yq/install: $(BINDIR)/yq

$(BINDIR)/yq:
vankichi marked this conversation as resolved.
Show resolved Hide resolved
mkdir -p $(BINDIR)
$(eval DARH := $(subst aarch64,arm64,$(ARCH)))
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
Expand Down
3 changes: 2 additions & 1 deletion Makefile.d/k8s.mk
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,9 @@ telepresence/install: $(BINDIR)/telepresence

$(BINDIR)/telepresence:
mkdir -p $(BINDIR)
$(eval DARH := $(subst aarch64,arm64,$(ARCH)))
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 \
vankichi marked this conversation as resolved.
Show resolved Hide resolved
&& chmod a+x $(BINDIR)/telepresence

.PHONY: telepresence/swap/agent-ngt
Expand Down
3 changes: 2 additions & 1 deletion Makefile.d/kind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ kind/install: $(BINDIR)/kind

$(BINDIR)/kind:
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
$(eval DARH := $(subst aarch64,arm64,$(ARCH)))
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
vankichi marked this conversation as resolved.
Show resolved Hide resolved
chmod a+x $(BINDIR)/kind

.PHONY: kind/start
Expand Down
3 changes: 2 additions & 1 deletion Makefile.d/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ $(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 DARH := $(subst aarch64,arm64,$(ARCH)))
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
Expand Down
Loading