Skip to content

Commit

Permalink
Add efficient search logic for large top-k users (#2491)
Browse files Browse the repository at this point in the history 
* add efficient search logic for large top-k users

Signed-off-by: kpango <[email protected]>

* fix bug

Signed-off-by: kpango <[email protected]>

---------

Signed-off-by: kpango <[email protected]>
  • Loading branch information
@kpango
kpango authored May 8, 2024
1 parent 41c002c commit 6d4b505
Show file tree
Hide file tree
Showing 100 changed files with 3,603 additions and 1,647 deletions.
14 changes: 14 additions & 0 deletions .gitfiles
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
.github/workflows/coverage.yml
.github/workflows/detect-internal-config-changes.yml
.github/workflows/dockers-agent-faiss-image.yml
.github/workflows/dockers-agent-image.yml
.github/workflows/dockers-agent-ngt-image.yml
.github/workflows/dockers-agent-sidecar-image.yml
.github/workflows/dockers-benchmark-job-image.yml
Expand Down Expand Up @@ -167,8 +168,10 @@ apis/grpc/v1/mirror/mirror.pb.go
apis/grpc/v1/mirror/mirror_vtproto.pb.go
apis/grpc/v1/payload/interface.go
apis/grpc/v1/payload/payload.pb.go
apis/grpc/v1/payload/payload.pb.json.go
apis/grpc/v1/payload/payload_vtproto.pb.go
apis/grpc/v1/rpc/errdetails/error_details.pb.go
apis/grpc/v1/rpc/errdetails/error_details.pb.json.go
apis/grpc/v1/rpc/errdetails/error_details_vtproto.pb.go
apis/grpc/v1/vald/filter.pb.go
apis/grpc/v1/vald/filter_vtproto.pb.go
Expand Down Expand Up @@ -243,6 +246,7 @@ assets/docs/overview/search_flow.svg
assets/docs/overview/update_flow.svg
assets/docs/overview/upsert_flow.svg
assets/docs/overview/vald_basic_architecture.svg
assets/docs/performance/benchmark-grafana.png
assets/docs/troubleshooting/provisioning_flow_chart.drawio
assets/docs/troubleshooting/provisioning_flow_chart.svg
assets/docs/tutorial/getstarted.svg
Expand Down Expand Up @@ -505,6 +509,8 @@ design/Vald Architecture Assets.drawio
design/Vald Architecture Dataflow.drawio
design/Vald Architecture Overview.drawio
design/vald_architecture_overview.png
dockers/agent/core/agent/Dockerfile
dockers/agent/core/agent/README.md
dockers/agent/core/faiss/Dockerfile
dockers/agent/core/ngt/Dockerfile
dockers/agent/core/ngt/README.md
Expand Down Expand Up @@ -1121,6 +1127,7 @@ internal/net/grpc/handler.go
internal/net/grpc/health/health.go
internal/net/grpc/health/health_test.go
internal/net/grpc/interceptor.go
internal/net/grpc/interceptor/client/metric/metric.go
internal/net/grpc/interceptor/client/trace/trace.go
internal/net/grpc/interceptor/server/logging/accesslog.go
internal/net/grpc/interceptor/server/logging/accesslog_test.go
Expand Down Expand Up @@ -1814,6 +1821,11 @@ rust/Cargo.lock
rust/Cargo.toml
rust/bin/agent/Cargo.toml
rust/bin/agent/src/main.rs
rust/libs/ngt-rs/Cargo.toml
rust/libs/ngt-rs/build.rs
rust/libs/ngt-rs/src/input.cpp
rust/libs/ngt-rs/src/input.h
rust/libs/ngt-rs/src/lib.rs
rust/libs/ngt/Cargo.toml
rust/libs/ngt/src/lib.rs
rust/libs/proto/Cargo.toml
Expand All @@ -1836,6 +1848,7 @@ rust/libs/proto/src/sidecar.v1.rs
rust/libs/proto/src/sidecar.v1.tonic.rs
rust/libs/proto/src/vald.v1.rs
rust/libs/proto/src/vald.v1.tonic.rs
rust/rust-toolchain.toml
tests/chaos/chart/.helmignore
tests/chaos/chart/Chart.yaml
tests/chaos/chart/README.md
Expand Down Expand Up @@ -1881,6 +1894,7 @@ versions/OTEL_OPERATOR_VERSION
versions/PROMETHEUS_STACK_VERSION
versions/PROTOBUF_VERSION
versions/REVIEWDOG_VERSION
versions/RUST_VERSION
versions/TELEPRESENCE_VERSION
versions/VALDCLI_VERSION
versions/VALD_VERSION
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Go Version: 1.22.2
- Go Version: 1.22.3
- Rust Version: 1.77.2
- Docker Version: 20.10.8
- Kubernetes Version: v1.29.3
- Kubernetes Version: v1.30.0
- NGT Version: 2.2.1
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/security_issue_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ assignees: ""

<!--- Please change the versions below along with your environment -->

- Go Version: 1.22.2
- Go Version: 1.22.3
- Rust Version: 1.77.2
- Docker Version: 20.10.8
- Kubernetes Version: v1.29.3
- Kubernetes Version: v1.30.0
- NGT Version: 2.2.1
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

<!--- Please change the versions below along with your environment -->

- Go Version: 1.22.2
- Go Version: 1.22.3
- Rust Version: 1.77.2
- Docker Version: 20.10.8
- Kubernetes Version: v1.29.3
- Kubernetes Version: v1.30.0
- NGT Version: 2.2.1

### Checklist
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ ngt/install: /usr/local/include/NGT/Capi.h
## install Faiss
faiss/install: /usr/local/lib/libfaiss.so
/usr/local/lib/libfaiss.so:
curl -LO https://github.com/facebookresearch/faiss/archive/v$(FAISS_VERSION).tar.gz
curl -fsSLO https://github.com/facebookresearch/faiss/archive/v$(FAISS_VERSION).tar.gz
tar zxf v$(FAISS_VERSION).tar.gz -C $(TEMP_DIR)/
cd $(TEMP_DIR)/faiss-$(FAISS_VERSION) && \
cmake -DFAISS_ENABLE_GPU=OFF -DFAISS_ENABLE_PYTHON=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -B build . && \
Expand Down
4 changes: 2 additions & 2 deletions Makefile.d/client.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ valdcli/install: $(BINDIR)/valdcli
ifeq ($(UNAME),Darwin)
$(BINDIR)/valdcli:
mkdir -p $(BINDIR)
curl -LO https://github.com/rinx/vald-client-clj/releases/download/$(VALDCLI_VERSION)/valdcli-macos.zip
curl -fsSLO https://github.com/rinx/vald-client-clj/releases/download/$(VALDCLI_VERSION)/valdcli-macos.zip
unzip valdcli-macos.zip
rm -f valdcli-macos.zip
mv valdcli $(BINDIR)/valdcli
else
$(BINDIR)/valdcli:
mkdir -p $(BINDIR)
curl -LO https://github.com/rinx/vald-client-clj/releases/download/$(VALDCLI_VERSION)/valdcli-linux-static.zip
curl -fsSLO https://github.com/rinx/vald-client-clj/releases/download/$(VALDCLI_VERSION)/valdcli-linux-static.zip
unzip valdcli-linux-static.zip
rm -f valdcli-linux-static.zip
mv valdcli $(BINDIR)/valdcli
Expand Down
48 changes: 24 additions & 24 deletions Makefile.d/dependencies.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ rust/deps: \
.PHONY: update/chaos-mesh
## update chaos-mesh version
update/chaos-mesh:
curl --silent https://api.github.com/repos/chaos-mesh/chaos-mesh/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/CHAOS_MESH_VERSION
curl -fsSL https://api.github.com/repos/chaos-mesh/chaos-mesh/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/CHAOS_MESH_VERSION

.PHONY: update/k3s
## update k3s version
update/k3s:
@{ \
RESULT=$$(curl --silent https://hub.docker.com/v2/repositories/rancher/k3s/tags?page_size=1000 | jq -r '.results[].name' | grep -E '.*-k3s[0-9]+$$' | grep -v rc | sort -Vr | head -n 1); \
RESULT=$$(curl -fsSL https://hub.docker.com/v2/repositories/rancher/k3s/tags?page_size=1000 | jq -r '.results[].name' | grep -E '.*-k3s[0-9]+$$' | grep -v rc | sort -Vr | head -n 1); \
if [ -n "$$RESULT" ]; then \
echo $$RESULT > $(ROOTDIR)/versions/K3S_VERSION; \
else \
Expand All @@ -108,112 +108,112 @@ update/k3s:
.PHONY: update/go
## update go version
update/go:
curl --silent https://go.dev/VERSION?m=text | head -n 1 | sed -e 's/go//g' > $(ROOTDIR)/versions/GO_VERSION
curl -fsSL https://go.dev/VERSION?m=text | head -n 1 | sed -e 's/go//g' > $(ROOTDIR)/versions/GO_VERSION

.PHONY: update/golangci-lint
## update golangci-lint version
update/golangci-lint:
curl --silent https://api.github.com/repos/golangci/golangci-lint/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/GOLANGCILINT_VERSION
curl -fsSL https://api.github.com/repos/golangci/golangci-lint/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/GOLANGCILINT_VERSION

.PHONY: update/rust
## update rust version
update/rust:
curl --silent https://releases.rs | grep -Po 'Stable: \K[\d.]+\s' | head -n 1 > $(ROOTDIR)/versions/RUST_VERSION
curl -fsSL https://releases.rs | grep -Po 'Stable: \K[\d.]+\s' | head -n 1 > $(ROOTDIR)/versions/RUST_VERSION

.PHONY: update/helm
## update helm version
update/helm:
curl --silent https://api.github.com/repos/helm/helm/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/HELM_VERSION
curl -fsSL https://api.github.com/repos/helm/helm/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/HELM_VERSION

.PHONY: update/helm-operator
## update helm-operator version
update/helm-operator:
curl --silent https://quay.io/api/v1/repository/operator-framework/helm-operator | jq -r '.tags'| grep name | grep -v master |grep -v latest | grep -v rc | head -1 | sed -e 's/.*\"name\":\ \"\(.*\)\",/\1/g' > $(ROOTDIR)/versions/OPERATOR_SDK_VERSION
curl -fsSL https://quay.io/api/v1/repository/operator-framework/helm-operator | jq -r '.tags'| grep name | grep -v master |grep -v latest | grep -v rc | head -1 | sed -e 's/.*\"name\":\ \"\(.*\)\",/\1/g' > $(ROOTDIR)/versions/OPERATOR_SDK_VERSION

.PHONY: update/helm-docs
## update helm-docs version
update/helm-docs:
curl --silent https://api.github.com/repos/norwoodj/helm-docs/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/HELM_DOCS_VERSION
curl -fsSL https://api.github.com/repos/norwoodj/helm-docs/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/HELM_DOCS_VERSION

.PHONY: update/protobuf
## update protobuf version
update/protobuf:
curl --silent https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/PROTOBUF_VERSION
curl -fsSL https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/PROTOBUF_VERSION

.PHONY: update/kind
## update kind (kubernetes in docker) version
update/kind:
curl --silent https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/KIND_VERSION
curl -fsSL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/KIND_VERSION

.PHONY: update/kubectl
## update kubectl (kubernetes cli) version
update/kubectl:
curl -L -s https://dl.k8s.io/release/stable.txt > $(ROOTDIR)/versions/KUBECTL_VERSION
curl -fsSL https://dl.k8s.io/release/stable.txt > $(ROOTDIR)/versions/KUBECTL_VERSION

.PHONY: update/prometheus-stack
## update prometheus version
update/prometheus-stack:
curl --silent https://artifacthub.io/api/v1/packages/helm/prometheus-community/kube-prometheus-stack | jq .version | sed 's/"//g' > $(ROOTDIR)/versions/PROMETHEUS_STACK_VERSION
curl -fsSL https://artifacthub.io/api/v1/packages/helm/prometheus-community/kube-prometheus-stack | jq .version | sed 's/"//g' > $(ROOTDIR)/versions/PROMETHEUS_STACK_VERSION

.PHONY: update/jaeger-operator
## update jaeger-operator version
update/jaeger-operator:
curl --silent https://artifacthub.io/api/v1/packages/helm/jaegertracing/jaeger-operator | jq .version | sed 's/"//g' > $(ROOTDIR)/versions/JAEGER_OPERATOR_VERSION
curl -fsSL https://artifacthub.io/api/v1/packages/helm/jaegertracing/jaeger-operator | jq .version | sed 's/"//g' > $(ROOTDIR)/versions/JAEGER_OPERATOR_VERSION

.PHONY: update/kube-linter
## update kube-linter version
update/kube-linter:
curl --silent https://api.github.com/repos/stackrox/kube-linter/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/KUBELINTER_VERSION
curl -fsSL https://api.github.com/repos/stackrox/kube-linter/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/KUBELINTER_VERSION

# .PHONY: update/otel-operator
# ## update otel-operator version
# update/otel-operator:
# curl --silent https://api.github.com/repos/open-telemetry/opentelemetry-operator/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/OTEL_OPERATOR_VERSION
# curl -fsSL https://api.github.com/repos/open-telemetry/opentelemetry-operator/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/OTEL_OPERATOR_VERSION

.PHONY: update/ngt
## update yahoojapan/NGT version
update/ngt:
curl --silent https://api.github.com/repos/yahoojapan/NGT/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/NGT_VERSION
curl -fsSL https://api.github.com/repos/yahoojapan/NGT/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/NGT_VERSION

.PHONY: update/faiss
## update facebookresearch/faiss version
update/faiss:
curl --silent https://api.github.com/repos/facebookresearch/faiss/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/FAISS_VERSION
curl -fsSL https://api.github.com/repos/facebookresearch/faiss/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/FAISS_VERSION

.PHONY: update/reviewdog
## update reviewdog version
update/reviewdog:
curl --silent https://api.github.com/repos/reviewdog/reviewdog/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/REVIEWDOG_VERSION
curl -fsSL https://api.github.com/repos/reviewdog/reviewdog/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/REVIEWDOG_VERSION

.PHONY: update/telepresence
## update telepresence version
update/telepresence:
curl --silent https://api.github.com/repos/telepresenceio/telepresence/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/TELEPRESENCE_VERSION
curl -fsSL https://api.github.com/repos/telepresenceio/telepresence/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/TELEPRESENCE_VERSION

.PHONY: update/yq
## update YQ version
update/yq:
curl --silent https://api.github.com/repos/mikefarah/yq/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/YQ_VERSION
curl -fsSL https://api.github.com/repos/mikefarah/yq/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/YQ_VERSION

.PHONY: update/zlib
## update zlib version
update/zlib:
curl --silent https://api.github.com/repos/madler/zlib/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/ZLIB_VERSION
curl -fsSL https://api.github.com/repos/madler/zlib/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/ZLIB_VERSION

.PHONY: update/hdf5
## update hdf5 version
update/hdf5:
curl --silent https://api.github.com/repos/HDFGroup/hdf5/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/HDF5_VERSION
curl -fsSL https://api.github.com/repos/HDFGroup/hdf5/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' > $(ROOTDIR)/versions/HDF5_VERSION

.PHONY: update/vald
## update vald it's self version
update/vald:
curl --silent https://api.github.com/repos/vdaas/vald/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/VALD_VERSION
curl -fsSL https://api.github.com/repos/vdaas/vald/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/VALD_VERSION

.PHONY: update/valdcli
## update vald client library made by clojure self version
update/valdcli:
curl --silent https://api.github.com/repos/vdaas/vald-client-clj/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/VALDCLI_VERSION
curl -fsSL https://api.github.com/repos/vdaas/vald-client-clj/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' > $(ROOTDIR)/versions/VALDCLI_VERSION

.PHONY: update/template
## update PULL_REQUEST_TEMPLATE and ISSUE_TEMPLATE
Expand Down
7 changes: 4 additions & 3 deletions Makefile.d/functions.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ endef

define update-github-actions
@for ACTION_NAME in $1; do \
if [ -n "$$ACTION_NAME" ]; then \
if [ -n "$$ACTION_NAME" ] && [ "$$ACTION_NAME" != "security-and-quality" ]; then \
FILE_NAME=`echo $$ACTION_NAME | tr '/' '_' | tr '-' '_' | tr '[:lower:]' '[:upper:]'`; \
if [ -n "$$FILE_NAME" ]; then \
if [ "$$ACTION_NAME" = "aquasecurity/trivy-action" ] || [ "$$ACTION_NAME" = "machine-learning-apps/actions-chatops" ]; then \
Expand All @@ -343,10 +343,11 @@ define update-github-actions
VERSION="1.0.0"; \
else \
REPO_NAME=`echo $$ACTION_NAME | cut -d'/' -f1-2`; \
VERSION=`curl --silent https://api.github.com/repos/$$REPO_NAME/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' | sed -E 's/[^0-9.]+//g'`;\
VERSION=`curl -fsSL https://api.github.com/repos/$$REPO_NAME/releases/latest | grep -Po '"tag_name": "\K.*?(?=")' | sed 's/v//g' | sed -E 's/[^0-9.]+//g'`;\
fi; \
if [ -n "$$VERSION" ]; then \
echo "updating $$ACTION_NAME version file $$FILE_NAME to $$VERSION"; \
OLD_VERSION=`cat $(ROOTDIR)/versions/actions/$$FILE_NAME`; \
echo "updating $$ACTION_NAME version file $$FILE_NAME from $$OLD_VERSION to $$VERSION"; \
echo $$VERSION > $(ROOTDIR)/versions/actions/$$FILE_NAME; \
else \
VERSION=`cat $(ROOTDIR)/versions/actions/$$FILE_NAME`; \
Expand Down
6 changes: 3 additions & 3 deletions Makefile.d/helm.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ helm/install: $(BINDIR)/helm

$(BINDIR)/helm:
mkdir -p $(BINDIR)
curl "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | HELM_INSTALL_DIR=$(BINDIR) bash
curl -fsSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | HELM_INSTALL_DIR=$(BINDIR) bash

.PHONY: helm-docs/install
## install helm-docs
Expand All @@ -29,7 +29,7 @@ helm-docs/install: $(BINDIR)/helm-docs
$(BINDIR)/helm-docs:
mkdir -p $(BINDIR)
cd $(TEMP_DIR) \
&& curl -LO https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
&& curl -fsSLO https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
&& tar xzvf helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
&& mv helm-docs $(BINDIR)/helm-docs

Expand Down Expand Up @@ -156,7 +156,7 @@ yq/install: $(BINDIR)/yq
$(BINDIR)/yq:
mkdir -p $(BINDIR)
cd $(TEMP_DIR) \
&& curl -L 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 $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/yq \
&& chmod a+x $(BINDIR)/yq

.PHONY: helm/schema/crd/all
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/k3d.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ k3d/install: $(BINDIR)/k3d

$(BINDIR)/k3d:
mkdir -p $(BINDIR)
curl -sS https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
curl -fsSL https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
chmod a+x $(BINDIR)/$(K3D_COMMAND)

.PHONY: k3d/start
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/k8s.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,5 +566,5 @@ kubelinter/install: $(BINDIR)/kube-linter
$(BINDIR)/kube-linter:
mkdir -p $(BINDIR)
cd $(TEMP_DIR) \
&& curl -L https://github.com/stackrox/kube-linter/releases/download/$(KUBELINTER_VERSION)/kube-linter-$(OS) -o $(BINDIR)/kube-linter \
&& curl -fsSL https://github.com/stackrox/kube-linter/releases/download/$(KUBELINTER_VERSION)/kube-linter-$(OS) -o $(BINDIR)/kube-linter \
&& chmod a+x $(BINDIR)/kube-linter
2 changes: 1 addition & 1 deletion Makefile.d/kind.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ kind/install: $(BINDIR)/kind

$(BINDIR)/kind:
mkdir -p $(BINDIR)
curl -L https://github.com/kubernetes-sigs/kind/releases/download/$(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 $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/kind
chmod a+x $(BINDIR)/kind

.PHONY: kind/start
Expand Down
2 changes: 1 addition & 1 deletion Makefile.d/minikube.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ minikube/install: $(BINDIR)/minikube

$(BINDIR)/minikube:
mkdir -p $(BINDIR)
curl -L https://storage.googleapis.com/minikube/releases/latest/minikube-$(OS)-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/minikube
curl -fsSL https://storage.googleapis.com/minikube/releases/latest/minikube-$(OS)-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/minikube
chmod a+x $(BINDIR)/minikube

# Start minikube with CSI Driver and Volume Snapshots support
Expand Down
1 change: 1 addition & 0 deletions Makefile.d/proto.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ proto/all: \
## clean proto artifacts
proto/clean:
find apis/grpc -name "*.pb.go" | xargs -P$(CORES) rm -f
find apis/grpc -name "*.pb.json.go" | xargs -P$(CORES) rm -f
rm -rf apis/swagger apis/docs

.PHONY: proto/paths/print
Expand Down
Loading

0 comments on commit 6d4b505

Please sign in to comment.