Merge branch 'main' into feature/internal-net/support-quic

vdaas · Nov 6, 2024 · c6d7982 · c6d7982
2 parents c914895 + a583f09
commit c6d7982
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk
@@ -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 DARCH := $(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}" \
@@ -156,8 +157,9 @@ yq/install: $(BINDIR)/yq
 
 $(BINDIR)/yq:
 	mkdir -p $(BINDIR)
+	$(eval DARCH := $(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

diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk
@@ -534,8 +534,9 @@ telepresence/install: $(BINDIR)/telepresence
 
 $(BINDIR)/telepresence:
 	mkdir -p $(BINDIR)
+	$(eval DARCH := $(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 \
 		&& chmod a+x $(BINDIR)/telepresence
 
 .PHONY: telepresence/swap/agent-ngt

diff --git a/Makefile.d/kind.mk b/Makefile.d/kind.mk
@@ -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 DARCH := $(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
 	chmod a+x $(BINDIR)/kind
 
 .PHONY: kind/start

diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk
@@ -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 DARCH := $(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

diff --git a/rust/bin/agent/src/handler/update.rs b/rust/bin/agent/src/handler/update.rs
@@ -49,7 +49,7 @@ impl update_server::Update for super::Agent {
     #[doc = " A method to update timestamp indexed vectors in a single request.\n"]
     async fn update_timestamp(
         &self,
-        request: tonic::Request<update::TimestampRequest>,
+        _request: tonic::Request<update::TimestampRequest>,
     ) -> std::result::Result<tonic::Response<object::Location>, tonic::Status> {
         todo!()
     }

diff --git a/rust/bin/meta/src/handler/meta.rs b/rust/bin/meta/src/handler/meta.rs
@@ -20,20 +20,20 @@ use proto::{meta::v1::meta_server, payload::v1::{meta, Empty}};
 impl meta_server::Meta for super::Meta {
     async fn get(
         &self,
-        request: tonic::Request<meta::Key>,
+        _request: tonic::Request<meta::Key>,
     ) -> std::result::Result<tonic::Response<meta::Value>, tonic::Status> {
         todo!()
     }
     async fn set(
         &self,
-        request: tonic::Request<meta::KeyValue>,
+        _request: tonic::Request<meta::KeyValue>,
     ) -> std::result::Result<tonic::Response<Empty>, tonic::Status> {
         todo!()
     }
 
     async fn delete(
         &self,
-        request: tonic::Request<meta::Key>,
+        _request: tonic::Request<meta::Key>,
     ) -> std::result::Result<tonic::Response<Empty>, tonic::Status> {
         todo!()
     }