From d6f06c1de244b3ac2a3b62100be641fc5041af52 Mon Sep 17 00:00:00 2001 From: kpango Date: Wed, 14 Feb 2024 16:59:17 +0900 Subject: [PATCH] [bugfix] gcc environment for ARM Fix format-diff error problem (#2345) Merge branch 'main' into bugfix/docker/gcc-environment-for-arm fix: warning message for diff Bugfix go binary execution for format and crd (#2348) fix: checkout cargo.lock file Bugfix go binary execution for format and crd (#2348) Fix setup-helm version (#2349) Signed-off-by: kpango --- .github/actions/setup-helm/action.yaml | 4 +- .../workflows/dockers-agent-faiss-image.yml | 84 ++++++++++++ .github/workflows/dockers-agent-ngt-image.yml | 1 + .../workflows/dockers-benchmark-job-image.yml | 1 + .../workflows/dockers-helm-operator-image.yml | 1 + .github/workflows/format.yml | 6 +- Makefile | 12 +- Makefile.d/actions.mk | 2 +- Makefile.d/build.mk | 26 ++-- Makefile.d/docker.mk | 8 +- Makefile.d/functions.mk | 32 ++++- Makefile.d/helm.mk | 55 +++----- Makefile.d/k8s.mk | 22 ++-- Makefile.d/kind.mk | 2 +- Makefile.d/minikube.mk | 2 +- Makefile.d/tools.mk | 14 +- .../{ => schemas}/job-values.schema.json | 0 .../{ => schemas}/scenario-values.schema.json | 0 dockers/agent/core/faiss/Dockerfile | 18 +-- dockers/agent/core/ngt/Dockerfile | 18 +-- dockers/agent/sidecar/Dockerfile | 17 +-- dockers/ci/base/Dockerfile | 15 +-- dockers/dev/Dockerfile | 15 +-- dockers/discoverer/k8s/Dockerfile | 17 +-- dockers/gateway/filter/Dockerfile | 17 +-- dockers/gateway/lb/Dockerfile | 17 +-- dockers/gateway/mirror/Dockerfile | 17 +-- dockers/index/job/correction/Dockerfile | 17 +-- dockers/index/job/creation/Dockerfile | 17 +-- .../index/job/readreplica/rotate/Dockerfile | 17 +-- dockers/index/job/save/Dockerfile | 17 +-- dockers/manager/index/Dockerfile | 17 +-- dockers/operator/helm/Dockerfile | 27 ++-- dockers/tools/benchmark/job/Dockerfile | 17 +-- dockers/tools/benchmark/operator/Dockerfile | 17 +-- dockers/tools/cli/loadtest/Dockerfile | 19 +-- example/client/go.mod | 14 +- example/client/go.sum | 16 +-- go.mod | 70 +++++----- go.sum | 121 +++++++++--------- versions/GOLANGCILINT_VERSION | 2 +- versions/REVIEWDOG_VERSION | 2 +- versions/TELEPRESENCE_VERSION | 2 +- versions/YQ_VERSION | 2 +- versions/actions/AZURE_SETUP_HELM | 2 +- 45 files changed, 380 insertions(+), 439 deletions(-) create mode 100644 .github/workflows/dockers-agent-faiss-image.yml rename charts/vald-benchmark-operator/{ => schemas}/job-values.schema.json (100%) rename charts/vald-benchmark-operator/{ => schemas}/scenario-values.schema.json (100%) diff --git a/.github/actions/setup-helm/action.yaml b/.github/actions/setup-helm/action.yaml index 8cd16ea7120..836869a9221 100644 --- a/.github/actions/setup-helm/action.yaml +++ b/.github/actions/setup-helm/action.yaml @@ -32,7 +32,9 @@ runs: echo "version=${HELM_VERSION}" >> $GITHUB_OUTPUT env: HELM_VERSION: ${{ inputs.helm_version }} - - uses: azure/setup-helm@v3 + # This will change when the v4 version is released. + # Ref: https://github.com/Azure/setup-helm/issues/126 + - uses: azure/setup-helm@v4.0.0 with: version: ${{ steps.helm_version.outputs.version }} - name: Check Helm version diff --git a/.github/workflows/dockers-agent-faiss-image.yml b/.github/workflows/dockers-agent-faiss-image.yml new file mode 100644 index 00000000000..297aca6ea90 --- /dev/null +++ b/.github/workflows/dockers-agent-faiss-image.yml @@ -0,0 +1,84 @@ +# +# Copyright (C) 2019-2024 vdaas.org vald team +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# You may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +name: "Build docker image: agent-faiss" +on: + push: + branches: + - "main" + - "release/v*.*" + - "!release/v*.*.*" + tags: + - "*.*.*" + - "v*.*.*" + - "*.*.*-*" + - "v*.*.*-*" + paths: + - ".github/actions/docker-build/actions.yaml" + - ".github/workflows/_docker-image.yaml" + - ".github/workflows/dockers-agent-faiss-image.yml" + - "go.mod" + - "go.sum" + - "internal/**" + - "!internal/**/*_test.go" + - "!internal/db/**" + - "!internal/k8s/**" + - "apis/grpc/**" + - "pkg/agent/core/faiss/**" + - "cmd/agent/core/faiss/**" + - "dockers/agent/core/faiss/Dockerfile" + - "versions/GO_VERSION" + - "versions/FAISS_VERSION" + pull_request: + paths: + - ".github/actions/docker-build/actions.yaml" + - ".github/workflows/_docker-image.yaml" + - ".github/workflows/dockers-agent-faiss-image.yml" + - "go.mod" + - "go.sum" + - "internal/**" + - "!internal/**/*_test.go" + - "!internal/db/**" + - "!internal/k8s/**" + - "apis/grpc/**" + - "pkg/agent/core/faiss/**" + - "cmd/agent/core/faiss/**" + - "dockers/agent/core/faiss/Dockerfile" + - "versions/GO_VERSION" + - "versions/FAISS_VERSION" + pull_request_target: + paths: + - ".github/actions/docker-build/actions.yaml" + - ".github/workflows/_docker-image.yaml" + - ".github/workflows/dockers-agent-faiss-image.yml" + - "go.mod" + - "go.sum" + - "internal/**" + - "!internal/**/*_test.go" + - "!internal/db/**" + - "!internal/k8s/**" + - "apis/grpc/**" + - "pkg/agent/core/faiss/**" + - "cmd/agent/core/faiss/**" + - "dockers/agent/core/faiss/Dockerfile" + - "versions/GO_VERSION" + - "versions/FAISS_VERSION" +jobs: + build: + uses: ./.github/workflows/_docker-image.yaml + with: + target: agent-faiss + platforms: linux/amd64 + secrets: inherit diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml index f786cc5bce7..64ab26c4701 100644 --- a/.github/workflows/dockers-agent-ngt-image.yml +++ b/.github/workflows/dockers-agent-ngt-image.yml @@ -80,4 +80,5 @@ jobs: uses: ./.github/workflows/_docker-image.yaml with: target: agent-ngt + platforms: linux/amd64,linux/arm64 secrets: inherit diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml index 52abd5addc7..d86c454edcb 100644 --- a/.github/workflows/dockers-benchmark-job-image.yml +++ b/.github/workflows/dockers-benchmark-job-image.yml @@ -78,4 +78,5 @@ jobs: uses: ./.github/workflows/_docker-image.yaml with: target: benchmark-job + platforms: linux/amd64,linux/arm64 secrets: inherit diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml index 1050a6e56bd..1c9aba06169 100644 --- a/.github/workflows/dockers-helm-operator-image.yml +++ b/.github/workflows/dockers-helm-operator-image.yml @@ -68,4 +68,5 @@ jobs: uses: ./.github/workflows/_docker-image.yaml with: target: operator/helm + platforms: linux/amd64,linux/arm64 secrets: inherit diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 21becc85221..7cc66cea3db 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -59,7 +59,7 @@ jobs: - name: Run formatter and license.go run: | make format - git checkout go.mod go.sum + git checkout go.mod go.sum ./rust/Cargo.lock - name: Check and Push to main branch continue-on-error: true run: | @@ -105,13 +105,13 @@ jobs: run: | make deps/install make format - git checkout go.mod go.sum + git checkout go.mod go.sum ./rust/Cargo.lock - name: Check format and deps difference run: | if git diff --quiet --exit-code; then echo "Nothing updated" else git diff - echo "Please execute \`make format\` and \`make deps/install\` locally." + echo "Please execute \`make format\` locally." exit 1 fi diff --git a/Makefile b/Makefile index f58e60a03fa..d255ced9c20 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ DATETIME = $(eval DATETIME := $(shell date -u +%Y/%m/%d_% TAG ?= latest CRORG ?= $(ORG) GHCRORG = ghcr.io/$(ORG)/$(NAME) -AGENT_IMAGE = $(NAME)-agent-ngt +AGENT_NGT_IMAGE = $(NAME)-agent-ngt +AGENT_FAISS_IMAGE = $(NAME)-agent-faiss AGENT_SIDECAR_IMAGE = $(NAME)-agent-sidecar CI_CONTAINER_IMAGE = $(NAME)-ci-container DEV_CONTAINER_IMAGE = $(NAME)-dev-container @@ -97,6 +98,7 @@ SWAP_TAG ?= latest BINDIR ?= /usr/local/bin UNAME := $(eval UNAME := $(shell uname -s))$(UNAME) +OS := $(eval OS := $(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]'))$(OS) ARCH := $(eval ARCH := $(shell uname -m))$(ARCH) PWD := $(eval PWD := $(shell pwd))$(PWD) @@ -386,11 +388,7 @@ clean-generated: .PHONY: license ## add license to files license: - GOPRIVATE=$(GOPRIVATE) \ - MAINTAINER=$(MAINTAINER) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/license/gen/main.go $(ROOTDIR) + $(call gen-license,$(ROOTDIR),$(MAINTAINER)) .PHONY: init ## initialize development environment @@ -571,7 +569,7 @@ faiss/install: /usr/local/lib/libfaiss.so curl -LO 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 -DBUILD_SHARED_LIBS=ON -B build . && \ + cmake -DFAISS_ENABLE_GPU=OFF -DFAISS_ENABLE_PYTHON=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -B build . && \ make -C build -j faiss && \ make -C build install rm -rf v$(FAISS_VERSION).tar.gz diff --git a/Makefile.d/actions.mk b/Makefile.d/actions.mk index dbec6376240..9c0ad6dc6f1 100644 --- a/Makefile.d/actions.mk +++ b/Makefile.d/actions.mk @@ -24,4 +24,4 @@ list/actions: .PHONY: update/actions # update github actions version update/actions: - @$(call update-github-actions, $(ACTIONS_LIST)) + $(call update-github-actions, $(ACTIONS_LIST)) diff --git a/Makefile.d/build.mk b/Makefile.d/build.mk index da3854a5687..677324bfdeb 100644 --- a/Makefile.d/build.mk +++ b/Makefile.d/build.mk @@ -36,7 +36,7 @@ binary/build: \ cmd/agent/core/ngt/ngt: \ ngt/install $(eval CGO_ENABLED = 1) - $(call go-build,agent/core/ngt,-linkmode 'external',-fPIC -pthread -fopenmp -std=gnu++20 -lstdc++ -lm -z relro -z now $(EXTLDFLAGS), cgo,NGT-$(NGT_VERSION),$@) + $(call go-build,agent/core/ngt,-linkmode 'external',-static -fPIC -pthread -fopenmp -std=gnu++20 -lstdc++ -lm -z relro -z now $(EXTLDFLAGS), cgo,NGT-$(NGT_VERSION),$@) cmd/agent/core/faiss/faiss: \ faiss/install @@ -45,50 +45,50 @@ cmd/agent/core/faiss/faiss: \ cmd/agent/sidecar/sidecar: $(eval CGO_ENABLED = 0) - $(call go-build,agent/sidecar,,,,,$@) + $(call go-build,agent/sidecar,,-static,,,$@) cmd/discoverer/k8s/discoverer: $(eval CGO_ENABLED = 0) - $(call go-build,discoverer/k8s,,,,,$@) + $(call go-build,discoverer/k8s,,-static,,,$@) cmd/gateway/lb/lb: $(eval CGO_ENABLED = 0) - $(call go-build,gateway/lb,,,,,$@) + $(call go-build,gateway/lb,,-static,,,$@) cmd/gateway/filter/filter: $(eval CGO_ENABLED = 0) - $(call go-build,gateway/filter,,,,,$@) + $(call go-build,gateway/filter,,-static,,,$@) cmd/gateway/mirror/mirror: $(eval CGO_ENABLED = 0) - $(call go-build,gateway/mirror,,,,,$@) + $(call go-build,gateway/mirror,,-static,,,$@) cmd/manager/index/index: $(eval CGO_ENABLED = 0) - $(call go-build,manager/index,,,,,$@) + $(call go-build,manager/index,,-static,,,$@) cmd/index/job/correction/index-correction: $(eval CGO_ENABLED = 0) - $(call go-build,index/job/correction,,,,,$@) + $(call go-build,index/job/correction,,-static,,,$@) cmd/index/job/creation/index-creation: $(eval CGO_ENABLED = 0) - $(call go-build,index/job/creation,,,,,$@) + $(call go-build,index/job/creation,,-static,,,$@) cmd/index/job/save/index-save: $(eval CGO_ENABLED = 0) - $(call go-build,index/job/save,,,,,$@) + $(call go-build,index/job/save,,-static,,,$@) cmd/index/job/readreplica/rotate/readreplica-rotate: $(eval CGO_ENABLED = 0) - $(call go-build,index/job/readreplica/rotate,,,,,$@) + $(call go-build,index/job/readreplica/rotate,,-static,,,$@) cmd/tools/benchmark/job/job: - $(call go-build,tools/benchmark/job,-linkmode 'external',-fPIC -pthread -fopenmp -std=gnu++20 -lhdf5 -lhdf5_hl -lm -ldl, cgo,$(HDF5_VERSION),$@) + $(call go-build,tools/benchmark/job,-linkmode 'external',-static -fPIC -pthread -fopenmp -std=gnu++20 -lhdf5 -lhdf5_hl -lm -ldl, cgo,$(HDF5_VERSION),$@) cmd/tools/benchmark/operator/operator: $(eval CGO_ENABLED = 0) - $(call go-build,tools/benchmark/operator,,,,,$@) + $(call go-build,tools/benchmark/operator,,-static,,,$@) .PHONY: binary/build/zip ## build all binaries and zip them diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 3eec0178596..059faea0743 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -77,24 +77,24 @@ endif .PHONY: docker/name/agent-ngt docker/name/agent-ngt: - @echo "$(ORG)/$(AGENT_IMAGE)" + @echo "$(ORG)/$(AGENT_NGT_IMAGE)" .PHONY: docker/build/agent-ngt ## build agent-ngt image docker/build/agent-ngt: @make DOCKERFILE="$(ROOTDIR)/dockers/agent/core/ngt/Dockerfile" \ - IMAGE=$(AGENT_IMAGE) \ + IMAGE=$(AGENT_NGT_IMAGE) \ docker/build/image .PHONY: docker/name/agent-faiss docker/name/agent-faiss: - @echo "$(ORG)/$(AGENT_IMAGE)" + @echo "$(ORG)/$(AGENT_FAISS_IMAGE)" .PHONY: docker/build/agent-faiss ## build agent-faiss image docker/build/agent-faiss: @make DOCKERFILE="$(ROOTDIR)/dockers/agent/core/faiss/Dockerfile" \ - IMAGE=$(AGENT_IMAGE) \ + IMAGE=$(AGENT_FAISS_IMAGE) \ docker/build/image .PHONY: docker/name/agent-sidecar diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk index 753349cd97f..bfa81d228da 100644 --- a/Makefile.d/functions.mk +++ b/Makefile.d/functions.mk @@ -70,7 +70,7 @@ define go-build GO_VERSION=$(GO_VERSION) \ go build \ --ldflags "-w $2 \ - -extldflags '-static $3' \ + -extldflags '$3' \ -X '$(GOPKG)/internal/info.AlgorithmInfo=$5' \ -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ @@ -278,15 +278,41 @@ define gen-go-option-test-sources done endef +define gen-license + BIN_PATH="$(TEMP_DIR)/vald-license-gen"; \ + rm -rf $$BIN_PATH; \ + MAINTAINER=$2 \ + GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ + go build -mod=readonly -a -o $$BIN_PATH $(ROOTDIR)/hack/license/gen/main.go; \ + $$BIN_PATH $1; \ + rm -rf $$BIN_PATH +endef + +define gen-vald-helm-schema + BIN_PATH="$(TEMP_DIR)/vald-helm-schema-gen"; \ + rm -rf $$BIN_PATH; \ + GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ + go build -mod=readonly -a -o $$BIN_PATH $(ROOTDIR)/hack/helm/schema/gen/main.go; \ + $$BIN_PATH charts/$1.yaml > charts/$1.schema.json; \ + rm -rf $$BIN_PATH +endef + define gen-vald-crd if [[ -f $(ROOTDIR)/charts/$1/crds/$2.yaml ]]; then \ mv $(ROOTDIR)/charts/$1/crds/$2.yaml $(TEMP_DIR)/$2.yaml; \ fi; + BIN_PATH="$(TEMP_DIR)/vald-helm-crd-schema-gen"; \ + rm -rf $$BIN_PATH; \ GOPRIVATE=$(GOPRIVATE) \ GOARCH=$(GOARCH) \ GOOS=$(GOOS) \ - go run -mod=readonly $(ROOTDIR)/hack/helm/schema/crd/main.go \ - $(ROOTDIR)/charts/$3.yaml > $(TEMP_DIR)/$2-spec.yaml + go build -mod=readonly -a -o $$BIN_PATH $(ROOTDIR)/hack/helm/schema/crd/main.go; \ + $$BIN_PATH $(ROOTDIR)/charts/$3.yaml > $(TEMP_DIR)/$2-spec.yaml; \ + rm -rf $$BIN_PATH; \ $(BINDIR)/yq eval-all 'select(fileIndex==0).spec.versions[0].schema.openAPIV3Schema.properties.spec = select(fileIndex==1).spec | select(fileIndex==0)' \ $(TEMP_DIR)/$2.yaml $(TEMP_DIR)/$2-spec.yaml > $(ROOTDIR)/charts/$1/crds/$2.yaml endef diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk index 90dccf378ec..300892c4665 100644 --- a/Makefile.d/helm.mk +++ b/Makefile.d/helm.mk @@ -93,61 +93,40 @@ helm/schema/all: \ helm/schema/vald: charts/vald/values.schema.json charts/vald/values.schema.json: \ - charts/vald/values.yaml \ - hack/helm/schema/gen/main.go - GOPRIVATE=$(GOPRIVATE) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/helm/schema/gen/main.go charts/vald/values.yaml > charts/vald/values.schema.json + charts/vald/values.yaml + $(call gen-vald-helm-schema,vald/values) .PHONY: helm/schema/vald-helm-operator ## generate json schema for Vald Helm Operator Chart helm/schema/vald-helm-operator: charts/vald-helm-operator/values.schema.json charts/vald-helm-operator/values.schema.json: \ - charts/vald-helm-operator/values.yaml \ - hack/helm/schema/gen/main.go - GOPRIVATE=$(GOPRIVATE) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/helm/schema/gen/main.go charts/vald-helm-operator/values.yaml > charts/vald-helm-operator/values.schema.json + charts/vald-helm-operator/values.yaml + $(call gen-vald-helm-schema,vald-helm-operator/values) .PHONY: helm/schema/vald-benchmark-job ## generate json schema for Vald Benchmark Job Chart helm/schema/vald-benchmark-job: charts/vald-benchmark-operator/job-values.schema.json charts/vald-benchmark-operator/job-values.schema.json: \ - charts/vald-benchmark-operator/schemas/job-values.yaml \ - hack/helm/schema/gen/main.go - GOPRIVATE=$(GOPRIVATE) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/helm/schema/gen/main.go charts/vald-benchmark-operator/schemas/job-values.yaml > charts/vald-benchmark-operator/job-values.schema.json + charts/vald-benchmark-operator/schemas/job-values.yaml + $(call gen-vald-helm-schema,vald-benchmark-operator/schemas/job-values) .PHONY: helm/schema/vald-benchmark-scenario ## generate json schema for Vald Benchmark Job Chart helm/schema/vald-benchmark-scenario: charts/vald-benchmark-operator/scenario-values.schema.json charts/vald-benchmark-operator/scenario-values.schema.json: \ - charts/vald-benchmark-operator/schemas/scenario-values.yaml \ - hack/helm/schema/gen/main.go - GOPRIVATE=$(GOPRIVATE) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/helm/schema/gen/main.go charts/vald-benchmark-operator/schemas/scenario-values.yaml > charts/vald-benchmark-operator/scenario-values.schema.json + charts/vald-benchmark-operator/schemas/scenario-values.yaml + $(call gen-vald-helm-schema,vald-benchmark-operator/schemas/scenario-values) .PHONY: helm/schema/vald-benchmark-operator ## generate json schema for Vald Benchmark Operator Chart helm/schema/vald-benchmark-operator: charts/vald-benchmark-operator/values.schema.json charts/vald-benchmark-operator/values.schema.json: \ - charts/vald-benchmark-operator/values.yaml \ - hack/helm/schema/gen/main.go - GOPRIVATE=$(GOPRIVATE) \ - GOARCH=$(GOARCH) \ - GOOS=$(GOOS) \ - go run -mod=readonly hack/helm/schema/gen/main.go charts/vald-benchmark-operator/values.yaml > charts/vald-benchmark-operator/values.schema.json - + charts/vald-benchmark-operator/values.yaml + $(call gen-vald-helm-schema,vald-benchmark-operator/values) .PHONY: yq/install ## install yq @@ -156,7 +135,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_$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')_$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/yq \ + && 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 \ && chmod a+x $(BINDIR)/yq .PHONY: helm/schema/crd/all @@ -172,34 +151,34 @@ helm/schema/crd/all: \ ## generate OpenAPI v3 schema for ValdRelease helm/schema/crd/vald: \ yq/install - @$(call gen-vald-crd,vald-helm-operator,valdrelease,vald/values) + $(call gen-vald-crd,vald-helm-operator,valdrelease,vald/values) .PHONY: helm/schema/crd/vald-helm-operator ## generate OpenAPI v3 schema for ValdHelmOperatorRelease helm/schema/crd/vald-helm-operator: \ yq/install - @$(call gen-vald-crd,vald-helm-operator,valdhelmoperatorrelease,vald-helm-operator/values) + $(call gen-vald-crd,vald-helm-operator,valdhelmoperatorrelease,vald-helm-operator/values) .PHONY: helm/schema/crd/vald/mirror-target ## generate OpenAPI v3 schema for ValdMirrorTarget helm/schema/crd/vald/mirror-target: \ yq/install - @$(call gen-vald-crd,vald,valdmirrortarget,vald/schemas/mirror-target-values) + $(call gen-vald-crd,vald,valdmirrortarget,vald/schemas/mirror-target-values) .PHONY: helm/schema/crd/vald-benchmark-job ## generate OpenAPI v3 schema for ValdBenchmarkJobRelease helm/schema/crd/vald-benchmark-job: \ yq/install - @$(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkjob,vald-benchmark-operator/schemas/job-values) + $(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkjob,vald-benchmark-operator/schemas/job-values) .PHONY: helm/schema/crd/vald-benchmark-scenario ## generate OpenAPI v3 schema for ValdBenchmarkScenarioRelease helm/schema/crd/vald-benchmark-scenario: \ yq/install - @$(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkscenario,vald-benchmark-operator/schemas/scenario-values) + $(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkscenario,vald-benchmark-operator/schemas/scenario-values) .PHONY: helm/schema/crd/vald-benchmark-operator ## generate OpenAPI v3 schema for ValdBenchmarkOperatorRelease helm/schema/crd/vald-benchmark-operator: \ yq/install - @$(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkoperatorrelease,vald-benchmark-operator/values) + $(call gen-vald-crd,vald-benchmark-operator,valdbenchmarkoperatorrelease,vald-benchmark-operator/values) diff --git a/Makefile.d/k8s.mk b/Makefile.d/k8s.mk index a522123f70b..4dbeaa150e0 100644 --- a/Makefile.d/k8s.mk +++ b/Makefile.d/k8s.mk @@ -95,7 +95,7 @@ k8s/vald/deploy: helm template \ --values $(HELM_VALUES) \ --set defaults.image.tag=$(VERSION) \ - --set agent.image.repository=$(CRORG)/$(AGENT_IMAGE) \ + --set agent.image.repository=$(CRORG)/$(AGENT_NGT_IMAGE) \ --set agent.sidecar.image.repository=$(CRORG)/$(AGENT_SIDECAR_IMAGE) \ --set discoverer.image.repository=$(CRORG)/$(DISCOVERER_IMAGE) \ --set gateway.filter.image.repository=$(CRORG)/$(FILTER_GATEWAY_IMAGE) \ @@ -131,7 +131,7 @@ k8s/vald/delete: helm template \ --values $(HELM_VALUES) \ --set defaults.image.tag=$(VERSION) \ - --set agent.image.repository=$(CRORG)/$(AGENT_IMAGE) \ + --set agent.image.repository=$(CRORG)/$(AGENT_NGT_IMAGE) \ --set agent.sidecar.image.repository=$(CRORG)/$(AGENT_SIDECAR_IMAGE) \ --set discoverer.image.repository=$(CRORG)/$(DISCOVERER_IMAGE) \ --set gateway.filter.image.repository=$(CRORG)/$(FILTER_GATEWAY_IMAGE) \ @@ -224,7 +224,7 @@ k8s/vald-readreplica/deploy: helm template \ --values $(HELM_VALUES) \ --set defaults.image.tag=$(VERSION) \ - --set agent.image.repository=$(CRORG)/$(AGENT_IMAGE) \ + --set agent.image.repository=$(CRORG)/$(AGENT_NGT_IMAGE) \ --set agent.sidecar.image.repository=$(CRORG)/$(AGENT_SIDECAR_IMAGE) \ --set discoverer.image.repository=$(CRORG)/$(DISCOVERER_IMAGE) \ --set gateway.filter.image.repository=$(CRORG)/$(FILTER_GATEWAY_IMAGE) \ @@ -245,7 +245,7 @@ k8s/vald-readreplica/delete: helm template \ --values $(HELM_VALUES) \ --set defaults.image.tag=$(VERSION) \ - --set agent.image.repository=$(CRORG)/$(AGENT_IMAGE) \ + --set agent.image.repository=$(CRORG)/$(AGENT_NGT_IMAGE) \ --set agent.sidecar.image.repository=$(CRORG)/$(AGENT_SIDECAR_IMAGE) \ --set discoverer.image.repository=$(CRORG)/$(DISCOVERER_IMAGE) \ --set gateway.filter.image.repository=$(CRORG)/$(FILTER_GATEWAY_IMAGE) \ @@ -510,33 +510,33 @@ telepresence/install: $(BINDIR)/telepresence $(BINDIR)/telepresence: mkdir -p $(BINDIR) cd $(TEMP_DIR) \ - && curl -fsSL "https://app.getambassador.io/download/tel2oss/releases/download/v$(TELEPRESENCE_VERSION)/telepresence-$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')-$(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 $(ARCH) | tr '[:upper:]' '[:lower:]'))" -o $(BINDIR)/telepresence \ && chmod a+x $(BINDIR)/telepresence .PHONY: telepresence/swap/agent-ngt ## swap agent-ngt deployment using telepresence telepresence/swap/agent-ngt: - @$(call telepresence,vald-agent-ngt,vdaas/vald-agent-ngt) + $(call telepresence,vald-agent-ngt,vdaas/vald-agent-ngt) .PHONY: telepresence/swap/agent-faiss ## swap agent-faiss deployment using telepresence telepresence/swap/agent-faiss: - @$(call telepresence,vald-agent-faiss,vdaas/vald-agent-faiss) + $(call telepresence,vald-agent-faiss,vdaas/vald-agent-faiss) .PHONY: telepresence/swap/discoverer ## swap discoverer deployment using telepresence telepresence/swap/discoverer: - @$(call telepresence,vald-discoverer,vdaas/vald-discoverer-k8s) + $(call telepresence,vald-discoverer,vdaas/vald-discoverer-k8s) .PHONY: telepresence/swap/manager-index ## swap manager-index deployment using telepresence telepresence/swap/manager-index: - @$(call telepresence,vald-manager-index,vdaas/vald-manager-index) + $(call telepresence,vald-manager-index,vdaas/vald-manager-index) .PHONY: telepresence/swap/lb-gateway ## swap lb-gateway deployment using telepresence telepresence/swap/lb-gateway: - @$(call telepresence,vald-lb-gateway,vdaas/vald-lb-gateway) + $(call telepresence,vald-lb-gateway,vdaas/vald-lb-gateway) .PHONY: kubelinter/install ## install kubelinter @@ -545,5 +545,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-$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]') -o $(BINDIR)/kube-linter \ + && curl -L https://github.com/stackrox/kube-linter/releases/download/$(KUBELINTER_VERSION)/kube-linter-$(OS) -o $(BINDIR)/kube-linter \ && chmod a+x $(BINDIR)/kube-linter diff --git a/Makefile.d/kind.mk b/Makefile.d/kind.mk index 4e3062b86f5..aaba1d2a61d 100644 --- a/Makefile.d/kind.mk +++ b/Makefile.d/kind.mk @@ -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-$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/kind + 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 chmod a+x $(BINDIR)/kind .PHONY: kind/start diff --git a/Makefile.d/minikube.mk b/Makefile.d/minikube.mk index fa44e3ad6ba..7b5e21e77ee 100644 --- a/Makefile.d/minikube.mk +++ b/Makefile.d/minikube.mk @@ -18,7 +18,7 @@ minikube/install: $(BINDIR)/minikube $(BINDIR)/minikube: mkdir -p $(BINDIR) - curl -L https://storage.googleapis.com/minikube/releases/latest/minikube-$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]')) -o $(BINDIR)/minikube + curl -L 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 diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index 8b7d6daa6a2..5457f078e6f 100644 --- a/Makefile.d/tools.mk +++ b/Makefile.d/tools.mk @@ -63,7 +63,7 @@ $(BINDIR)/reviewdog: kubectl/install: $(BINDIR)/kubectl $(BINDIR)/kubectl: - curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')/$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]'))/kubectl" -o $(BINDIR)/kubectl + curl -L "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(OS)/$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]'))/kubectl" -o $(BINDIR)/kubectl chmod a+x $(BINDIR)/kubectl .PHONY: textlint/install @@ -138,6 +138,18 @@ staticcheck/install: $(GOPATH)/bin/staticcheck $(GOPATH)/bin/staticcheck: $(call go-install, honnef.co/go/tools/cmd/staticcheck) +.PHONY: go/install +go/install: $(GOROOT)/bin/go + +$(GOROOT)/bin/go: + TAR_NAME="go$(GO_VERSION).${OS}-${ARCH}.tar.gz" \ + && curl -fsSLO "https://go.dev/dl/go$(GO_VERSION).${OS}-${ARCH}.tar.gz" \ + && tar zxf "go$(GO_VERSION).${OS}-${ARCH}.tar.gz" \ + && rm -rf "go$(GO_VERSION).${OS}-${ARCH}.tar.gz" \ + && mv go ${GOROOT} \ + && go version \ + && mkdir -p "${GOPATH}/src" + .PHONY: rust/install rust/install: $(CARGO_HOME)/bin/cargo diff --git a/charts/vald-benchmark-operator/job-values.schema.json b/charts/vald-benchmark-operator/schemas/job-values.schema.json similarity index 100% rename from charts/vald-benchmark-operator/job-values.schema.json rename to charts/vald-benchmark-operator/schemas/job-values.schema.json diff --git a/charts/vald-benchmark-operator/scenario-values.schema.json b/charts/vald-benchmark-operator/schemas/scenario-values.schema.json similarity index 100% rename from charts/vald-benchmark-operator/scenario-values.schema.json rename to charts/vald-benchmark-operator/schemas/scenario-values.schema.json diff --git a/dockers/agent/core/faiss/Dockerfile b/dockers/agent/core/faiss/Dockerfile index f037f4b94fb..a81e611fb1f 100644 --- a/dockers/agent/core/faiss/Dockerfile +++ b/dockers/agent/core/faiss/Dockerfile @@ -19,7 +19,7 @@ # ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -50,19 +50,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ intel-mkl \ unzip \ upx \ + && ldconfig \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -73,7 +64,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -105,7 +97,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ubuntu:devel +FROM --platform=${TARGETPLATFORM} ubuntu:devel LABEL maintainer="${MAINTAINER}" ENV APP_NAME faiss diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile index 8bdb671c5e0..19fbb9a013e 100644 --- a/dockers/agent/core/ngt/Dockerfile +++ b/dockers/agent/core/ngt/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG TARGETARCH ARG TARGETOS @@ -52,19 +52,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libopenblas-dev \ unzip \ upx \ + && ldconfig \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -75,7 +66,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -106,7 +98,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME ngt diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile index c57dffc5316..e80c007a03e 100644 --- a/dockers/agent/sidecar/Dockerfile +++ b/dockers/agent/sidecar/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -48,16 +48,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -68,7 +58,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -94,7 +85,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME sidecar diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index ed5977616d2..728b9c32f1a 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -17,7 +17,7 @@ ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder LABEL maintainer="${MAINTAINER}" ARG GO_VERSION @@ -62,16 +62,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/vdaas/vald ENV ROOTDIR . @@ -88,7 +78,8 @@ COPY versions versions RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps ROOTDIR=${ROOTDIR} GO_CLEAN_DEPS=false \ + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps ROOTDIR=${ROOTDIR} GO_CLEAN_DEPS=false \ && make ngt/install \ && make faiss/install \ && make helm/install \ diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 4b72efdd05b..6de46c43c16 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -19,7 +19,7 @@ ARG MAINTAINER="vdaas.org vald team " # skipcq: DOK-DL3026 # we should stick to official devcontainers as a base image because it is well tested to be used with the vscode devcontainer extension. -FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/vscode/devcontainers/base:debian +FROM --platform=${TARGETPLATFORM} mcr.microsoft.com/vscode/devcontainers/base:debian LABEL maintainer="${MAINTAINER}" ARG GO_VERSION @@ -54,16 +54,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/vdaas/vald COPY Makefile . COPY Makefile.d Makefile.d @@ -74,7 +64,8 @@ COPY example/client/go.mod.default example/client/go.mod.default RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \ + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \ && make ngt/install \ && make faiss/install \ && make helm/install \ diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile index 0c11f4151f9..470c8b1b1d1 100644 --- a/dockers/discoverer/k8s/Dockerfile +++ b/dockers/discoverer/k8s/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -48,16 +48,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -68,7 +58,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -94,7 +85,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME discoverer diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile index cb3dfc2e6c2..3f76a82f077 100644 --- a/dockers/gateway/filter/Dockerfile +++ b/dockers/gateway/filter/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME filter diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile index ddb50c0c5be..ee0112902b5 100644 --- a/dockers/gateway/lb/Dockerfile +++ b/dockers/gateway/lb/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME lb diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile index f10ad346468..b1203203730 100644 --- a/dockers/gateway/mirror/Dockerfile +++ b/dockers/gateway/mirror/Dockerfile @@ -18,7 +18,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -46,16 +46,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY go.mod . @@ -63,7 +53,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - go mod download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -92,7 +83,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer "${MAINTAINER}" ENV APP_NAME mirror diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile index 744cf6cb5c0..21034d85b85 100644 --- a/dockers/index/job/correction/Dockerfile +++ b/dockers/index/job/correction/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME index-correction diff --git a/dockers/index/job/creation/Dockerfile b/dockers/index/job/creation/Dockerfile index f227528fc30..22bfc36e2b1 100644 --- a/dockers/index/job/creation/Dockerfile +++ b/dockers/index/job/creation/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME index-creation diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile index 042a29cafe8..e45c87c4505 100644 --- a/dockers/index/job/readreplica/rotate/Dockerfile +++ b/dockers/index/job/readreplica/rotate/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME readreplica-rotate diff --git a/dockers/index/job/save/Dockerfile b/dockers/index/job/save/Dockerfile index 3fa50672234..a7a38d10430 100644 --- a/dockers/index/job/save/Dockerfile +++ b/dockers/index/job/save/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME index-save diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile index 237f1a78cb5..a2eb875bfba 100644 --- a/dockers/manager/index/Dockerfile +++ b/dockers/manager/index/Dockerfile @@ -19,7 +19,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -93,7 +84,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME index diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile index bc9ac58900a..c87fe077fc2 100644 --- a/dockers/operator/helm/Dockerfile +++ b/dockers/operator/helm/Dockerfile @@ -25,8 +25,8 @@ ARG VALD_HELM_OPERATOR_KIND="ValdHelmOperatorRelease" ARG MAINTAINER="vdaas.org vald team " # skipcq: DOK-DL3026 -FROM --platform=${BUILDPLATFORM} quay.io/operator-framework/helm-operator:${OPERATOR_SDK_VERSION} AS operator -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} quay.io/operator-framework/helm-operator:${OPERATOR_SDK_VERSION} AS operator +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG OPERATOR_SDK_VERSION @@ -62,22 +62,13 @@ RUN apt-get clean \ curl \ upx \ git \ + && ldconfig \ && apt-get clean \ && rm -rf \ /var/lib/apt/lists/* \ /var/cache/* \ && apt-get autoremove -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - RUN { \ echo "---"; \ echo "- version: ${VERSION}"; \ @@ -98,7 +89,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download +RUN make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal/errors COPY internal/errors . @@ -121,18 +113,19 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/charts COPY charts . -WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/hack/helm/schema/gen -COPY hack/helm/schema/gen . +WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/hack +COPY hack . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN make GOARCH=${TARGETARCH} GOOS=${TARGETOS} helm/schema/vald helm/schema/vald-helm-operator \ +RUN make GOARCH=${TARGETARCH} GOOS=${TARGETOS} helm/schema/vald \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} helm/schema/vald-helm-operator \ && cp -r charts /charts COPY --from=operator /usr/local/bin/${APP_NAME} /usr/bin/${APP_NAME} RUN upx ${UPX_OPTIONS} "/usr/bin/${APP_NAME}" -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME helm-operator diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile index 4edb54929f3..6af807e09f4 100644 --- a/dockers/tools/benchmark/job/Dockerfile +++ b/dockers/tools/benchmark/job/Dockerfile @@ -22,7 +22,7 @@ ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG UPX_OPTIONS @@ -76,16 +76,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && make install \ && ldconfig -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . @@ -97,7 +87,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -123,7 +114,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME job diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile index e546e61be05..5d20b3832d8 100644 --- a/dockers/tools/benchmark/operator/Dockerfile +++ b/dockers/tools/benchmark/operator/Dockerfile @@ -20,7 +20,7 @@ ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -49,16 +49,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . @@ -70,7 +60,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -96,7 +87,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${TARGETPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME operator diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile index e16ff06b330..1133dc8bdf7 100644 --- a/dockers/tools/cli/loadtest/Dockerfile +++ b/dockers/tools/cli/loadtest/Dockerfile @@ -17,7 +17,7 @@ ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +FROM --platform=${TARGETPLATFORM} ubuntu:devel AS builder ARG GO_VERSION ARG TARGETARCH @@ -47,16 +47,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -WORKDIR /tmp -RUN BIN_NAME="go" \ - && TAR_NAME="${BIN_NAME}${GO_VERSION}.${TARGETOS}-${TARGETARCH}.tar.gz" \ - && curl -fsSLO "https://go.dev/dl/${TAR_NAME}" \ - && tar zxf "${TAR_NAME}" \ - && rm "${TAR_NAME}" \ - && mv ${BIN_NAME} ${GOROOT} \ - && ${BIN_NAME} version \ - && mkdir -p "${GOPATH}/src" - WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/Makefile.d COPY Makefile.d . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} @@ -67,7 +57,8 @@ COPY go.sum . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download + make ARCH=${TARGETARCH} OS=${TARGETOS} go/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -118,9 +109,7 @@ RUN GO_VERSION="$(< GO_VERSION)" \ && upx -9 -o "/usr/bin/${APP_NAME}" "${APP_NAME}" # Start From Scratch For Running Environment -FROM --platform=${BUILDPLATFORM} ubuntu:devel -# Start From Alpine For Debug Environment -# FROM --platform=${BUILDPLATFORM} alpine:latest +FROM --platform=${TARGETPLATFORM} ubuntu:devel LABEL maintainer="${MAINTAINER}" ENV APP_NAME loadtest diff --git a/example/client/go.mod b/example/client/go.mod index 78689d3ad01..a67a1a8f014 100644 --- a/example/client/go.mod +++ b/example/client/go.mod @@ -11,10 +11,10 @@ replace ( golang.org/x/crypto => golang.org/x/crypto v0.19.0 golang.org/x/net => golang.org/x/net v0.21.0 golang.org/x/text => golang.org/x/text v0.14.0 - google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 - google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 - google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 - google.golang.org/grpc => google.golang.org/grpc v1.61.0 + google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/grpc => google.golang.org/grpc v1.61.1 google.golang.org/protobuf => google.golang.org/protobuf v1.32.0 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 @@ -36,8 +36,8 @@ require ( golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect google.golang.org/protobuf v1.32.0 // indirect ) diff --git a/example/client/go.sum b/example/client/go.sum index 89fa1f078d9..5e127874f4e 100644 --- a/example/client/go.sum +++ b/example/client/go.sum @@ -32,13 +32,13 @@ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 h1:vJpL69PeUullhJyKtTjHjENEmZU3BkO4e+fod7nKzgM= gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946/go.mod h1:BQUWDHIAygjdt1HnUPQ0eWqLN2n5FwJycrpYUVUOx2I= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 h1:g/4bk7P6TPMkAUbUhquq98xey1slwvuVJPosdBqYJlU= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= -google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= -google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 h1:4++qSzdWBUy9/2x8L5KZgwZw+mjJZ2yDSCGMVM0YzRs= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= +google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/go.mod b/go.mod index e952208fe85..beb63655912 100644 --- a/go.mod +++ b/go.mod @@ -44,29 +44,29 @@ replace ( github.com/akrylysov/pogreb => github.com/akrylysov/pogreb v0.10.2 github.com/antihax/optional => github.com/antihax/optional v1.0.0 github.com/armon/go-socks5 => github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 - github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.50.16 - github.com/aws/aws-sdk-go-v2 => github.com/aws/aws-sdk-go-v2 v1.24.1 - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream => github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 - github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.26.6 - github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.16.16 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds => github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 - github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 - github.com/aws/aws-sdk-go-v2/internal/configsources => github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 - github.com/aws/aws-sdk-go-v2/internal/ini => github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding => github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 - github.com/aws/aws-sdk-go-v2/service/internal/checksum => github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url => github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 - github.com/aws/aws-sdk-go-v2/service/internal/s3shared => github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 - github.com/aws/aws-sdk-go-v2/service/kms => github.com/aws/aws-sdk-go-v2/service/kms v1.27.9 - github.com/aws/aws-sdk-go-v2/service/s3 => github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 - github.com/aws/aws-sdk-go-v2/service/secretsmanager => github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.26.2 - github.com/aws/aws-sdk-go-v2/service/sns => github.com/aws/aws-sdk-go-v2/service/sns v1.26.7 - github.com/aws/aws-sdk-go-v2/service/sqs => github.com/aws/aws-sdk-go-v2/service/sqs v1.29.7 - github.com/aws/aws-sdk-go-v2/service/ssm => github.com/aws/aws-sdk-go-v2/service/ssm v1.45.0 - github.com/aws/aws-sdk-go-v2/service/sso => github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 - github.com/aws/aws-sdk-go-v2/service/sts => github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 - github.com/aws/smithy-go => github.com/aws/smithy-go v1.19.0 + github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.50.17 + github.com/aws/aws-sdk-go-v2 => github.com/aws/aws-sdk-go-v2 v1.25.0 + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream => github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.0 + github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.27.0 + github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.17.0 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds => github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.0 + github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.0 + github.com/aws/aws-sdk-go-v2/internal/configsources => github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.0 + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.0 + github.com/aws/aws-sdk-go-v2/internal/ini => github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding => github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.0 + github.com/aws/aws-sdk-go-v2/service/internal/checksum => github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0 + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url => github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.0 + github.com/aws/aws-sdk-go-v2/service/internal/s3shared => github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.0 + github.com/aws/aws-sdk-go-v2/service/kms => github.com/aws/aws-sdk-go-v2/service/kms v1.28.0 + github.com/aws/aws-sdk-go-v2/service/s3 => github.com/aws/aws-sdk-go-v2/service/s3 v1.49.0 + github.com/aws/aws-sdk-go-v2/service/secretsmanager => github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.27.0 + github.com/aws/aws-sdk-go-v2/service/sns => github.com/aws/aws-sdk-go-v2/service/sns v1.27.0 + github.com/aws/aws-sdk-go-v2/service/sqs => github.com/aws/aws-sdk-go-v2/service/sqs v1.30.0 + github.com/aws/aws-sdk-go-v2/service/ssm => github.com/aws/aws-sdk-go-v2/service/ssm v1.46.0 + github.com/aws/aws-sdk-go-v2/service/sso => github.com/aws/aws-sdk-go-v2/service/sso v1.19.0 + github.com/aws/aws-sdk-go-v2/service/sts => github.com/aws/aws-sdk-go-v2/service/sts v1.27.0 + github.com/aws/smithy-go => github.com/aws/smithy-go v1.20.0 github.com/benbjohnson/clock => github.com/benbjohnson/clock v1.3.5 github.com/beorn7/perks => github.com/beorn7/perks v1.0.1 github.com/bmizerany/assert => github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 @@ -159,7 +159,7 @@ replace ( github.com/google/subcommands => github.com/google/subcommands v1.2.0 github.com/google/uuid => github.com/google/uuid v1.6.0 github.com/google/wire => github.com/google/wire v0.6.0 - github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.0 + github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.12.1 github.com/gorilla/mux => github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket => github.com/gorilla/websocket v1.5.1 github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 @@ -294,11 +294,11 @@ replace ( go.uber.org/zap => go.uber.org/zap v1.26.0 gocloud.dev => gocloud.dev v0.36.0 golang.org/x/crypto => golang.org/x/crypto v0.19.0 - golang.org/x/exp => golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 - golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20240205201215-2c58cdc269a3 + golang.org/x/exp => golang.org/x/exp v0.0.0-20240213143201-ec583247a57a + golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20240213143201-ec583247a57a golang.org/x/image => golang.org/x/image v0.15.0 golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/mobile => golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b + golang.org/x/mobile => golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075 golang.org/x/mod => golang.org/x/mod v0.15.0 golang.org/x/net => golang.org/x/net v0.21.0 golang.org/x/oauth2 => golang.org/x/oauth2 v0.17.0 @@ -315,10 +315,10 @@ replace ( gonum.org/v1/plot => gonum.org/v1/plot v0.14.0 google.golang.org/api => google.golang.org/api v0.164.0 google.golang.org/appengine => google.golang.org/appengine v1.6.8 - google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 - google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 - google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 - google.golang.org/grpc => google.golang.org/grpc v1.61.0 + google.golang.org/genproto => google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 + google.golang.org/grpc => google.golang.org/grpc v1.61.1 google.golang.org/grpc/cmd/protoc-gen-go-grpc => google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 google.golang.org/protobuf => google.golang.org/protobuf v1.32.0 gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c @@ -399,7 +399,7 @@ require ( golang.org/x/sys v0.17.0 golang.org/x/text v0.14.0 golang.org/x/time v0.5.0 - golang.org/x/tools v0.17.0 + golang.org/x/tools v0.18.0 gonum.org/v1/hdf5 v0.0.0-00010101000000-000000000000 gonum.org/v1/plot v0.10.1 google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 @@ -418,7 +418,7 @@ require ( require ( cloud.google.com/go v0.112.0 // indirect - cloud.google.com/go/compute v1.23.4 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect git.sr.ht/~sbinet/gg v0.5.0 // indirect @@ -508,9 +508,9 @@ require ( golang.org/x/term v0.17.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/api v0.162.0 // indirect + google.golang.org/api v0.164.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect + google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.29.0 // indirect diff --git a/go.sum b/go.sum index a3e43628a41..d77079bdae2 100644 --- a/go.sum +++ b/go.sum @@ -3,9 +3,8 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-2024021220063 cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= cloud.google.com/go/accessapproval v1.7.5/go.mod h1:g88i1ok5dvQ9XJsxpUInWWvUBrIZhyPDPbk4T01OoJ0= -cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M= cloud.google.com/go/accesscontextmanager v1.8.5/go.mod h1:TInEhcZ7V9jptGNqN3EzZ5XMhT6ijWxTGjzyETwmL0Q= -cloud.google.com/go/aiplatform v1.58.2/go.mod h1:c3kCiVmb6UC1dHAjZjcpDj6ZS0bHQ2slL88ZjC2LtlA= +cloud.google.com/go/aiplatform v1.60.0/go.mod h1:eTlGuHOahHprZw3Hio5VKmtThIOak5/qy6pzdsqcQnM= cloud.google.com/go/analytics v0.23.0/go.mod h1:YPd7Bvik3WS95KBok2gPXDqQPHy08TsCQG6CdUCb+u0= cloud.google.com/go/apigateway v1.6.5/go.mod h1:6wCwvYRckRQogyDDltpANi3zsCDl6kWi0b4Je+w2UiI= cloud.google.com/go/apigeeconnect v1.6.5/go.mod h1:MEKm3AiT7s11PqTfKE3KZluZA9O91FNysvd3E6SJ6Ow= @@ -13,7 +12,7 @@ cloud.google.com/go/apigeeregistry v0.8.3/go.mod h1:aInOWnqF4yMQx8kTjDqHNXjZGh/m cloud.google.com/go/appengine v1.8.5/go.mod h1:uHBgNoGLTS5di7BvU25NFDuKa82v0qQLjyMJLuPQrVo= cloud.google.com/go/area120 v0.8.5/go.mod h1:BcoFCbDLZjsfe4EkCnEq1LKvHSK0Ew/zk5UFu6GMyA0= cloud.google.com/go/artifactregistry v1.14.7/go.mod h1:0AUKhzWQzfmeTvT4SjfI4zjot72EMfrkvL9g9aRjnnM= -cloud.google.com/go/asset v1.17.1/go.mod h1:byvDw36UME5AzGNK7o4JnOnINkwOZ1yRrGrKIahHrng= +cloud.google.com/go/asset v1.17.2/go.mod h1:SVbzde67ehddSoKf5uebOD1sYw8Ab/jD/9EIeWg99q4= cloud.google.com/go/assuredworkloads v1.11.5/go.mod h1:FKJ3g3ZvkL2D7qtqIGnDufFkHxwIpNM9vtmhvt+6wqk= cloud.google.com/go/automl v1.13.5/go.mod h1:MDw3vLem3yh+SvmSgeYUmUKqyls6NzSumDm9OJ3xJ1Y= cloud.google.com/go/baremetalsolution v1.2.4/go.mod h1:BHCmxgpevw9IEryE99HbYEfxXkAEA3hkMJbYYsHtIuY= @@ -33,23 +32,23 @@ cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxB cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/contactcenterinsights v1.13.0/go.mod h1:ieq5d5EtHsu8vhe2y3amtZ+BE+AQwX5qAy7cpo0POsI= -cloud.google.com/go/container v1.30.1/go.mod h1:vkbfX0EnAKL/vgVECs5BZn24e1cJROzgszJirRKQ4Bg= +cloud.google.com/go/container v1.31.0/go.mod h1:7yABn5s3Iv3lmw7oMmyGbeV6tQj86njcTijkkGuvdZA= cloud.google.com/go/containeranalysis v0.11.4/go.mod h1:cVZT7rXYBS9NG1rhQbWL9pWbXCKHWJPYraE8/FTSYPE= cloud.google.com/go/datacatalog v1.19.3/go.mod h1:ra8V3UAsciBpJKQ+z9Whkxzxv7jmQg1hfODr3N3YPJ4= cloud.google.com/go/dataflow v0.9.5/go.mod h1:udl6oi8pfUHnL0z6UN9Lf9chGqzDMVqcYTcZ1aPnCZQ= cloud.google.com/go/dataform v0.9.2/go.mod h1:S8cQUwPNWXo7m/g3DhWHsLBoufRNn9EgFrMgne2j7cI= cloud.google.com/go/datafusion v1.7.5/go.mod h1:bYH53Oa5UiqahfbNK9YuYKteeD4RbQSNMx7JF7peGHc= cloud.google.com/go/datalabeling v0.8.5/go.mod h1:IABB2lxQnkdUbMnQaOl2prCOfms20mcPxDBm36lps+s= -cloud.google.com/go/dataplex v1.14.1/go.mod h1:bWxQAbg6Smg+sca2+Ex7s8D9a5qU6xfXtwmq4BVReps= +cloud.google.com/go/dataplex v1.14.2/go.mod h1:0oGOSFlEKef1cQeAHXy4GZPB/Ife0fz/PxBf+ZymA2U= cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= cloud.google.com/go/dataproc/v2 v2.4.0/go.mod h1:3B1Ht2aRB8VZIteGxQS/iNSJGzt9+CA0WGnDVMEm7Z4= cloud.google.com/go/dataqna v0.8.5/go.mod h1:vgihg1mz6n7pb5q2YJF7KlXve6tCglInd6XO0JGOlWM= cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= cloud.google.com/go/datastream v1.10.4/go.mod h1:7kRxPdxZxhPg3MFeCSulmAJnil8NJGGvSNdn4p1sRZo= cloud.google.com/go/deploy v1.17.1/go.mod h1:SXQyfsXrk0fBmgBHRzBjQbZhMfKZ3hMQBw5ym7MN/50= -cloud.google.com/go/dialogflow v1.48.2/go.mod h1:7A2oDf6JJ1/+hdpnFRfb/RjJUOh2X3rhIa5P8wQSEX4= +cloud.google.com/go/dialogflow v1.49.0/go.mod h1:dhVrXKETtdPlpPhE7+2/k4Z8FRNUp6kMV3EW3oz/fe0= cloud.google.com/go/dlp v1.11.2/go.mod h1:9Czi+8Y/FegpWzgSfkRlyz+jwW6Te9Rv26P3UfU/h/w= -cloud.google.com/go/documentai v1.23.8/go.mod h1:Vd/y5PosxCpUHmwC+v9arZyeMfTqBR9VIwOwIqQYYfA= +cloud.google.com/go/documentai v1.25.0/go.mod h1:ftLnzw5VcXkLItp6pw1mFic91tMRyfv6hHEY5br4KzY= cloud.google.com/go/domains v0.9.5/go.mod h1:dBzlxgepazdFhvG7u23XMhmMKBjrkoUNaw0A8AQB55Y= cloud.google.com/go/edgecontainer v1.1.5/go.mod h1:rgcjrba3DEDEQAidT4yuzaKWTbkTI5zAMu3yy6ZWS0M= cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= @@ -92,9 +91,7 @@ cloud.google.com/go/networksecurity v0.9.5/go.mod h1:KNkjH/RsylSGyyZ8wXpue8xpCEK cloud.google.com/go/notebooks v1.11.3/go.mod h1:0wQyI2dQC3AZyQqWnRsp+yA+kY4gC7ZIVP4Qg3AQcgo= cloud.google.com/go/optimization v1.6.3/go.mod h1:8ve3svp3W6NFcAEFr4SfJxrldzhUl4VMUJmhrqVKtYA= cloud.google.com/go/orchestration v1.8.5/go.mod h1:C1J7HesE96Ba8/hZ71ISTV2UAat0bwN+pi85ky38Yq8= -cloud.google.com/go/orgpolicy v1.12.0/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI= cloud.google.com/go/orgpolicy v1.12.1/go.mod h1:aibX78RDl5pcK3jA8ysDQCFkVxLj3aOQqrbBaUL2V5I= -cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA= cloud.google.com/go/osconfig v1.12.5/go.mod h1:D9QFdxzfjgw3h/+ZaAb5NypM8bhOMqBzgmbhzWViiW8= cloud.google.com/go/oslogin v1.13.1/go.mod h1:vS8Sr/jR7QvPWpCjNqy6LYZr5Zs1e8ZGW/KPn9gmhws= cloud.google.com/go/phishingprotection v0.8.5/go.mod h1:g1smd68F7mF1hgQPuYn3z8HDbNre8L6Z0b7XMYFmX7I= @@ -108,7 +105,7 @@ cloud.google.com/go/recommender v1.12.1/go.mod h1:gf95SInWNND5aPas3yjwl0I572dtud cloud.google.com/go/redis v1.14.2/go.mod h1:g0Lu7RRRz46ENdFKQ2EcQZBAJ2PtJHJLuiiRuEXwyQw= cloud.google.com/go/resourcemanager v1.9.5/go.mod h1:hep6KjelHA+ToEjOfO3garMKi/CLYwTqeAw7YiEI9x8= cloud.google.com/go/resourcesettings v1.6.5/go.mod h1:WBOIWZraXZOGAgoR4ukNj0o0HiSMO62H9RpFi9WjP9I= -cloud.google.com/go/retail v1.15.1/go.mod h1:In9nSBOYhLbDGa87QvWlnE1XA14xBN2FpQRiRsUs9wU= +cloud.google.com/go/retail v1.16.0/go.mod h1:LW7tllVveZo4ReWt68VnldZFWJRzsh9np+01J9dYWzE= cloud.google.com/go/run v1.3.4/go.mod h1:FGieuZvQ3tj1e9GnzXqrMABSuir38AJg5xhiYq+SF3o= cloud.google.com/go/scheduler v1.10.6/go.mod h1:pe2pNCtJ+R01E06XCDOJs1XvAMbv28ZsQEbqknxGOuE= cloud.google.com/go/secretmanager v1.11.5/go.mod h1:eAGv+DaCHkeVyQi0BeXgAHOU0RdrMeZIASKc+S7VqH4= @@ -128,7 +125,7 @@ cloud.google.com/go/trace v1.10.5/go.mod h1:9hjCV1nGBCtXbAE4YK7OqJ8pmPYSxPA0I67J cloud.google.com/go/translate v1.10.1/go.mod h1:adGZcQNom/3ogU65N9UXHOnnSvjPwA/jKQUMnsYXOyk= cloud.google.com/go/video v1.20.4/go.mod h1:LyUVjyW+Bwj7dh3UJnUGZfyqjEto9DnrvTe1f/+QrW0= cloud.google.com/go/videointelligence v1.11.5/go.mod h1:/PkeQjpRponmOerPeJxNPuxvi12HlW7Em0lJO14FC3I= -cloud.google.com/go/vision/v2 v2.7.6/go.mod h1:ZkvWTVNPBU3YZYzgF9Y1jwEbD1NBOCyJn0KFdQfE6Bw= +cloud.google.com/go/vision/v2 v2.8.0/go.mod h1:ocqDiA2j97pvgogdyhoxiQp2ZkDCyr0HWpicywGGRhU= cloud.google.com/go/vmmigration v1.7.5/go.mod h1:pkvO6huVnVWzkFioxSghZxIGcsstDvYiVCxQ9ZH3eYI= cloud.google.com/go/vmwareengine v1.1.1/go.mod h1:nMpdsIVkUrSaX8UvmnBhzVzG7PPvNYc5BszcvIVudYs= cloud.google.com/go/vpcaccess v1.7.5/go.mod h1:slc5ZRvvjP78c2dnL7m4l4R9GwL3wDLcpIWz6P/ziig= @@ -188,46 +185,46 @@ github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybF github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aws/aws-sdk-go v1.50.16 h1:/KuHK+Sadp9BKXWWtMhPtBdj+PLIFCnQZxQnsuLhxKc= -github.com/aws/aws-sdk-go v1.50.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= -github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= -github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo= -github.com/aws/aws-sdk-go-v2/config v1.26.6 h1:Z/7w9bUqlRI0FFQpetVuFYEsjzE3h7fpU6HuGmfPL/o= -github.com/aws/aws-sdk-go-v2/config v1.26.6/go.mod h1:uKU6cnDmYCvJ+pxO9S4cWDb2yWWIH5hra+32hVh1MI4= -github.com/aws/aws-sdk-go-v2/credentials v1.16.16 h1:8q6Rliyv0aUFAVtzaldUEcS+T5gbadPbWdV1WcAddK8= -github.com/aws/aws-sdk-go-v2/credentials v1.16.16/go.mod h1:UHVZrdUsv63hPXFo1H7c5fEneoVo9UXiz36QG1GEPi0= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 h1:2MUXyGW6dVaQz6aqycpbdLIH1NMcUI6kW6vQ0RabGYg= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15/go.mod h1:aHbhbR6WEQgHAiRj41EQ2W47yOYwNtIkWTXmcAtYqj8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 h1:n3GDfwqF2tzEkXlv5cuy4iy7LpKDtqDMcNLfZDu9rls= -github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= +github.com/aws/aws-sdk-go v1.50.17 h1:KsbzUKDgGNlkDHGvoQDhiJ63a9jtZd+O+/s3pTOr/ns= +github.com/aws/aws-sdk-go v1.50.17/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go-v2 v1.25.0 h1:sv7+1JVJxOu/dD/sz/csHX7jFqmP001TIY7aytBWDSQ= +github.com/aws/aws-sdk-go-v2 v1.25.0/go.mod h1:G104G1Aho5WqF+SR3mDIobTABQzpYV0WxMsKxlMggOA= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.0 h1:2UO6/nT1lCZq1LqM67Oa4tdgP1CvL1sLSxvuD+VrOeE= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.0/go.mod h1:5zGj2eA85ClyedTDK+Whsu+w9yimnVIZvhvBKrDquM8= +github.com/aws/aws-sdk-go-v2/config v1.27.0 h1:J5sdGCAHuWKIXLeXiqr8II/adSvetkx0qdZwdbXXpb0= +github.com/aws/aws-sdk-go-v2/config v1.27.0/go.mod h1:cfh8v69nuSUohNFMbIISP2fhmblGmYEOKs5V53HiHnk= +github.com/aws/aws-sdk-go-v2/credentials v1.17.0 h1:lMW2x6sKBsiAJrpi1doOXqWFyEPoE886DTb1X0wb7So= +github.com/aws/aws-sdk-go-v2/credentials v1.17.0/go.mod h1:uT41FIH8cCIxOdUYIL0PYyHlL1NoneDuDSCwg5VE/5o= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.0 h1:xWCwjjvVz2ojYTP4kBKUuUh9ZrXfcAXpflhOUUeXg1k= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.15.0/go.mod h1:j3fACuqXg4oMTQOR2yY7m0NmJY0yBK4L4sLsRXq1Ins= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.0 h1:FHVyVIJpOeQZCnYj9EVKTWahb4WDNFEUOKCx/dOUPcM= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.0/go.mod h1:SL/aJzGL0LsQPQ1y2HMNbJGrm/Xh6aVCGq6ki+DLGEw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.0 h1:NPs/EqVO+ajwOoq56EfcGKa3L3ruWuazkIw1BqxwOPw= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.0/go.mod h1:D+duLy2ylgatV+yTlQ8JTuLfDD0BnFvnQRc+o6tbZ4M= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.0 h1:ks7KGMVUMoDzcxNWUlEdI+/lokMFD136EL6DWmUOV80= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.0/go.mod h1:hL6BWM/d/qz113fVitZjbXR0E+RCTU1+x+1Idyn5NgE= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 h1:hT8rVHwugYE2lEfdFE0QWVo81lF7jMrYJVDWI+f+VxU= +github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0/go.mod h1:8tu/lYfQfFe6IGnaOdrpVgEL2IrrDOf6/m9RQum4NkY= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw= github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 h1:L0ai8WICYHozIKK+OtPzVJBugL7culcuM4E4JOpIEm8= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10/go.mod h1:byqfyxJBshFk0fF9YmK0M0ugIO8OWjzH2T3bPG4eGuA= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 h1:KOxnQeWy5sXyS37fdKEvAsGHOr9fa/qvwxfJurR/BzE= -github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10/go.mod h1:jMx5INQFYFYB3lQD9W0D8Ohgq6Wnl7NYOJ2TQndbulI= -github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 h1:5XNlsBsEvBZBMO6p82y+sqpWg8j5aBCe+5C2GBFgqBQ= -github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1/go.mod h1:4qXHrG1Ne3VGIMZPCB8OjH/pLFO94sKABIusjh0KWPU= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 h1:eajuO3nykDPdYicLlP3AGgOyVN3MOlFmZv7WGTuJPow= -github.com/aws/aws-sdk-go-v2/service/sso v1.18.7/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.0 h1:a33HuFlO0KsveiP90IUJh8Xr/cx9US2PqkSroaLc+o8= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.0/go.mod h1:SxIkWpByiGbhbHYTo9CMTUnx2G4p4ZQMrDPcRRy//1c= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0 h1:UiSyK6ent6OKpkMJN3+k5HZ4sk4UfchEaaW5wv7SblQ= +github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.0/go.mod h1:l7kzl8n8DXoRyFz5cIMG70HnPauWa649TUhgw8Rq6lo= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.0 h1:SHN/umDLTmFTmYfI+gkanz6da3vK8Kvj/5wkqnTHbuA= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.0/go.mod h1:l8gPU5RYGOFHJqWEpPMoRTP0VoaWQSkJdKo+hwWnnDA= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.0 h1:l5puwOHr7IxECuPMIuZG7UKOzAnF24v6t4l+Z5Moay4= +github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.0/go.mod h1:Oov79flWa/n7Ni+lQC3z+VM7PoRM47omRqbJU9B5Y7E= +github.com/aws/aws-sdk-go-v2/service/s3 v1.49.0 h1:VfU15izXQjz4m9y1DkbY79iylIiuPwWtrram4cSpWEI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.49.0/go.mod h1:1o/W6JFUuREj2ExoQ21vHJgO7wakvjhol91M9eknFgs= +github.com/aws/aws-sdk-go-v2/service/sso v1.19.0 h1:u6OkVDxtBPnxPkZ9/63ynEe+8kHbtS5IfaC4PzVxzWM= +github.com/aws/aws-sdk-go-v2/service/sso v1.19.0/go.mod h1:YqbU3RS/pkDVu+v+Nwxvn0i1WB0HkNWEePWbmODEbbs= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsYYwrwnd5fIvgEKkfZFNM= github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0= -github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= -github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= -github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +github.com/aws/aws-sdk-go-v2/service/sts v1.27.0 h1:cjTRjh700H36MQ8M0LnDn33W3JmwC77mdxIIyPWCdpM= +github.com/aws/aws-sdk-go-v2/service/sts v1.27.0/go.mod h1:nXfOBMWPokIbOY+Gi7a1psWMSvskUCemZzI+SMB7Akc= +github.com/aws/smithy-go v1.20.0 h1:6+kZsCXZwKxZS9RfISnPc4EXlHoyAkm2hPuM8X2BrrQ= +github.com/aws/smithy-go v1.20.0/go.mod h1:uo5RKksAl4PzhqaAbjd4rLgFoq5koTsQKYuGe7dklGc= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -405,8 +402,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5 github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= -github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= +github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= @@ -647,17 +644,17 @@ gocloud.dev v0.36.0 h1:q5zoXux4xkOZP473e1EZbG8Gq9f0vlg1VNH5Du/ybus= gocloud.dev v0.36.0/go.mod h1:bLxah6JQVKBaIxzsr5BQLYB4IYdWHkMZdzCXlo6F0gg= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo= -golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE= +golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8= golang.org/x/exp/shiny v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0= golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0= -golang.org/x/exp/typeparams v0.0.0-20240205201215-2c58cdc269a3 h1:1hsZWSQgrpqFJbqlg8HNhQ2/U/7IQELXYWTjuCfHNcM= -golang.org/x/exp/typeparams v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20240213143201-ec583247a57a h1:rrd/FiSCWtI24jk057yBSfEfHrzzjXva1VkDNWRXMag= +golang.org/x/exp/typeparams v0.0.0-20240213143201-ec583247a57a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20240112133503-c713f31d574b/go.mod h1:4efzQnuA1nICq6h4kmZRMGzbPiP06lZvgADUu1VpJCE= +golang.org/x/mobile v0.0.0-20240213143359-d1f7d3436075/go.mod h1:Y8Bnziw2dX69ZhYuqQB8Ihyjks1Q6fMmbg17j9+ISNA= golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= @@ -691,15 +688,15 @@ google.golang.org/api v0.164.0 h1:of5G3oE2WRMVb2yoWKME4ZP8y8zpUKC6bMhxDr8ifyk= google.golang.org/api v0.164.0/go.mod h1:2OatzO7ZDQsoS7IFf3rvsE17/TldiU3F/zxFHeqUB5o= google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 h1:g/4bk7P6TPMkAUbUhquq98xey1slwvuVJPosdBqYJlU= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 h1:x9PwdEgd11LgK+orcck69WVRo7DezSO4VUMPI4xpc8A= -google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014/go.mod h1:rbHMSEDyoYX62nRVLOCc4Qt1HbsdytAYoVwgjiOhF3I= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 h1:4++qSzdWBUy9/2x8L5KZgwZw+mjJZ2yDSCGMVM0YzRs= +google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:PVreiBMirk8ypES6aw9d4p6iiBNSIfZEBqr3UGoAi2E= google.golang.org/genproto/googleapis/bytestream v0.0.0-20240205150955-31a09d347014/go.mod h1:EhZbXt+eY4Yr3YVaEGLdNZF5viWowOJZ8KTPqjYMKzg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 h1:FSL3lRCkhaPFxqi0s9o+V4UI2WTzAVOvkgbd4kVV4Wg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014/go.mod h1:SaPjaZGWb0lPqs6Ittu0spdfrOArqji4ZdeP5IC/9N4= -google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= -google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9 h1:hZB7eLIaYlW9qXRfCq/qDaPdbeY3757uARz5Vvfv+cY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:YUWgXUFRPfoYK1IHMuxH5K6nPEXSCzIMljnQ59lLRCk= +google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY= +google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/versions/GOLANGCILINT_VERSION b/versions/GOLANGCILINT_VERSION index e7e45c82985..a003b197509 100644 --- a/versions/GOLANGCILINT_VERSION +++ b/versions/GOLANGCILINT_VERSION @@ -1 +1 @@ -v1.56.0 +v1.56.1 diff --git a/versions/REVIEWDOG_VERSION b/versions/REVIEWDOG_VERSION index 6b60281ad1a..0ffcf198421 100644 --- a/versions/REVIEWDOG_VERSION +++ b/versions/REVIEWDOG_VERSION @@ -1 +1 @@ -v0.17.0 +v0.17.1 diff --git a/versions/TELEPRESENCE_VERSION b/versions/TELEPRESENCE_VERSION index d76bd2ba3ef..cf8690732fe 100644 --- a/versions/TELEPRESENCE_VERSION +++ b/versions/TELEPRESENCE_VERSION @@ -1 +1 @@ -2.17.0 +2.18.0 diff --git a/versions/YQ_VERSION b/versions/YQ_VERSION index ce34746a73e..37babf18049 100644 --- a/versions/YQ_VERSION +++ b/versions/YQ_VERSION @@ -1 +1 @@ -v4.40.5 +v4.40.7 diff --git a/versions/actions/AZURE_SETUP_HELM b/versions/actions/AZURE_SETUP_HELM index 5a958026daa..fcdb2e109f6 100644 --- a/versions/actions/AZURE_SETUP_HELM +++ b/versions/actions/AZURE_SETUP_HELM @@ -1 +1 @@ -3.5 +4.0.0