From 33afa24e61bcb785a6b857a0f6a5631fbc518a95 Mon Sep 17 00:00:00 2001 From: kpango Date: Wed, 7 Feb 2024 21:41:27 +0900 Subject: [PATCH] format yaml using google/yamlfmt & update go version and dependencies Signed-off-by: kpango --- .fossa.yml | 96 ++-- .github/ISSUE_TEMPLATE/bug_report.md | 10 +- .../ISSUE_TEMPLATE/security_issue_report.md | 8 +- .github/PULL_REQUEST_TEMPLATE.md | 12 +- .github/actions/deploy-chaos-mesh/action.yaml | 3 - .github/actions/docker-build/action.yaml | 6 - .github/actions/dump-context/action.yaml | 6 - .../e2e-deploy-vald-helm-operator/action.yaml | 6 - .../e2e-deploy-vald-readreplica/action.yaml | 6 - .github/actions/e2e-deploy-vald/action.yaml | 7 - .github/actions/scan-docker-image/action.yaml | 4 - .github/actions/setup-helm/action.yaml | 4 - .github/actions/setup-yq/action.yaml | 4 - .github/chatops_permissions.yaml | 2 - .github/helm/values/values-agent-sidecar.yaml | 4 - .github/helm/values/values-chaos.yaml | 4 - .../values/values-index-management-jobs.yaml | 1 - .github/helm/values/values-lb.yaml | 4 - .github/helm/values/values-max-dim.yaml | 4 - .github/helm/values/values-mirror-01.yaml | 4 - .github/helm/values/values-mirror-02.yaml | 4 - .github/helm/values/values-profile.yaml | 4 - .github/helm/values/values-readreplica.yaml | 4 - .github/valdrelease/valdrelease.yaml | 4 - .github/workflows/_detect-ci-container.yml | 6 - .github/workflows/_docker-image.yaml | 13 +- .github/workflows/_release-pr.yml | 7 - .github/workflows/_update-protobuf.yaml | 1 - .github/workflows/backport.yml | 8 - .github/workflows/build-binaries.yml | 9 - .github/workflows/build-protobuf.yml | 5 - .github/workflows/chatops-help.yml | 2 - .github/workflows/chatops.yml | 37 -- .github/workflows/codeql-analysis.yml | 7 - .github/workflows/coverage.yml | 7 - .../detect-internal-config-changes.yml | 2 - .github/workflows/dockers-agent-ngt-image.yml | 1 - .../workflows/dockers-agent-sidecar-image.yml | 1 - .../workflows/dockers-benchmark-job-image.yml | 1 - .../dockers-benchmark-operator-image.yaml | 1 - .../workflows/dockers-ci-container-image.yml | 1 - .../workflows/dockers-dev-container-image.yml | 1 - .../dockers-discoverer-k8s-image.yml | 1 - .../dockers-gateway-filter-image.yml | 1 - .../workflows/dockers-gateway-lb-image.yml | 1 - .../dockers-gateway-mirror-image.yaml | 1 - .../workflows/dockers-helm-operator-image.yml | 1 - .../workflows/dockers-index-correction.yml | 1 - .github/workflows/dockers-index-creation.yml | 1 - .github/workflows/dockers-index-save.yml | 1 - .github/workflows/dockers-loadtest-image.yml | 1 - .../workflows/dockers-manager-index-image.yml | 1 - .../workflows/dockers-readreplica-rotate.yml | 1 - .github/workflows/e2e-code-bench-agent.yaml | 13 - .github/workflows/e2e-max-dim.yml | 1 + .github/workflows/e2e.yml | 54 +- .github/workflows/fossa.yml | 7 - .github/workflows/helm.yml | 13 - .github/workflows/release.yml | 7 - .github/workflows/reviewdog-hadolint.yml | 4 - .github/workflows/reviewdog-k8s.yml | 11 - .github/workflows/reviewdog.yml | 8 +- .github/workflows/semver-major-minor.yaml | 7 - .github/workflows/semver-patch.yaml | 5 - .github/workflows/test-hack.yml | 8 - .github/workflows/unit-test.yaml | 14 - .github/workflows/update-protobuf.yaml | 5 - ...update-pull-request-and-issue-template.yml | 5 - Makefile | 44 +- Makefile.d/bench.mk | 17 +- Makefile.d/build.mk | 466 +++--------------- Makefile.d/dependencies.mk | 2 + Makefile.d/docker.mk | 11 +- Makefile.d/functions.mk | 53 +- Makefile.d/helm.mk | 10 + Makefile.d/proto.mk | 10 +- Makefile.d/test.mk | 60 ++- Makefile.d/tools.mk | 6 + .../schemas/scenario-values.yaml | 7 +- charts/vald-benchmark-operator/values.yaml | 19 - .../values/benchmark-scenario.yaml | 1 - charts/vald-helm-operator/values.yaml | 25 - charts/vald/values/agent-ngt-standalone.yaml | 4 - .../vald/values/dev-broken-index-backup.yaml | 4 - charts/vald/values/dev-observability.yaml | 4 - charts/vald/values/dev.yaml | 4 - .../vald/values/multi-vald/dev-vald-01.yaml | 2 - .../vald/values/multi-vald/dev-vald-02.yaml | 2 - .../vald/values/multi-vald/dev-vald-03.yaml | 2 - .../multi-vald/dev-vald-with-mirror.yaml | 5 - .../vald/values/multi-vald/mirror-target.yaml | 1 - charts/vald/values/vald-backup-via-pv.yaml | 4 - .../values/vald-in-memory-mode-no-backup.yaml | 4 - cmd/agent/core/faiss/sample.yaml | 2 - cmd/agent/core/ngt/sample-cow.yaml | 2 - cmd/agent/core/ngt/sample-fp16.yaml | 2 - cmd/agent/core/ngt/sample.yaml | 2 - cmd/index/job/correction/sample.yaml | 2 - cmd/index/job/creation/sample.yaml | 2 - cmd/index/job/readreplica/rotate/sample.yaml | 2 - cmd/index/job/save/sample.yaml | 2 - cmd/tools/cli/loadtest/sample.yaml | 2 - dockers/agent/core/faiss/Dockerfile | 29 +- dockers/agent/core/ngt/Dockerfile | 21 +- dockers/agent/sidecar/Dockerfile | 20 +- dockers/ci/base/Dockerfile | 25 +- dockers/dev/Dockerfile | 22 +- dockers/discoverer/k8s/Dockerfile | 20 +- dockers/gateway/filter/Dockerfile | 20 +- dockers/gateway/lb/Dockerfile | 20 +- dockers/gateway/mirror/Dockerfile | 18 +- dockers/index/job/correction/Dockerfile | 20 +- dockers/index/job/creation/Dockerfile | 20 +- .../index/job/readreplica/rotate/Dockerfile | 20 +- dockers/index/job/save/Dockerfile | 20 +- dockers/manager/index/Dockerfile | 20 +- dockers/operator/helm/Dockerfile | 20 +- dockers/tools/benchmark/job/Dockerfile | 20 +- dockers/tools/benchmark/operator/Dockerfile | 22 +- dockers/tools/cli/loadtest/Dockerfile | 18 +- example/client/go.mod | 8 +- example/client/go.mod.default | 2 +- example/client/go.sum | 8 +- example/helm/values-standalone-agent-ngt.yaml | 4 - example/helm/values-with-pyroscope.yaml | 4 - example/helm/values.yaml | 4 - example/manifest/scylla/configmap.yaml | 1 - example/manifest/scylla/job.yaml | 1 - go.mod | 80 +-- go.sum | 137 ++--- hack/go.mod.default | 2 +- internal/core/algorithm/ngt/Makefile | 4 + internal/servers/server/option_test.go | 2 +- k8s/agent/daemonset.yaml | 1 - k8s/agent/deployment.yaml | 1 - k8s/agent/faiss/configmap.yaml | 1 - k8s/agent/hpa.yaml | 1 - k8s/agent/networkpolicy.yaml | 1 - k8s/agent/ngt/configmap.yaml | 1 - k8s/agent/pdb.yaml | 1 - k8s/agent/priorityclass.yaml | 1 - k8s/agent/sidecar/configmap.yaml | 1 - k8s/agent/sidecar/svc.yaml | 1 - k8s/agent/statefulset.yaml | 1 - k8s/agent/svc.yaml | 1 - k8s/discoverer/clusterrole.yaml | 1 - k8s/discoverer/clusterrolebinding.yaml | 1 - k8s/discoverer/configmap.yaml | 1 - k8s/discoverer/daemonset.yaml | 1 - k8s/discoverer/deployment.yaml | 1 - k8s/discoverer/hpa.yaml | 1 - k8s/discoverer/networkpolicy.yaml | 1 - k8s/discoverer/pdb.yaml | 1 - k8s/discoverer/priorityclass.yaml | 1 - k8s/discoverer/serviceaccount.yaml | 1 - k8s/discoverer/svc.yaml | 1 - k8s/external/minio/mb-job.yaml | 1 - k8s/gateway/gateway/filter/configmap.yaml | 1 - k8s/gateway/gateway/filter/daemonset.yaml | 1 - k8s/gateway/gateway/filter/deployment.yaml | 1 - k8s/gateway/gateway/filter/hpa.yaml | 1 - k8s/gateway/gateway/filter/networkpolicy.yaml | 1 - k8s/gateway/gateway/filter/pdb.yaml | 1 - k8s/gateway/gateway/filter/priorityclass.yaml | 1 - k8s/gateway/gateway/filter/svc.yaml | 1 - k8s/gateway/gateway/ing.yaml | 1 - k8s/gateway/gateway/lb/configmap.yaml | 1 - k8s/gateway/gateway/lb/daemonset.yaml | 1 - k8s/gateway/gateway/lb/deployment.yaml | 1 - k8s/gateway/gateway/lb/hpa.yaml | 1 - k8s/gateway/gateway/lb/networkpolicy.yaml | 1 - k8s/gateway/gateway/lb/pdb.yaml | 1 - k8s/gateway/gateway/lb/priorityclass.yaml | 1 - k8s/gateway/gateway/lb/svc.yaml | 1 - k8s/gateway/gateway/mirror/clusterrole.yaml | 1 - .../gateway/mirror/clusterrolebinding.yaml | 1 - k8s/gateway/gateway/mirror/configmap.yaml | 1 - k8s/gateway/gateway/mirror/daemonset.yaml | 1 - k8s/gateway/gateway/mirror/deployment.yaml | 1 - k8s/gateway/gateway/mirror/hpa.yaml | 1 - k8s/gateway/gateway/mirror/networkpolicy.yaml | 1 - k8s/gateway/gateway/mirror/pdb.yaml | 1 - k8s/gateway/gateway/mirror/priorityclass.yaml | 1 - .../gateway/mirror/serviceaccount.yaml | 1 - k8s/gateway/gateway/mirror/svc.yaml | 1 - k8s/index/job/correction/configmap.yaml | 1 - k8s/index/job/correction/cronjob.yaml | 1 - k8s/index/job/correction/networkpolicy.yaml | 1 - k8s/index/job/creation/configmap.yaml | 1 - k8s/index/job/creation/cronjob.yaml | 1 - k8s/index/job/creation/networkpolicy.yaml | 1 - .../job/readreplica/rotate/clusterrole.yaml | 1 - .../rotate/clusterrolebinding.yaml | 1 - .../job/readreplica/rotate/configmap.yaml | 1 - k8s/index/job/readreplica/rotate/cronjob.yaml | 1 - .../job/readreplica/rotate/networkpolicy.yaml | 1 - .../readreplica/rotate/serviceaccount.yaml | 1 - k8s/index/job/save/configmap.yaml | 1 - k8s/index/job/save/cronjob.yaml | 1 - k8s/index/job/save/networkpolicy.yaml | 1 - k8s/manager/index/configmap.yaml | 1 - k8s/manager/index/daemonset.yaml | 1 - k8s/manager/index/deployment.yaml | 1 - k8s/manager/index/networkpolicy.yaml | 1 - k8s/manager/index/pdb.yaml | 1 - k8s/manager/index/priorityclass.yaml | 1 - k8s/manager/index/svc.yaml | 1 - k8s/metrics/grafana/configmap.yaml | 1 - .../dashboards/02-vald-discoverer.yaml | 1 - .../dashboards/05-vald-index-manager.yaml | 1 - .../dashboards/07-vald-helm-operator.yaml | 1 - .../dashboards/08-vald-lb-gateway.yaml | 1 - .../dashboards/09-vald-index-correction.yaml | 1 - .../dashboards/99-vald-agent-memory.yaml | 1 - k8s/metrics/grafana/deployment.yaml | 1 - k8s/metrics/grafana/svc.yaml | 1 - k8s/metrics/jaeger/jaeger.yaml | 5 - k8s/metrics/loki/loki.yaml | 1 - k8s/metrics/loki/promtail.yaml | 1 - k8s/metrics/profefe/clusterrole.yaml | 1 - k8s/metrics/profefe/clusterrolebinding.yaml | 1 - k8s/metrics/profefe/cronjob.yaml | 1 - k8s/metrics/profefe/deployment.yaml | 1 - k8s/metrics/profefe/serviceaccount.yaml | 1 - k8s/metrics/profefe/svc.yaml | 1 - k8s/metrics/prometheus/clusterrole.yaml | 1 - .../prometheus/clusterrolebinding.yaml | 1 - k8s/metrics/prometheus/configmap.yaml | 1 - k8s/metrics/prometheus/deployment.yaml | 1 - k8s/metrics/prometheus/serviceaccount.yaml | 1 - k8s/metrics/prometheus/svc.yaml | 1 - k8s/metrics/pyroscope/base/kustomization.yaml | 1 - .../pyroscope/overlay/kustomization.yaml | 3 - k8s/metrics/tempo/jaeger-agent.yaml | 1 - k8s/metrics/tempo/tempo.yaml | 1 - k8s/operator/helm/clusterrole.yaml | 1 - k8s/operator/helm/clusterrolebinding.yaml | 1 - k8s/operator/helm/operator.yaml | 1 - k8s/operator/helm/serviceaccount.yaml | 1 - k8s/operator/helm/svc.yaml | 1 - k8s/tools/benchmark/operator/clusterrole.yaml | 1 - .../operator/clusterrolebinding.yaml | 1 - k8s/tools/benchmark/operator/configmap.yaml | 1 - k8s/tools/benchmark/operator/deployment.yaml | 1 - k8s/tools/benchmark/operator/service.yaml | 1 - .../benchmark/operator/serviceaccount.yaml | 1 - k8s/tools/cli/loadtest/configmap.yaml | 1 - k8s/tools/cli/loadtest/cronjob.yaml | 1 - k8s/tools/cli/loadtest/job.yaml | 1 - tests/chaos/chart/values.yaml | 1 - versions/GOLANGCILINT_VERSION | 2 +- versions/GO_VERSION | 2 +- 252 files changed, 686 insertions(+), 1352 deletions(-) diff --git a/.fossa.yml b/.fossa.yml index 6b16f9c2a0..341ffd5ec6 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -22,51 +22,51 @@ cli: locator: git+github.com/vdaas/vald analyze: modules: - - name: github.com/vdaas/vald/cmd/agent/core/ngt - type: go - target: github.com/vdaas/vald/cmd/agent/core/ngt - path: cmd/agent/core/ngt - - name: github.com/vdaas/vald/cmd/agent/sidecar - type: go - target: github.com/vdaas/vald/cmd/agent/sidecar - path: cmd/agent/sidecar - - name: github.com/vdaas/vald/cmd/discoverer/k8s - type: go - target: github.com/vdaas/vald/cmd/discoverer/k8s - path: cmd/discoverer/k8s - - name: github.com/vdaas/vald/cmd/gateway/filter - type: go - target: github.com/vdaas/vald/cmd/gateway/filter - path: cmd/gateway/filter - - name: github.com/vdaas/vald/cmd/gateway/lb - type: go - target: github.com/vdaas/vald/cmd/gateway/lb - path: cmd/gateway/lb - - name: github.com/vdaas/vald/cmd/manager/index - type: go - target: github.com/vdaas/vald/cmd/manager/index - path: cmd/manager/index - - name: github.com/vdaas/vald/cmd/tools/cli/vdctl - type: go - target: github.com/vdaas/vald/cmd/tools/cli/vdctl - path: cmd/tools/cli/vdctl - - name: github.com/vdaas/vald/hack/helm/schema/gen - type: go - target: github.com/vdaas/vald/hack/helm/schema/gen - path: hack/helm/schema/gen - - name: github.com/vdaas/vald/hack/license/gen - type: go - target: github.com/vdaas/vald/hack/license/gen - path: hack/license/gen - - name: github.com/vdaas/vald/hack/tools/config/agent/core/ngt - type: go - target: github.com/vdaas/vald/hack/tools/config/agent/core/ngt - path: hack/tools/config/agent/core/ngt - - name: github.com/vdaas/vald/hack/tools/config/discoverer/k8s - type: go - target: github.com/vdaas/vald/hack/tools/config/discoverer/k8s - path: hack/tools/config/discoverer/k8s - - name: github.com/vdaas/vald/hack/tools/metrics - type: go - target: github.com/vdaas/vald/hack/tools/metrics - path: hack/tools/metrics + - name: github.com/vdaas/vald/cmd/agent/core/ngt + type: go + target: github.com/vdaas/vald/cmd/agent/core/ngt + path: cmd/agent/core/ngt + - name: github.com/vdaas/vald/cmd/agent/sidecar + type: go + target: github.com/vdaas/vald/cmd/agent/sidecar + path: cmd/agent/sidecar + - name: github.com/vdaas/vald/cmd/discoverer/k8s + type: go + target: github.com/vdaas/vald/cmd/discoverer/k8s + path: cmd/discoverer/k8s + - name: github.com/vdaas/vald/cmd/gateway/filter + type: go + target: github.com/vdaas/vald/cmd/gateway/filter + path: cmd/gateway/filter + - name: github.com/vdaas/vald/cmd/gateway/lb + type: go + target: github.com/vdaas/vald/cmd/gateway/lb + path: cmd/gateway/lb + - name: github.com/vdaas/vald/cmd/manager/index + type: go + target: github.com/vdaas/vald/cmd/manager/index + path: cmd/manager/index + - name: github.com/vdaas/vald/cmd/tools/cli/vdctl + type: go + target: github.com/vdaas/vald/cmd/tools/cli/vdctl + path: cmd/tools/cli/vdctl + - name: github.com/vdaas/vald/hack/helm/schema/gen + type: go + target: github.com/vdaas/vald/hack/helm/schema/gen + path: hack/helm/schema/gen + - name: github.com/vdaas/vald/hack/license/gen + type: go + target: github.com/vdaas/vald/hack/license/gen + path: hack/license/gen + - name: github.com/vdaas/vald/hack/tools/config/agent/core/ngt + type: go + target: github.com/vdaas/vald/hack/tools/config/agent/core/ngt + path: hack/tools/config/agent/core/ngt + - name: github.com/vdaas/vald/hack/tools/config/discoverer/k8s + type: go + target: github.com/vdaas/vald/hack/tools/config/discoverer/k8s + path: hack/tools/config/discoverer/k8s + - name: github.com/vdaas/vald/hack/tools/metrics + type: go + target: github.com/vdaas/vald/hack/tools/metrics + path: hack/tools/metrics diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c693fdf647..46fda03883 100755 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -6,23 +6,23 @@ labels: "type/bug, priority/medium, team/core" assignees: "" --- -### Describe the bug: +### Describe the bug -### To Reproduce: +### To Reproduce -### Expected behavior: +### Expected behavior -### Environment: +### Environment -- Go Version: 1.21.6 +- Go Version: 1.22.0 - Docker Version: 20.10.8 - Kubernetes Version: v1.29.1 - NGT Version: 2.1.6 diff --git a/.github/ISSUE_TEMPLATE/security_issue_report.md b/.github/ISSUE_TEMPLATE/security_issue_report.md index a9d86f602c..e59aa58951 100644 --- a/.github/ISSUE_TEMPLATE/security_issue_report.md +++ b/.github/ISSUE_TEMPLATE/security_issue_report.md @@ -6,17 +6,17 @@ labels: "type/security, priority/medium, team/core, team/sre" assignees: "" --- -### Describe the issue: +### Describe the issue -### CVE: +### CVE -### Environment: +### Environment -- Go Version: 1.21.6 +- Go Version: 1.22.0 - Docker Version: 20.10.8 - Kubernetes Version: v1.29.1 - NGT Version: 2.1.6 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 036179e0b3..780a9e6a42 100755 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,27 +1,27 @@ -### Description: +### Description -### Related Issue: +### Related Issue -### Versions: +### Versions -- Go Version: 1.21.6 +- Go Version: 1.22.0 - Docker Version: 20.10.8 - Kubernetes Version: v1.29.1 - NGT Version: 2.1.6 -### Checklist: +### Checklist @@ -29,6 +29,6 @@ - [ ] I have read the [CONTRIBUTING](https://github.com/vdaas/vald/blob/main/CONTRIBUTING.md) document and completed [our CLA agreement](https://cla-assistant.io/vdaas/vald). - [ ] I have checked open [Pull Requests](https://github.com/vdaas/vald/pulls) for the similar feature or fixes? -### Special notes for your reviewer: +### Special notes for your reviewer diff --git a/.github/actions/deploy-chaos-mesh/action.yaml b/.github/actions/deploy-chaos-mesh/action.yaml index 5377c5e0a1..2944e3dc9e 100644 --- a/.github/actions/deploy-chaos-mesh/action.yaml +++ b/.github/actions/deploy-chaos-mesh/action.yaml @@ -36,18 +36,15 @@ runs: echo "version=${CHAOS_MESH_VERSION}" >> $GITHUB_OUTPUT env: CHAOS_MESH_VERSION: ${{ inputs.chaos_mesh_version }} - - name: Check k3d shell: bash id: check_k3d run: | kubectl cluster-info dump - - name: Check Helm shell: bash run: | helm version - - name: Deploy Chaos Mesh shell: bash run: | diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index d8a3e5342c..d1cca998b6 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -15,7 +15,6 @@ # name: "Build Docker images" description: "A action to build Docker images and publish them" - inputs: target: description: "Build target" @@ -45,7 +44,6 @@ outputs: EXTRA_TAGS: description: "Extra tags" value: ${{ steps.add_extra_tags.outputs.EXTRA_TAGS }} - runs: using: "composite" steps: @@ -62,11 +60,9 @@ runs: echo "ALTER_IMAGE_NAME=${alter_image_name}" >> $GITHUB_OUTPUT env: TARGET: ${{ inputs.target }} - - name: Determine tag name id: determine_tag_name uses: ./.github/actions/determine-docker-image-tag - - name: Determine platforms shell: bash id: determine_platforms @@ -86,7 +82,6 @@ runs: echo "PLATFORMS=${platforms}" >> $GITHUB_OUTPUT env: TARGET_PLATFORMS: ${{ inputs.platforms }} - - name: Add extra tags shell: bash id: add_extra_tags @@ -102,7 +97,6 @@ runs: IMAGE_NAME: ${{ steps.image_name.outputs.IMAGE_NAME }} ALTER_IMAGE_NAME: ${{ steps.image_name.outputs.ALTER_IMAGE_NAME }} PRIMARY_TAG: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - - name: Build and Push shell: bash id: build_and_push diff --git a/.github/actions/dump-context/action.yaml b/.github/actions/dump-context/action.yaml index 84ae30f035..a445331014 100644 --- a/.github/actions/dump-context/action.yaml +++ b/.github/actions/dump-context/action.yaml @@ -15,7 +15,6 @@ # name: "Dump context to log" description: "A action to dump context to log" - runs: using: "composite" steps: @@ -24,31 +23,26 @@ runs: run: echo $JSON env: JSON: ${{toJSON(github)}} - - name: "Dump job context" shell: bash run: echo $JSON env: JSON: ${{ toJSON(job) }} - - name: "Dump steps context" shell: bash run: echo $JSON env: JSON: ${{toJSON(steps)}} - - name: "Dump runner context" shell: bash run: echo $JSON env: JSON: ${{toJSON(runner)}} - - name: "Dump strategy context" shell: bash run: echo $JSON env: JSON: ${{toJSON(strategy)}} - - name: "Dump matrix context" shell: bash run: echo $JSON diff --git a/.github/actions/e2e-deploy-vald-helm-operator/action.yaml b/.github/actions/e2e-deploy-vald-helm-operator/action.yaml index 8b49d45082..8743b5a3b6 100644 --- a/.github/actions/e2e-deploy-vald-helm-operator/action.yaml +++ b/.github/actions/e2e-deploy-vald-helm-operator/action.yaml @@ -15,7 +15,6 @@ # name: "Deploy Vald using vald-helm-operator for E2E test" description: "A action to deploy vald using vald-helm-operator for E2E test" - inputs: require_minio: description: "If Minio is required, set this to true." @@ -49,7 +48,6 @@ outputs: POD_NAME: description: "A pod name that waited for" value: ${{ steps.deploy_vald.outputs.POD_NAME }} - runs: using: "composite" steps: @@ -59,12 +57,10 @@ runs: if: ${{ inputs.require_minio == 'true' }} run: | make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/minio/deploy - - name: Dump valdrelease shell: bash run: | cat ${{ inputs.valdrelease }} - - name: Deploy vald helm operator from remote charts shell: bash id: deploy_vald_helm_operator_remote @@ -79,7 +75,6 @@ runs: env: DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} - - name: Deploy vald helm operator from local charts shell: bash id: deploy_vald_helm_operator_local @@ -90,7 +85,6 @@ runs: env: DEFAULT_IMAGE_TAG: ${{ inputs.default_image_tag }} HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} - - name: Deploy vald shell: bash id: deploy_vald diff --git a/.github/actions/e2e-deploy-vald-readreplica/action.yaml b/.github/actions/e2e-deploy-vald-readreplica/action.yaml index 4bbe1316c5..e79c74598a 100644 --- a/.github/actions/e2e-deploy-vald-readreplica/action.yaml +++ b/.github/actions/e2e-deploy-vald-readreplica/action.yaml @@ -15,7 +15,6 @@ # name: "Deploy Vald Read Replica for E2E test" description: "A action to deploy vald read replica for E2E test" - inputs: require_minio: description: "If Minio is required, set this to true." @@ -49,7 +48,6 @@ outputs: POD_NAME: description: "A pod name that waited for" value: ${{ steps.get_real_pod_name.outputs.POD_NAME }} - runs: using: "composite" steps: @@ -59,12 +57,10 @@ runs: if: ${{ inputs.require_minio == 'true' }} run: | make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/minio/deploy - - name: Dump Helm values shell: bash run: | cat ${{ inputs.values }} - - name: Deploy vald read replica from remote charts shell: bash id: deploy_vald_readreplica_remote @@ -90,7 +86,6 @@ runs: HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} WAIT_FOR_TIMEOUT: ${{ inputs.wait_for_timeout }} - - name: Deploy vald read replica from local charts shell: bash id: deploy_vald_readreplica_local @@ -112,7 +107,6 @@ runs: HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} WAIT_FOR_TIMEOUT: ${{ inputs.wait_for_timeout }} - - name: Get real pod name shell: bash id: get_real_pod_name diff --git a/.github/actions/e2e-deploy-vald/action.yaml b/.github/actions/e2e-deploy-vald/action.yaml index e442119c4c..2b4dce3947 100644 --- a/.github/actions/e2e-deploy-vald/action.yaml +++ b/.github/actions/e2e-deploy-vald/action.yaml @@ -15,7 +15,6 @@ # name: "Deploy Vald for E2E test" description: "A action to deploy vald for E2E test" - inputs: require_minio: description: "If Minio is required, set this to true." @@ -52,7 +51,6 @@ outputs: POD_NAME: description: "A pod name that waited for" value: ${{ steps.get_real_pod_name.outputs.POD_NAME }} - runs: using: "composite" steps: @@ -62,12 +60,10 @@ runs: if: ${{ inputs.require_minio == 'true' }} run: | make K8S_SLEEP_DURATION_FOR_WAIT_COMMAND=10 k8s/external/minio/deploy - - name: Dump Helm values shell: bash run: | cat ${{ inputs.values }} - - name: Change namespace if: ${{ inputs.namespace != '' }} shell: bash @@ -75,7 +71,6 @@ runs: kubectl create ns ${NAMESPACE} ; kubectl config set-context --current --namespace=${NAMESPACE} env: NAMESPACE: ${{ inputs.namespace }} - - name: Deploy vald from remote charts shell: bash id: deploy_vald_remote @@ -101,7 +96,6 @@ runs: HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} WAIT_FOR_TIMEOUT: ${{ inputs.wait_for_timeout }} - - name: Deploy vald from local charts shell: bash id: deploy_vald_local @@ -123,7 +117,6 @@ runs: HELM_EXTRA_OPTIONS: ${{ inputs.helm_extra_options }} WAIT_FOR_SELECTOR: ${{ inputs.wait_for_selector }} WAIT_FOR_TIMEOUT: ${{ inputs.wait_for_timeout }} - - name: Get real pod name shell: bash id: get_real_pod_name diff --git a/.github/actions/scan-docker-image/action.yaml b/.github/actions/scan-docker-image/action.yaml index 4af031f75c..2f200a5494 100644 --- a/.github/actions/scan-docker-image/action.yaml +++ b/.github/actions/scan-docker-image/action.yaml @@ -15,7 +15,6 @@ # name: "Scan the Docker image" description: "A action to scan the Docker image" - inputs: image_ref: description: "Docker image reference" @@ -25,7 +24,6 @@ inputs: description: "Severities of vulnerabilities to be displayed" required: false default: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL" - runs: using: "composite" steps: @@ -35,7 +33,6 @@ runs: image-ref: ${{ inputs.image_ref }} format: "table" severity: ${{ inputs.severity }} - - name: Run vulnerability scanner (sarif) uses: aquasecurity/trivy-action@master with: @@ -43,7 +40,6 @@ runs: format: "sarif" output: "trivy-results.sarif" severity: ${{ inputs.severity }} - - name: Upload Trivy scan results to Security tab uses: github/codeql-action/upload-sarif@v2 with: diff --git a/.github/actions/setup-helm/action.yaml b/.github/actions/setup-helm/action.yaml index cd80c68bbc..8cd16ea712 100644 --- a/.github/actions/setup-helm/action.yaml +++ b/.github/actions/setup-helm/action.yaml @@ -15,13 +15,11 @@ # name: "Setup Helm environment" description: "A action to set up Helm environment" - inputs: helm_version: description: "The Helm version to use. The default version is `versions/HELM_VERSION`" required: false default: "" - runs: using: "composite" steps: @@ -34,11 +32,9 @@ runs: echo "version=${HELM_VERSION}" >> $GITHUB_OUTPUT env: HELM_VERSION: ${{ inputs.helm_version }} - - uses: azure/setup-helm@v3 with: version: ${{ steps.helm_version.outputs.version }} - - name: Check Helm version shell: bash run: | diff --git a/.github/actions/setup-yq/action.yaml b/.github/actions/setup-yq/action.yaml index 7b404545d5..f2e9b0c8b3 100644 --- a/.github/actions/setup-yq/action.yaml +++ b/.github/actions/setup-yq/action.yaml @@ -15,13 +15,11 @@ # name: "Setup yq environment" description: "A action to set up yq" - inputs: yq_version: description: "The yq version to use. The default version is `versions/YQ_VERSION`" required: false default: "" - runs: using: "composite" steps: @@ -34,7 +32,6 @@ runs: echo "version=${YQ_VERSION}" >> $GITHUB_OUTPUT env: YQ_VERSION: ${{ inputs.yq_version }} - - name: Install yq shell: bash run: | @@ -42,7 +39,6 @@ runs: chmod a+x /usr/local/bin/yq env: YQ_VERSION: ${{ steps.yq_version.outputs.version }} - - name: Check yq version shell: bash run: | diff --git a/.github/chatops_permissions.yaml b/.github/chatops_permissions.yaml index ac540c026e..681a3ee8b4 100644 --- a/.github/chatops_permissions.yaml +++ b/.github/chatops_permissions.yaml @@ -62,10 +62,8 @@ roles: contributor: policies: - label - default-roles: - contributor - users: kpango: role: diff --git a/.github/helm/values/values-agent-sidecar.yaml b/.github/helm/values/values-agent-sidecar.yaml index 27948dd69e..f169dec285 100644 --- a/.github/helm/values/values-agent-sidecar.yaml +++ b/.github/helm/values/values-agent-sidecar.yaml @@ -17,7 +17,6 @@ defaults: logging: level: debug - agent: minReplicas: 1 podManagementPolicy: Parallel @@ -56,14 +55,11 @@ agent: endpoint: "http://minio.default.svc.cluster.local:9000" region: "us-east-1" force_path_style: true - gateway: lb: enabled: false - discoverer: enabled: false - manager: index: enabled: false diff --git a/.github/helm/values/values-chaos.yaml b/.github/helm/values/values-chaos.yaml index f1f59d48da..20566b4c22 100644 --- a/.github/helm/values/values-chaos.yaml +++ b/.github/helm/values/values-chaos.yaml @@ -30,7 +30,6 @@ defaults: readinessProbe: timeoutSeconds: 10 failureThreshold: 5 - gateway: lb: enabled: true @@ -52,7 +51,6 @@ gateway: index_replica: 3 discoverer: duration: 50ms - agent: minReplicas: 5 maxReplicas: 10 @@ -75,7 +73,6 @@ agent: auto_index_check_duration: 1m auto_index_length: 1000 dimension: 784 - discoverer: minReplicas: 2 hpa: @@ -86,7 +83,6 @@ discoverer: memory: 50Mi discoverer: discovery_duration: 50ms - manager: index: replicas: 2 diff --git a/.github/helm/values/values-index-management-jobs.yaml b/.github/helm/values/values-index-management-jobs.yaml index c858a5e113..0723ddb4d7 100644 --- a/.github/helm/values/values-index-management-jobs.yaml +++ b/.github/helm/values/values-index-management-jobs.yaml @@ -19,7 +19,6 @@ agent: auto_index_duration_limit: 1000h auto_index_check_duration: 1000h auto_save_index_duration: 1000h - manager: index: enabled: false diff --git a/.github/helm/values/values-lb.yaml b/.github/helm/values/values-lb.yaml index fdb3d3bd90..923d5df008 100644 --- a/.github/helm/values/values-lb.yaml +++ b/.github/helm/values/values-lb.yaml @@ -19,7 +19,6 @@ defaults: level: info networkPolicy: enabled: true - gateway: lb: enabled: true @@ -32,7 +31,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 3 - agent: minReplicas: 3 maxReplicas: 10 @@ -48,7 +46,6 @@ agent: auto_index_check_duration: 30s auto_index_length: 1000 dimension: 784 - discoverer: minReplicas: 1 hpa: @@ -57,7 +54,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: replicas: 1 diff --git a/.github/helm/values/values-max-dim.yaml b/.github/helm/values/values-max-dim.yaml index 805dceea2b..bcfa17a318 100644 --- a/.github/helm/values/values-max-dim.yaml +++ b/.github/helm/values/values-max-dim.yaml @@ -17,7 +17,6 @@ defaults: logging: level: info - gateway: lb: enabled: true @@ -31,7 +30,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 1 - agent: minReplicas: 1 maxReplicas: 1 @@ -47,7 +45,6 @@ agent: auto_index_check_duration: 40s auto_index_length: 100 dimension: 2 - discoverer: minReplicas: 1 maxReplicas: 1 @@ -57,7 +54,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: replicas: 1 diff --git a/.github/helm/values/values-mirror-01.yaml b/.github/helm/values/values-mirror-01.yaml index 69a336cd58..0a196bba84 100644 --- a/.github/helm/values/values-mirror-01.yaml +++ b/.github/helm/values/values-mirror-01.yaml @@ -19,7 +19,6 @@ defaults: level: info networkPolicy: enabled: false - gateway: mirror: enabled: true @@ -38,7 +37,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 3 - agent: minReplicas: 3 maxReplicas: 10 @@ -54,7 +52,6 @@ agent: auto_index_check_duration: 30s auto_index_length: 1000 dimension: 784 - discoverer: minReplicas: 1 hpa: @@ -67,7 +64,6 @@ discoverer: name: vald-01 serviceAccount: name: vald-01 - manager: index: replicas: 1 diff --git a/.github/helm/values/values-mirror-02.yaml b/.github/helm/values/values-mirror-02.yaml index 29b0990b09..bae097afce 100644 --- a/.github/helm/values/values-mirror-02.yaml +++ b/.github/helm/values/values-mirror-02.yaml @@ -19,7 +19,6 @@ defaults: level: info networkPolicy: enabled: false - gateway: mirror: enabled: true @@ -40,7 +39,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 3 - agent: minReplicas: 3 maxReplicas: 10 @@ -56,7 +54,6 @@ agent: auto_index_check_duration: 30s auto_index_length: 1000 dimension: 784 - discoverer: minReplicas: 1 hpa: @@ -71,7 +68,6 @@ discoverer: name: vald-02 serviceAccount: name: vald-02 - manager: index: replicas: 1 diff --git a/.github/helm/values/values-profile.yaml b/.github/helm/values/values-profile.yaml index 4ff5b8fa30..401d6ea6d8 100644 --- a/.github/helm/values/values-profile.yaml +++ b/.github/helm/values/values-profile.yaml @@ -29,7 +29,6 @@ defaults: read_header_timeout: 2s read_timeout: 2s write_timeout: 3m - gateway: lb: enabled: true @@ -49,7 +48,6 @@ gateway: env: - name: GOMAXPROCS value: "1" - agent: minReplicas: 3 maxReplicas: 10 @@ -72,7 +70,6 @@ agent: env: - name: GOMAXPROCS value: "1" - discoverer: minReplicas: 1 podAnnotations: @@ -88,7 +85,6 @@ discoverer: env: - name: GOMAXPROCS value: "1" - manager: index: replicas: 1 diff --git a/.github/helm/values/values-readreplica.yaml b/.github/helm/values/values-readreplica.yaml index 6f392b8816..948e85a53e 100644 --- a/.github/helm/values/values-readreplica.yaml +++ b/.github/helm/values/values-readreplica.yaml @@ -19,7 +19,6 @@ defaults: level: info networkPolicy: enabled: true - gateway: lb: enabled: true @@ -32,7 +31,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 3 - agent: minReplicas: 3 maxReplicas: 10 @@ -60,7 +58,6 @@ agent: snapshot_classname: "csi-hostpath-snapclass" hpa: enabled: true - discoverer: minReplicas: 1 hpa: @@ -69,7 +66,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: replicas: 1 diff --git a/.github/valdrelease/valdrelease.yaml b/.github/valdrelease/valdrelease.yaml index 8539e31ae1..0b39e89717 100644 --- a/.github/valdrelease/valdrelease.yaml +++ b/.github/valdrelease/valdrelease.yaml @@ -26,7 +26,6 @@ spec: level: info networkPolicy: enabled: true - gateway: lb: enabled: true @@ -39,7 +38,6 @@ spec: memory: 50Mi gateway_config: index_replica: 3 - agent: minReplicas: 3 maxReplicas: 10 @@ -55,7 +53,6 @@ spec: auto_index_check_duration: 30s auto_index_length: 1000 dimension: 784 - discoverer: minReplicas: 1 hpa: @@ -64,7 +61,6 @@ spec: requests: cpu: 100m memory: 50Mi - manager: index: replicas: 1 diff --git a/.github/workflows/_detect-ci-container.yml b/.github/workflows/_detect-ci-container.yml index 5c666cc26f..c9ed23314c 100644 --- a/.github/workflows/_detect-ci-container.yml +++ b/.github/workflows/_detect-ci-container.yml @@ -20,10 +20,8 @@ on: TAG_NAME: description: "The docker image tag name" value: ${{ jobs.detect.outputs.TAG_NAME }} - env: TARGET_IMAGE: vdaas/vald-ci-container - jobs: detect: runs-on: ubuntu-latest @@ -31,25 +29,21 @@ jobs: TAG_NAME: ${{ steps.merge_detection_results.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Determine Docker image tag id: determine_tag_name uses: ./.github/actions/determine-docker-image-tag - - name: Detect Docker image tag for primary id: detect_primary_tag_name uses: ./.github/actions/detect-docker-image-tags with: images: ${{ env.TARGET_IMAGE }} tag_name: ${{ steps.determine_tag_name.outputs.PRIMARY_TAG }} - - name: Detect Docker image tag for default id: detect_default_tag_name uses: ./.github/actions/detect-docker-image-tags with: images: ${{ env.TARGET_IMAGE }} tag_name: ${{ steps.determine_tag_name.outputs.DEFAULT_TAG }} - - name: Merge Docker image tag detection results id: merge_detection_results run: | diff --git a/.github/workflows/_docker-image.yaml b/.github/workflows/_docker-image.yaml index 171fad4453..552d1c058e 100644 --- a/.github/workflows/_docker-image.yaml +++ b/.github/workflows/_docker-image.yaml @@ -38,12 +38,17 @@ jobs: build: runs-on: ubuntu-latest if: >- - ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) || + ${{ (github.event_name == 'pull_request' && - (github.event.pull_request.head.repo.fork == true && github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ci/approved')) || - (github.event_name == 'push' && github.ref == 'refs/heads/main') || - (github.event_name == 'push' && startsWith( github.ref, 'refs/heads/release/v')) || + github.event.pull_request.head.repo.fork == false) || + (github.event.pull_request.head.repo.fork == true && + github.event_name == 'pull_request_target' && + contains(github.event.pull_request.labels.*.name, 'ci/approved')) || + (github.event_name == 'push' && + github.ref == 'refs/heads/main') || + (github.event_name == 'push' && + startsWith( github.ref, 'refs/heads/release/v')) || startsWith( github.ref, 'refs/tags/') }} steps: diff --git a/.github/workflows/_release-pr.yml b/.github/workflows/_release-pr.yml index 8c99bca87a..1149c284c7 100644 --- a/.github/workflows/_release-pr.yml +++ b/.github/workflows/_release-pr.yml @@ -25,18 +25,15 @@ on: type: string description: "The release tag" required: true - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml secrets: inherit - create: needs: - dump-contexts-to-log @@ -53,17 +50,14 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - name: Update for new release id: update_for_new_release run: | @@ -126,7 +120,6 @@ jobs: --request POST \ --data "{\"title\": \":bookmark: :robot: Release ${RELEASE_TAG}\", \"head\": \"${PREPARE_RELEASE_BRANCH_NAME}\", \"base\": \"${RELEASE_BRANCH_NAME}\", \"body\": \"Release PR for ${RELEASE_TAG}.\", \"maintainer_can_modify\": true}" \ $API_URL - env: GITHUB_USER: ${{ secrets.DISPATCH_USER }} GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} diff --git a/.github/workflows/_update-protobuf.yaml b/.github/workflows/_update-protobuf.yaml index 67588ab0b7..94a7d2c399 100644 --- a/.github/workflows/_update-protobuf.yaml +++ b/.github/workflows/_update-protobuf.yaml @@ -21,7 +21,6 @@ on: type: string description: "Dispatch target repository" required: true - jobs: dispatch: runs-on: ubuntu-latest diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 714060383c..97616eae83 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -18,11 +18,9 @@ on: pull_request: types: - "closed" - env: TARGET_LABEL_NAME_PREFIX: "actions/backport/" BACKPORT_BRANCH_NAME_PREFIX: "backport" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest @@ -30,27 +28,22 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - create: runs-on: ubuntu-latest needs: [dump-contexts-to-log] - steps: - uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - name: Set context id: set_context run: | @@ -58,7 +51,6 @@ jobs: echo "LABEL_NAMES=${LABEL_NAMES}" >> $GITHUB_OUTPUT # e.g.) actions/backport/v1.7 actions/backport/v1.8 echo "${LABEL_NAMES}" - - name: Create PR if: ${{ steps.set_context.outputs.LABEL_NAMES != '' }} env: diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 0077a70b6b..5aff86f5cb 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -18,17 +18,14 @@ on: release: types: - created - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - build-linux: runs-on: ubuntu-latest needs: [detect-ci-container] @@ -38,23 +35,18 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 10 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: ./.github/actions/setup-go - - name: Build and zip run: | make binary/build/zip - - name: Upload artifact uses: actions/upload-artifact@v4 with: name: artifacts-linux path: ./artifacts/ - publish: runs-on: ubuntu-latest needs: @@ -64,7 +56,6 @@ jobs: with: name: artifacts-linux path: tmp/linux - - uses: shogo82148/actions-upload-release-asset@v1 with: upload_url: ${{ github.event.release.upload_url }} diff --git a/.github/workflows/build-protobuf.yml b/.github/workflows/build-protobuf.yml index c77aac966d..94c5ff8d48 100644 --- a/.github/workflows/build-protobuf.yml +++ b/.github/workflows/build-protobuf.yml @@ -27,17 +27,14 @@ on: paths: - "apis/proto/**" - "versions/GO_VERSION" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - build: runs-on: ubuntu-latest needs: [detect-ci-container] @@ -45,11 +42,9 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Build protobuf run: | make proto/all diff --git a/.github/workflows/chatops-help.yml b/.github/workflows/chatops-help.yml index 075e28937c..3a876bcc12 100644 --- a/.github/workflows/chatops-help.yml +++ b/.github/workflows/chatops-help.yml @@ -17,14 +17,12 @@ name: "ChatOps help" on: pull_request: types: [opened] - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - print: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/chatops.yml b/.github/workflows/chatops.yml index 4e3896fcca..8de3dc115c 100644 --- a/.github/workflows/chatops.yml +++ b/.github/workflows/chatops.yml @@ -17,14 +17,12 @@ name: ChatOps on: issue_comment: types: [created] - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - label: name: Add labels runs-on: ubuntu-latest @@ -37,10 +35,8 @@ jobs: TRIGGER_PHRASE: "/label" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/actions/setup-yq if: steps.check_comments_label.outputs.BOOL_TRIGGERED == 'true' - - name: Check permissions if: steps.check_comments_label.outputs.BOOL_TRIGGERED == 'true' id: check_permissions @@ -61,7 +57,6 @@ jobs: env: USERNAME: ${{ steps.check_comments_label.outputs.COMMENTER_USERNAME }} REQUIRED_POLICY: label - - name: Add label if: steps.check_comments_label.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' run: | @@ -90,10 +85,8 @@ jobs: TRIGGER_PHRASE: "/rebase" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/actions/setup-yq if: steps.check_comments_rebase.outputs.BOOL_TRIGGERED == 'true' - - name: Check permissions if: steps.check_comments_rebase.outputs.BOOL_TRIGGERED == 'true' id: check_permissions @@ -114,7 +107,6 @@ jobs: env: USERNAME: ${{ steps.check_comments_rebase.outputs.COMMENTER_USERNAME }} REQUIRED_POLICY: rebase - - name: Comment back to PR if: steps.check_comments_rebase.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' run: | @@ -130,23 +122,19 @@ jobs: API_URL: ${{ github.event.issue.comments_url }} BRANCH: ${{ steps.check_comments_rebase.outputs.BRANCH_NAME }} USERNAME: ${{ steps.check_comments_rebase.outputs.COMMENTER_USERNAME }} - - uses: actions/checkout@v4 if: steps.check_comments_rebase.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Automatic Rebase if: steps.check_comments_rebase.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' uses: cirrus-actions/rebase@1.5 env: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} - - name: Failure comment if: failure() run: | @@ -160,7 +148,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} API_URL: ${{ github.event.issue.comments_url }} - gentest: name: Add tests needs: @@ -175,10 +162,8 @@ jobs: TRIGGER_PHRASE: "/gen-test" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/actions/setup-yq if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' - - name: check permissions if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' id: check_permissions @@ -199,7 +184,6 @@ jobs: env: USERNAME: ${{ steps.check_comments_gen_test.outputs.COMMENTER_USERNAME }} REQUIRED_POLICY: gen-test - - name: check executable if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' run: | @@ -215,26 +199,21 @@ jobs: USERNAME: ${{ steps.check_comments_gen_test.outputs.COMMENTER_USERNAME }} PR_AUTHOR: ${{ github.event.issue.user.login }} API_URL: ${{ github.event.issue.comments_url }} - - uses: actions/checkout@v4 if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' with: fetch-depth: 0 - - name: set git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - uses: ./.github/actions/setup-go if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' - - name: Generate tests and push id: gen_test if: steps.check_comments_gen_test.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' @@ -269,7 +248,6 @@ jobs: PR_INFO_URL: ${{ github.event.issue.pull_request.url }} PR_AUTHOR: ${{ github.event.issue.user.login }} PR_NUM: ${{ github.event.issue.number }} - - name: failure comment if: failure() run: | @@ -284,7 +262,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} API_URL: ${{ github.event.issue.comments_url }} - format: name: Add license and run golines + gofumpt + goimports needs: @@ -300,10 +277,8 @@ jobs: TRIGGER_PHRASE: "/format" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/actions/setup-yq if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' - - name: check permissions if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' id: check_permissions @@ -324,7 +299,6 @@ jobs: env: USERNAME: ${{ steps.check_comments_format.outputs.COMMENTER_USERNAME }} REQUIRED_POLICY: format - - name: check executable if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' run: | @@ -339,27 +313,22 @@ jobs: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} USERNAME: ${{ steps.check_comments_format.outputs.COMMENTER_USERNAME }} API_URL: ${{ github.event.issue.comments_url }} - - uses: actions/checkout@v4 if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: set git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - uses: ./.github/actions/setup-go if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' - - name: update and push id: format_push if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' @@ -401,7 +370,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} PR_INFO_URL: ${{ github.event.issue.pull_request.url }} PR_NUM: ${{ github.event.issue.number }} - - name: no changes if: steps.check_comments_format.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' && steps.format_push.outputs.UPDATED == 'false' run: | @@ -415,7 +383,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} API_URL: ${{ github.event.issue.comments_url }} - - name: failure comment if: failure() run: | @@ -429,7 +396,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} API_URL: ${{ github.event.issue.comments_url }} - approve: name: Approve needs: @@ -445,10 +411,8 @@ jobs: TRIGGER_PHRASE: "/approve" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: ./.github/actions/setup-yq if: steps.check_comments_approve.outputs.BOOL_TRIGGERED == 'true' - - name: check permissions if: steps.check_comments_approve.outputs.BOOL_TRIGGERED == 'true' id: check_permissions @@ -469,7 +433,6 @@ jobs: env: USERNAME: ${{ steps.check_comments_approve.outputs.COMMENTER_USERNAME }} REQUIRED_POLICY: approve - - name: approve if: steps.check_comments_approve.outputs.BOOL_TRIGGERED == 'true' && steps.check_permissions.outputs.EXECUTABLE == 'true' run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 71e4b58133..bb921330b5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,17 +35,14 @@ on: - "**.go" schedule: - cron: "0 1 * * *" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - codeql-build: name: CodeQL runs-on: ubuntu-latest @@ -59,19 +56,15 @@ jobs: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. fetch-depth: 2 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Initialize CodeQL uses: github/codeql-action/init@v2 with: languages: go config-file: ./.github/codeql/codeql-config.yaml - - name: Autobuild uses: github/codeql-action/autobuild@v2 - - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 65956dcc74..e0707edad4 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,17 +29,14 @@ on: - "internal/**" - "pkg/**" - "cmd/**" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - coverage: runs-on: ubuntu-latest needs: [detect-ci-container] @@ -49,22 +46,18 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 10 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run coverage continue-on-error: true run: | make coverage - - name: Upload coverage report to Codecov uses: codecov/codecov-action@v3 with: token: ${{secrets.CODECOV_TOKEN}} file: ./coverage.out - - name: Upload coverage report to deepsource run: | mv ./coverage.out ./cover.out diff --git a/.github/workflows/detect-internal-config-changes.yml b/.github/workflows/detect-internal-config-changes.yml index ca536a3c4b..b524e0cf6c 100644 --- a/.github/workflows/detect-internal-config-changes.yml +++ b/.github/workflows/detect-internal-config-changes.yml @@ -19,14 +19,12 @@ on: paths: - "internal/config/**" - "!internal/config/**/*_test.go" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - warning: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml index 331428d710..f786cc5bce 100644 --- a/.github/workflows/dockers-agent-ngt-image.yml +++ b/.github/workflows/dockers-agent-ngt-image.yml @@ -75,7 +75,6 @@ on: - "dockers/agent/core/ngt/Dockerfile" - "versions/GO_VERSION" - "versions/NGT_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml index a95948e15f..8a46d773a2 100644 --- a/.github/workflows/dockers-agent-sidecar-image.yml +++ b/.github/workflows/dockers-agent-sidecar-image.yml @@ -75,7 +75,6 @@ on: - "cmd/agent/sidecar/**" - "dockers/agent/sidecar/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-benchmark-job-image.yml b/.github/workflows/dockers-benchmark-job-image.yml index 3524cb7b0c..52abd5addc 100644 --- a/.github/workflows/dockers-benchmark-job-image.yml +++ b/.github/workflows/dockers-benchmark-job-image.yml @@ -73,7 +73,6 @@ on: - "cmd/benchmark/job/**" - "dockers/tools/benchmark/job/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-benchmark-operator-image.yaml b/.github/workflows/dockers-benchmark-operator-image.yaml index 71aeec8673..2116399296 100644 --- a/.github/workflows/dockers-benchmark-operator-image.yaml +++ b/.github/workflows/dockers-benchmark-operator-image.yaml @@ -73,7 +73,6 @@ on: - "cmd/benchmark/job/**" - "dockers/tools/benchmark/operator/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-ci-container-image.yml b/.github/workflows/dockers-ci-container-image.yml index b347e63db3..179fe3e7a3 100644 --- a/.github/workflows/dockers-ci-container-image.yml +++ b/.github/workflows/dockers-ci-container-image.yml @@ -54,7 +54,6 @@ on: - "Makefile.d/**" - "versions/GO_VERSION" - "versions/NGT_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-dev-container-image.yml b/.github/workflows/dockers-dev-container-image.yml index a71551a111..75746b67de 100644 --- a/.github/workflows/dockers-dev-container-image.yml +++ b/.github/workflows/dockers-dev-container-image.yml @@ -49,7 +49,6 @@ on: - "Makefile.d/**" - "versions/GO_VERSION" - "versions/NGT_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml index 6591924953..94ad3b97bd 100644 --- a/.github/workflows/dockers-discoverer-k8s-image.yml +++ b/.github/workflows/dockers-discoverer-k8s-image.yml @@ -69,7 +69,6 @@ on: - "cmd/discoverer/k8s/**" - "dockers/discoverer/k8s/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-filter-image.yml b/.github/workflows/dockers-gateway-filter-image.yml index 96636e666f..c21e329ffd 100644 --- a/.github/workflows/dockers-gateway-filter-image.yml +++ b/.github/workflows/dockers-gateway-filter-image.yml @@ -78,7 +78,6 @@ on: - "pkg/gateway/internal/**" - "dockers/gateway/filter/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-lb-image.yml b/.github/workflows/dockers-gateway-lb-image.yml index 215b41b428..4806aa2615 100644 --- a/.github/workflows/dockers-gateway-lb-image.yml +++ b/.github/workflows/dockers-gateway-lb-image.yml @@ -78,7 +78,6 @@ on: - "pkg/gateway/internal/**" - "dockers/gateway/lb/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-mirror-image.yaml b/.github/workflows/dockers-gateway-mirror-image.yaml index e3e137e3e8..196090d86e 100644 --- a/.github/workflows/dockers-gateway-mirror-image.yaml +++ b/.github/workflows/dockers-gateway-mirror-image.yaml @@ -73,7 +73,6 @@ on: - "pkg/gateway/internal/**" - "dockers/gateway/mirror/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-helm-operator-image.yml b/.github/workflows/dockers-helm-operator-image.yml index 1010c145b9..1050a6e56b 100644 --- a/.github/workflows/dockers-helm-operator-image.yml +++ b/.github/workflows/dockers-helm-operator-image.yml @@ -63,7 +63,6 @@ on: - "charts/vald-helm-operator/values.yaml" - "charts/vald-helm-operator/templates/**" - "versions/OPERATOR_SDK_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-correction.yml b/.github/workflows/dockers-index-correction.yml index 30b67d6276..66fd5008e3 100644 --- a/.github/workflows/dockers-index-correction.yml +++ b/.github/workflows/dockers-index-correction.yml @@ -69,7 +69,6 @@ on: - "cmd/index/job/correction/**" - "dockers/index/job/correction/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-creation.yml b/.github/workflows/dockers-index-creation.yml index 5910fa1761..9902dfd54d 100644 --- a/.github/workflows/dockers-index-creation.yml +++ b/.github/workflows/dockers-index-creation.yml @@ -69,7 +69,6 @@ on: - "cmd/index/job/creation/**" - "dockers/index/job/creation/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-save.yml b/.github/workflows/dockers-index-save.yml index 8e760584de..696f13d533 100644 --- a/.github/workflows/dockers-index-save.yml +++ b/.github/workflows/dockers-index-save.yml @@ -69,7 +69,6 @@ on: - "cmd/index/job/save/**" - "dockers/index/job/save/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-loadtest-image.yml b/.github/workflows/dockers-loadtest-image.yml index 7f624a22c5..6a39f6b2de 100644 --- a/.github/workflows/dockers-loadtest-image.yml +++ b/.github/workflows/dockers-loadtest-image.yml @@ -72,7 +72,6 @@ on: - "cmd/tools/cli/loadtest/**" - "dockers/tools/cli/loadtest/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-manager-index-image.yml b/.github/workflows/dockers-manager-index-image.yml index 107b353b15..2369f84282 100644 --- a/.github/workflows/dockers-manager-index-image.yml +++ b/.github/workflows/dockers-manager-index-image.yml @@ -72,7 +72,6 @@ on: - "cmd/manager/index/**" - "dockers/manager/index/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-readreplica-rotate.yml b/.github/workflows/dockers-readreplica-rotate.yml index 2f7f982b45..32cf9df19e 100644 --- a/.github/workflows/dockers-readreplica-rotate.yml +++ b/.github/workflows/dockers-readreplica-rotate.yml @@ -69,7 +69,6 @@ on: - "cmd/index/job/readreplica/rotate/**" - "dockers/index/job/readreplica/rotate/Dockerfile" - "versions/GO_VERSION" - jobs: build: uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/e2e-code-bench-agent.yaml b/.github/workflows/e2e-code-bench-agent.yaml index 3cc73215e0..27e4837a2e 100644 --- a/.github/workflows/e2e-code-bench-agent.yaml +++ b/.github/workflows/e2e-code-bench-agent.yaml @@ -41,21 +41,17 @@ on: - "hack/benchmark/**" - "versions/GO_VERSION" - "versions/NGT_VERSION" - env: DATASET: fashion-mnist-784-euclidean.hdf5 DATASET_ARGS: fashion-mnist - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - grpc-sequential: name: grpc-sequential runs-on: ubuntu-latest @@ -64,18 +60,14 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: ./.github/actions/setup-go - - name: Run grpc-sequential run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} DATASET_ARGS=${{ env.DATASET_ARGS }} make bench/agent/sequential/grpc - - name: Upload artifact uses: actions/upload-artifact@v4 with: @@ -87,7 +79,6 @@ jobs: ./pprof/agent/sequential/grpc.trace.out ./pprof/agent/sequential/grpc.cpu.svg ./pprof/agent/sequential/grpc.mem.svg - grpc-stream: name: grpc-stream runs-on: ubuntu-latest @@ -96,18 +87,14 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: ./.github/actions/setup-go - - name: Run grpc-stream run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} DATASET_ARGS=${{ env.DATASET_ARGS }} make bench/agent/stream - - name: Upload artifact uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/e2e-max-dim.yml b/.github/workflows/e2e-max-dim.yml index 36fe69eab2..9e87ac084b 100644 --- a/.github/workflows/e2e-max-dim.yml +++ b/.github/workflows/e2e-max-dim.yml @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + name: "Run E2E Max Dimension test" on: push: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5be11e64db..d4988ef553 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -26,7 +26,6 @@ on: - "labeled" env: DATASET: fashion-mnist-784-euclidean.hdf5 - jobs: dump-contexts-to-log: if: startsWith( github.ref, 'refs/tags/') || github.event.action == 'labeled' && github.event.label.name == 'actions/e2e-deploy' @@ -34,7 +33,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - e2e-stream-crud: name: "E2E test (Stream CRUD)" needs: [dump-contexts-to-log] @@ -42,15 +40,12 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -59,7 +54,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -78,7 +72,6 @@ jobs: e2e env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-stream-crud-for-operator: name: "E2E test (Stream CRUD) for operator" needs: [dump-contexts-to-log] @@ -86,15 +79,12 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Create Helm options for vald-helm-operator uses: ./.github/actions/setup-e2e id: vald_helm_operator @@ -104,7 +94,6 @@ jobs: require_go: false require_helm: false require_k3d: false - - name: Merge Docker image tag run: | yq e ".spec.defaults.image.tag=\"${{ steps.setup_e2e.outputs.DEFAULT_IMAGE_TAG }}\"" -i ./.github/valdrelease/valdrelease.yaml @@ -119,7 +108,6 @@ jobs: TAG="\"${ARR[1]}\"" yq e ".spec.$FIELD=$TAG" -i ./.github/valdrelease/valdrelease.yaml done - - name: Deploy Vald using Vald Helm Operator id: deploy_vald uses: ./.github/actions/e2e-deploy-vald-helm-operator @@ -128,7 +116,6 @@ jobs: helm_extra_options: ${{ steps.vald_helm_operator.outputs.HELM_EXTRA_OPTIONS }} valdrelease: ./.github/valdrelease/valdrelease.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -147,7 +134,6 @@ jobs: e2e env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-stream-crud-under-index-management-jobs: name: "E2E test (Stream CRUD) under index management jobs" needs: [dump-contexts-to-log] @@ -155,21 +141,14 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e with: - target_images: "vdaas/vald-agent-ngt \ - vdaas/vald-discoverer-k8s \ - vdaas/vald-lb-gateway \ - vdaas/vald-index-creation \ - vdaas/vald-index-save" - + target_images: "vdaas/vald-agent-ngt vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-index-creation vdaas/vald-index-save" - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -179,7 +158,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} ${{ env.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -198,7 +176,6 @@ jobs: e2e env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-stream-crud-skip-exist-check: name: "E2E test (Stream CRUD: skip strict exist check)" needs: [dump-contexts-to-log] @@ -206,15 +183,12 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -223,7 +197,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -242,7 +215,6 @@ jobs: e2e/skip env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-multiapis-crud: name: "E2E test (Multi-APIs CRUD)" needs: [dump-contexts-to-log] @@ -250,15 +222,12 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -267,7 +236,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -282,7 +250,6 @@ jobs: e2e/multi env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-jobs: name: "E2E test (Jobs)" needs: [dump-contexts-to-log] @@ -290,15 +257,12 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -306,7 +270,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E Jobs run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -318,7 +281,6 @@ jobs: e2e/index/job/correction env: POD_NAME: ${{ steps.deploy_vald.outputs.POD_NAME }} - e2e-stream-crud-with-readreplica: name: "E2E test (Stream CRUD) with read replica" needs: [dump-contexts-to-log] @@ -326,18 +288,15 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e with: require_k3d: "false" require_minikube: "true" - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -345,7 +304,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-readreplica.yaml wait_for_selector: app=vald-agent - - name: Deploy Vald Read Replica id: deploy_vald_readreplica uses: ./.github/actions/e2e-deploy-vald-readreplica @@ -354,7 +312,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-readreplica.yaml wait_for_selector: app=vald-lb-gateway - - name: Run E2E CRUD with read replica rotation run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -373,7 +330,6 @@ jobs: e2e/readreplica env: POD_NAME: ${{ steps.deploy_vald_readreplica.outputs.POD_NAME }} - e2e-stream-crud-with-mirror: name: "E2E test (Stream CRUD) with mirror" needs: [dump-contexts-to-log] @@ -381,17 +337,14 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e with: target_images: "vdaas/vald-agent-ngt vdaas/vald-discoverer-k8s vdaas/vald-lb-gateway vdaas/vald-manager-index vdaas/vald-mirror-gateway" - - name: Deploy Vald-01 id: deploy_vald_01 uses: ./.github/actions/e2e-deploy-vald @@ -400,7 +353,6 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-mirror-01.yaml wait_for_selector: app=vald-mirror-gateway - - name: Deploy Vald-02 id: deploy_vald_02 uses: ./.github/actions/e2e-deploy-vald @@ -409,13 +361,11 @@ jobs: helm_extra_options: ${{ steps.setup_e2e.outputs.HELM_EXTRA_OPTIONS }} values: .github/helm/values/values-mirror-02.yaml wait_for_selector: app=vald-mirror-gateway - - name: Deploy Mirror Target run: | kubectl apply -f .github/helm/values/vald-mirror-target.yaml -n vald-01 sleep 5s kubectl get pods -A && kubectl get vmt -o wide -A - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${{ env.DATASET }} @@ -434,7 +384,6 @@ jobs: e2e env: POD_NAME: ${{ steps.deploy_vald_01.outputs.POD_NAME }} - slack-notification: name: "Slack notification" if: startsWith( github.ref, 'refs/tags/') @@ -450,7 +399,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/notify-slack with: author_name: "E2E deploy test" diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 689a3ec9b9..792a9be2b3 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -21,7 +21,6 @@ on: pull_request: types: - "labeled" - jobs: dump-contexts-to-log: if: github.ref == 'refs/heads/main' || github.event.action == 'labeled' && github.event.label.name == 'actions/fossa' @@ -29,10 +28,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - fossa-scan: name: "trigger FOSSA scan" runs-on: ubuntu-latest @@ -41,15 +38,12 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: "Install fossa-cli" run: | curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash - - name: "Run for main branch" if: github.ref == 'refs/heads/main' run: | @@ -58,7 +52,6 @@ jobs: FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_SHA: ${{ github.sha }} - - name: "Run for PRs" if: github.event_name == 'pull_request' run: | diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 65b5afc450..98702699f3 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -21,17 +21,14 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - update-helm-chart: name: Update Helm chart runs-on: ubuntu-latest @@ -43,25 +40,20 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - name: Setup Helm environment uses: ./.github/actions/setup-helm - - name: Packaging run: | make helm/package/vald make helm/package/vald-helm-operator - - name: Push to gh-pages run: | git checkout . @@ -77,22 +69,18 @@ jobs: env: GITHUB_USER: ${{ secrets.DISPATCH_USER }} GITHUB_TOKEN: ${{ secrets.DISPATCH_TOKEN }} - crud-on-remote-helm-chart: name: CRUD test on remote Helm chart runs-on: ubuntu-latest timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Setup E2E environment id: setup_e2e uses: ./.github/actions/setup-e2e - - name: Deploy Vald id: deploy_vald uses: ./.github/actions/e2e-deploy-vald @@ -101,7 +89,6 @@ jobs: values: .github/helm/values/values-lb.yaml wait_for_selector: app=vald-lb-gateway use_local_charts: false - - name: Run E2E CRUD run: | make hack/benchmark/assets/dataset/${DATASET} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c48b118e00..7a443ce318 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,6 @@ on: - "!release/v*.*.*" types: - "closed" - jobs: dump-contexts-to-log: if: >- @@ -30,7 +29,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - release: needs: - dump-contexts-to-log @@ -40,17 +38,14 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - name: Create release tag id: create_release_tag env: @@ -65,7 +60,6 @@ jobs: git push origin ${VERSION} echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT - - name: Create release uses: softprops/action-gh-release@v1 env: @@ -77,7 +71,6 @@ jobs: See [CHANGELOG.md](https://github.com/vdaas/vald/blob/${{ steps.create_release_tag.outputs.VERSION }}/CHANGELOG.md) for details. draft: false prerelease: false - - name: Add the version to goproxy run: | curl "https://proxy.golang.org/github.com/vdaas/vald/@v/${{ steps.create_release_tag.outputs.VERSION }}.info" diff --git a/.github/workflows/reviewdog-hadolint.yml b/.github/workflows/reviewdog-hadolint.yml index c04bd8504e..df0383320f 100644 --- a/.github/workflows/reviewdog-hadolint.yml +++ b/.github/workflows/reviewdog-hadolint.yml @@ -19,24 +19,20 @@ on: pull_request: paths: - "dockers/**" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - hadolint: name: runner / hadolint runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run hadolint uses: reviewdog/action-hadolint@v1 with: diff --git a/.github/workflows/reviewdog-k8s.yml b/.github/workflows/reviewdog-k8s.yml index f7310207a9..bde5bc043d 100644 --- a/.github/workflows/reviewdog-k8s.yml +++ b/.github/workflows/reviewdog-k8s.yml @@ -20,17 +20,14 @@ on: paths: - "charts/**" - "k8s/**" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - kubeval-conflint: name: runner / kubeval-conflint runs-on: ubuntu-latest @@ -39,11 +36,9 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run kubeval-conflint run: | set -vx @@ -53,7 +48,6 @@ jobs: CONFLINT_LOG: DEBUG REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPORTER: github-pr-review - kubelinter-k8s-manifests: name: runner / kubelinter runs-on: ubuntu-latest @@ -62,11 +56,9 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run kubelinter for k8s directory run: | kube-linter lint \ @@ -75,7 +67,6 @@ jobs: k8s/discoverer \ k8s/gateway \ k8s/manager - kubelinter-vald-chart: name: runner / kubelinter for vald chart runs-on: ubuntu-latest @@ -84,11 +75,9 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run kubelinter for generated manifests run: | kube-linter lint \ diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index a8238a16b8..6ad06cbf7c 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -19,17 +19,14 @@ on: pull_request: paths: - "**.go" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - golangci-lint: name: runner / golangci-lint runs-on: ubuntu-latest @@ -38,15 +35,12 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Go build run: | - go build -mod=readonly ./... - + GOARCH=${GOARCH} GOOS=${GOOS} go build -mod=readonly ./... - name: Run golangci-lint run: | golangci-lint run --config .golangci.yml \ diff --git a/.github/workflows/semver-major-minor.yaml b/.github/workflows/semver-major-minor.yaml index d4a36baaf2..ebe710e4d2 100644 --- a/.github/workflows/semver-major-minor.yaml +++ b/.github/workflows/semver-major-minor.yaml @@ -20,14 +20,12 @@ on: - "main" env: BACKPORT_LABEL_PREFIX: "actions/backport/" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - semver-auto: runs-on: ubuntu-latest needs: [dump-contexts-to-log] @@ -40,11 +38,9 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.DISPATCH_TOKEN }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Set context id: set_context run: | @@ -59,7 +55,6 @@ jobs: echo "LATEST_TAG=${LATEST_TAG}" echo "RELEASE_KIND=${RELEASE_KIND}" echo "UNSUPPORTED_VERSION=${UNSUPPORTED_VERSION}" - - name: Upgrade semver id: upgrade_semver if: ${{ steps.set_context.outputs.RELEASE_KIND != '' }} @@ -80,7 +75,6 @@ jobs: echo "RELEASE_TAG=${RELEASE_TAG}" echo "RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME}" - - name: Setup for release id: setup_for_release if: ${{ steps.upgrade_semver.outputs.RELEASE_TAG != '' }} @@ -97,7 +91,6 @@ jobs: echo "RELEASE_TAG=${RELEASE_TAG}" echo "RELEASE_BRANCH_NAME=${RELEASE_BRANCH_NAME}" echo "LABEL_NAME=${BACKPORT_LABEL_PREFIX}${RELEASE_BRANCH_NAME}" - release-pr: if: ${{ needs.semver-auto.outputs.RELEASE == 'true' }} needs: diff --git a/.github/workflows/semver-patch.yaml b/.github/workflows/semver-patch.yaml index f42c3c9949..50311be3a0 100644 --- a/.github/workflows/semver-patch.yaml +++ b/.github/workflows/semver-patch.yaml @@ -19,14 +19,12 @@ on: branches: - "release/v*.*" - "!release/v*.*.*" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - semver-auto: runs-on: ubuntu-latest outputs: @@ -37,7 +35,6 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set context id: set_context run: | @@ -52,7 +49,6 @@ jobs: echo "RELEASE_BRANCH_NAME_SUFFIX=${RELEASE_BRANCH_NAME_SUFFIX}" echo "BRANCH_LATEST_TAG=${BRANCH_LATEST_TAG}" echo "RELEASE_KIND=${RELEASE_KIND}" - - name: Upgrade semver id: upgrade_semver if: ${{ steps.set_context.outputs.RELEASE_KIND != '' }} @@ -71,7 +67,6 @@ jobs: echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_OUTPUT # e.g) vx.x.x echo "RELEASE_TAG=${RELEASE_TAG}" - release-pr: if: ${{ needs.semver-auto.outputs.RELEASE == 'true' }} needs: diff --git a/.github/workflows/test-hack.yml b/.github/workflows/test-hack.yml index 85133a16dc..99ce9040f6 100644 --- a/.github/workflows/test-hack.yml +++ b/.github/workflows/test-hack.yml @@ -37,22 +37,18 @@ on: - "hack/helm/**" - "hack/license/**" - "hack/tools/**" - env: # NOTE: This variable is used to make gorules run properly. GOPATH: ${{ github.workspace }} PROJECT_ROOT_DIR: src/github.com/vdaas/vald - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - test-hack: name: Run tests for hack packages runs-on: ubuntu-latest @@ -66,19 +62,15 @@ jobs: - uses: actions/checkout@v4 with: path: ${{ env.PROJECT_ROOT_DIR }} - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Install Proto dependencies run: | make proto/deps - - name: Run tests for hack packages / gotestfmt run: | TEST_RESULT_DIR=${GITHUB_WORKSPACE} make test/hack/gotestfmt - - name: Print tparse result run: | tparse -notests -smallscreen -sort cover -format markdown -file ${GITHUB_WORKSPACE}/test-hack-gotestfmt-result.json diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 1fd3541355..96b4a8ffa1 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -35,17 +35,14 @@ on: - "internal/**" - "pkg/**" - "cmd/**" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - detect-ci-container: uses: ./.github/workflows/_detect-ci-container.yml - test-cmd: name: Run tests for cmd packages runs-on: ubuntu-latest @@ -54,19 +51,15 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run tests for cmd packages / gotestfmt run: | TEST_RESULT_DIR=${GITHUB_WORKSPACE} make test/cmd/gotestfmt - - name: Print tparse result run: | tparse -notests -smallscreen -sort cover -format markdown -file "${GITHUB_WORKSPACE}/test-cmd-gotestfmt-result.json" - test-internal: name: Run tests for internal packages runs-on: ubuntu-latest @@ -75,19 +68,15 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run tests for internal packages / gotestfmt run: | TEST_RESULT_DIR=${GITHUB_WORKSPACE} make test/internal/gotestfmt - - name: Print tparse result run: | tparse -notests -smallscreen -sort cover -format markdown -file "${GITHUB_WORKSPACE}/test-internal-gotestfmt-result.json" - test-pkg: name: Run tests for pkg packages runs-on: ubuntu-latest @@ -96,15 +85,12 @@ jobs: image: ghcr.io/vdaas/vald/vald-ci-container:${{ needs.detect-ci-container.outputs.TAG_NAME }} steps: - uses: actions/checkout@v4 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Run tests for pkg packages / gotestfmt run: | TEST_RESULT_DIR=${GITHUB_WORKSPACE} make test/pkg/gotestfmt - - name: Print tparse result run: | tparse -notests -smallscreen -sort cover -format markdown -file "${GITHUB_WORKSPACE}/test-pkg-gotestfmt-result.json" diff --git a/.github/workflows/update-protobuf.yaml b/.github/workflows/update-protobuf.yaml index b42156acf9..13d8430b43 100644 --- a/.github/workflows/update-protobuf.yaml +++ b/.github/workflows/update-protobuf.yaml @@ -22,32 +22,27 @@ on: - "v*.*.*" - "*.*.*-*" - "v*.*.*-*" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - client-go: uses: ./.github/workflows/_update-protobuf.yaml with: repo: vald-client-go secrets: inherit - client-java: uses: ./.github/workflows/_update-protobuf.yaml with: repo: vald-client-java secrets: inherit - client-node: uses: ./.github/workflows/_update-protobuf.yaml with: repo: vald-client-node secrets: inherit - client-python: uses: ./.github/workflows/_update-protobuf.yaml with: diff --git a/.github/workflows/update-pull-request-and-issue-template.yml b/.github/workflows/update-pull-request-and-issue-template.yml index cd182f97a5..0cf7de9d82 100644 --- a/.github/workflows/update-pull-request-and-issue-template.yml +++ b/.github/workflows/update-pull-request-and-issue-template.yml @@ -22,14 +22,12 @@ on: - "versions/GO_VERSION" - "versions/NGT_VERSION" - "versions/KUBECTL_VERSION" - jobs: dump-contexts-to-log: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/dump-context - update-pr-issue-template: name: Update PULL_REQUEST_TEMPLATE and ISSUE_TEMPLATE runs-on: ubuntu-latest @@ -37,17 +35,14 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Set Git config run: | git config --global --add safe.directory ${GITHUB_WORKSPACE} - - uses: crazy-max/ghaction-import-gpg@v6 with: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} git_user_signingkey: true git_commit_gpgsign: true - - name: Push to main run: | TIMESTAMP=$(date +%Y%m%d_%H%M%S_%3N) diff --git a/Makefile b/Makefile index c6e02dac0c..f58e60a03f 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,6 @@ MAINTAINER = "$(ORG).org $(NAME) team <$(NAME)@$(ORG).org>" VERSION ?= $(eval VERSION := $(shell cat versions/VALD_VERSION))$(VERSION) -NGT_VERSION := $(eval NGT_VERSION := $(shell cat versions/NGT_VERSION))$(NGT_VERSION) NGT_REPO = github.com/yahoojapan/NGT GOPRIVATE = $(GOPKG),$(GOPKG)/apis,$(GOPKG)-client-go @@ -55,6 +54,7 @@ GOCACHE := $(eval GOCACHE := $(shell go env GOCACHE))$(GOCACHE) GOOS := $(eval GOOS := $(shell go env GOOS))$(GOOS) GO_CLEAN_DEPS := true GOTEST_TIMEOUT = 30m +CGO_ENABLED = 1 RUST_HOME = /usr/local/lib/rust RUSTUP_HOME = $(RUST_HOME)/rustup @@ -64,9 +64,8 @@ TEST_NOT_IMPL_PLACEHOLDER = NOT IMPLEMENTED BELOW TEMP_DIR := $(eval TEMP_DIR := $(shell mktemp -d))$(TEMP_DIR) -NGT_REPO = github.com/yahoojapan/NGT - BUF_VERSION := $(eval BUF_VERSION := $(shell cat versions/BUF_VERSION))$(BUF_VERSION) +NGT_VERSION := $(eval NGT_VERSION := $(shell cat versions/NGT_VERSION))$(NGT_VERSION) FAISS_VERSION := $(eval FAISS_VERSION := $(shell cat versions/FAISS_VERSION))$(FAISS_VERSION) GOLANGCILINT_VERSION := $(eval GOLANGCILINT_VERSION := $(shell cat versions/GOLANGCILINT_VERSION))$(GOLANGCILINT_VERSION) HELM_DOCS_VERSION := $(eval HELM_DOCS_VERSION := $(shell cat versions/HELM_DOCS_VERSION))$(HELM_DOCS_VERSION) @@ -103,8 +102,13 @@ PWD := $(eval PWD := $(shell pwd))$(PWD) ifeq ($(UNAME),Linux) CPU_INFO_FLAGS := $(eval CPU_INFO_FLAGS := $(shell cat /proc/cpuinfo | grep flags | cut -d " " -f 2- | head -1))$(CPU_INFO_FLAGS) +CORES := $(eval CORES := $(shell nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null))$(CORES) +else ifeq ($(UNAME),Darwin) +CPU_INFO_FLAGS := "" +CORES := $(eval CORES := $(shell sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null))$(CORES) else CPU_INFO_FLAGS := "" +CORES := 1 endif GIT_COMMIT := $(eval GIT_COMMIT := $(shell git rev-list -1 HEAD))$(GIT_COMMIT) @@ -384,6 +388,8 @@ clean-generated: license: GOPRIVATE=$(GOPRIVATE) \ MAINTAINER=$(MAINTAINER) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go run -mod=readonly hack/license/gen/main.go $(ROOTDIR) .PHONY: init @@ -412,9 +418,9 @@ update: \ proto/all \ deps \ update/template \ - format \ go/deps \ - rust/deps + rust/deps \ + format .PHONY: format ## format go codes @@ -433,10 +439,10 @@ format/go: \ gofumpt/install \ strictgoimports/install \ goimports/install - find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs $(GOBIN)/golines -w -m $(GOLINES_MAX_WIDTH) - find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs $(GOBIN)/gofumpt -w - find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs $(GOBIN)/strictgoimports -w - find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*\.go' -print | xargs $(GOBIN)/goimports -w + find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs -P$(CORES) $(GOBIN)/golines -w -m $(GOLINES_MAX_WIDTH) + find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs -P$(CORES) $(GOBIN)/gofumpt -w + find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*[^\.pb]\.go' -print | xargs -P$(CORES) $(GOBIN)/strictgoimports -w + find $(ROOTDIR)/ -type d -name .git -prune -o -type f -regex '.*\.go' -print | xargs -P$(CORES) $(GOBIN)/goimports -w .PHONY: format/go/test ## run golines, gofumpt, goimports for go test files @@ -445,19 +451,19 @@ format/go/test: \ gofumpt/install \ strictgoimports/install \ goimports/install - find $(ROOTDIR)/* -name '*_test.go' | xargs $(GOBIN)/golines -w -m $(GOLINES_MAX_WIDTH) - find $(ROOTDIR)/* -name '*_test.go' | xargs $(GOBIN)/gofumpt -w - find $(ROOTDIR)/* -name '*_test.go' | xargs $(GOBIN)/strictgoimports -w - find $(ROOTDIR)/* -name '*_test.go' | xargs $(GOBIN)/goimports -w + find $(ROOTDIR) -name '*_test.go' | xargs -P$(CORES) $(GOBIN)/golines -w -m $(GOLINES_MAX_WIDTH) + find $(ROOTDIR) -name '*_test.go' | xargs -P$(CORES) $(GOBIN)/gofumpt -w + find $(ROOTDIR) -name '*_test.go' | xargs -P$(CORES) $(GOBIN)/strictgoimports -w + find $(ROOTDIR) -name '*_test.go' | xargs -P$(CORES) $(GOBIN)/goimports -w .PHONY: format/yaml format/yaml: \ - prettier/install - prettier --write \ - "$(ROOTDIR)/.github/**/*.yaml" \ - "$(ROOTDIR)/.github/**/*.yml" \ - "$(ROOTDIR)/cmd/**/*.yaml" \ - "$(ROOTDIR)/k8s/**/*.yaml" + prettier/install\ + yamlfmt/install + -find $(ROOTDIR) -name "*.yaml" -type f | grep -v templates | grep -v s3 | xargs -P$(CORES) -I {} prettier --write {} + -find $(ROOTDIR) -name "*.yml" -type f | grep -v templates | grep -v s3 | xargs -P$(CORES) -I {} prettier --write {} + -find $(ROOTDIR) -name "*.yaml" -type f | grep -v templates | grep -v s3 | xargs -P$(CORES) -I {} yamlfmt {} + -find $(ROOTDIR) -name "*.yml" -type f | grep -v templates | grep -v s3 | xargs -P$(CORES) -I {} yamlfmt {} .PHONY: format/md format/md: \ diff --git a/Makefile.d/bench.mk b/Makefile.d/bench.mk index fd3cf8ad42..e97d845c9c 100644 --- a/Makefile.d/bench.mk +++ b/Makefile.d/bench.mk @@ -128,6 +128,8 @@ pprof/core/ngt/sequential.bin: \ hack/benchmark/core/ngt/ngt_bench_test.go mkdir -p $(dir $@) GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -mod=readonly \ -count=1 \ @@ -150,6 +152,8 @@ pprof/core/ngt/parallel.bin: \ hack/benchmark/core/ngt/ngt_bench_test.go mkdir -p $(dir $@) GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -mod=readonly \ -count=1 \ @@ -179,6 +183,8 @@ pprof/agent/stream.bin: \ ngt/install mkdir -p $(dir $@) GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -mod=readonly \ -count=1 \ @@ -202,6 +208,8 @@ pprof/agent/sequential/grpc.bin: \ ngt/install mkdir -p $(dir $@) GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -mod=readonly \ -count=1 \ @@ -230,6 +238,8 @@ pprof/gateway/sequential.bin: \ ngt/install mkdir -p $(dir $@) GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -mod=readonly \ -count=1 \ @@ -276,6 +286,8 @@ metrics/agent/core/ngt: $(ROOTDIR)/metrics.gob $(ROOTDIR)/metrics.gob: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -mod=readonly -v --timeout=1h $(ROOTDIR)/hack/benchmark/e2e/agent/core/ngt/... -output=$(ROOTDIR)/metrics.gob .PHONY: metrics/chart @@ -283,6 +295,9 @@ $(ROOTDIR)/metrics.gob: metrics/chart: $(ROOTDIR)/assets/image/metrics.svg $(ROOTDIR)/assets/image/metrics.svg: $(ROOTDIR)/metrics.gob + GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go run $(ROOTDIR)/hack/tools/metrics/main.go -title "Recall-QPS" -x Recall -y QPS -width 960 -height 720 -input=$(ROOTDIR)/metrics.gob -output=$(ROOTDIR)/assets/image/metrics.svg .PHONY: bench/kill @@ -296,4 +311,4 @@ bench/kill: | grep -v "rg go" \ | grep -v "grep go" \ | awk '{print $1}' \ - | xargs kill -9 + | xargs -P$(CORES) kill -9 diff --git a/Makefile.d/build.mk b/Makefile.d/build.mk index 1776f41df9..da3854a568 100644 --- a/Makefile.d/build.mk +++ b/Makefile.d/build.mk @@ -17,446 +17,94 @@ .PHONY: binary/build ## build all binaries binary/build: \ - cmd/agent/core/ngt/ngt \ cmd/agent/core/faiss/faiss \ + cmd/agent/core/ngt/ngt \ cmd/agent/sidecar/sidecar \ cmd/discoverer/k8s/discoverer \ - cmd/gateway/lb/lb \ cmd/gateway/filter/filter \ + cmd/gateway/lb/lb \ + cmd/gateway/mirror/mirror \ + cmd/index/job/correction/index-correction \ + cmd/index/job/creation/index-creation \ + cmd/index/job/readreplica/rotate/readreplica-rotate \ + cmd/index/job/save/index-save \ cmd/manager/index/index \ cmd/tools/benchmark/job/job \ cmd/tools/benchmark/operator/operator + cmd/agent/core/ngt/ngt: \ - ngt/install \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/agent/core/ngt -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/agent/core/ngt $(ROOTDIR)/pkg/agent/internal -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') + ngt/install $(eval CGO_ENABLED = 1) - CFLAGS="$(CFLAGS)" \ - CXXFLAGS="$(CXXFLAGS)" \ - CGO_ENABLED=$(CGO_ENABLED) \ - CGO_CXXFLAGS="-g -Ofast -march=native" \ - CGO_FFLAGS="-g -Ofast -march=native" \ - CGO_LDFLAGS="-g -Ofast -march=native" \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -linkmode 'external' \ - -extldflags '-static -fPIC -pthread -fopenmp -std=gnu++20 -lstdc++ -lm -z relro -z now $(EXTLDFLAGS)' \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.AlgorithmInfo=NGT-$(NGT_VERSION)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "cgo osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(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),$@) cmd/agent/core/faiss/faiss: \ - faiss/install \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/agent/core/faiss -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/agent/core/faiss $(ROOTDIR)/pkg/agent/internal -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') - CFLAGS="$(CFLAGS)" \ - CXXFLAGS="$(CXXFLAGS)" \ - CGO_ENABLED=1 \ - CGO_CXXFLAGS="-g -Ofast -march=native" \ - CGO_FFLAGS="-g -Ofast -march=native" \ - CGO_LDFLAGS="-g -Ofast -march=native" \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -linkmode 'external' \ - -extldflags '-fPIC -pthread -fopenmp -std=gnu++20 -lstdc++ -lm -z relro -z now $(EXTLDFLAGS)' \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$${CGO_ENABLED}' \ - -X '$(GOPKG)/internal/info.FaissVersion=$(FAISS_VERSION)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "cgo osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + faiss/install + $(eval CGO_ENABLED = 1) + $(call go-build,agent/core/faiss,-linkmode 'external',-fPIC -pthread -fopenmp -std=gnu++20 -lstdc++ -lm -z relro -z now, cgo,FAISS-$(FAISS_VERSION),$@) -cmd/agent/sidecar/sidecar: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/agent/sidecar -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/agent/sidecar $(ROOTDIR)/pkg/agent/internal -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/agent/sidecar/sidecar: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,agent/sidecar,,,,,$@) -cmd/discoverer/k8s/discoverer: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/discoverer/k8s -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/discoverer/k8s -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/discoverer/k8s/discoverer: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,discoverer/k8s,,,,,$@) -cmd/gateway/lb/lb: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/gateway/lb -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/gateway/lb -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/gateway/lb/lb: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,gateway/lb,,,,,$@) -cmd/gateway/filter/filter: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/gateway/filter -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/gateway/filter -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/gateway/filter/filter: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,gateway/filter,,,,,$@) -cmd/gateway/mirror/mirror: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/gateway/mirror -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/gateway/mirror -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') - CGO_ENABLED=0 \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$${CGO_ENABLED}' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version +cmd/gateway/mirror/mirror: + $(eval CGO_ENABLED = 0) + $(call go-build,gateway/mirror,,,,,$@) -cmd/manager/index/index: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/manager/index -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/manager/index -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/manager/index/index: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,manager/index,,,,,$@) -cmd/index/job/correction/index-correction: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/index/job/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/index/job/correction -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/index/job/correction/index-correction: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,index/job/correction,,,,,$@) -cmd/index/job/creation/index-creation: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/index/job/creation -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/index/job/creation -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/index/job/creation/index-creation: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,index/job/creation,,,,,$@) -cmd/index/job/save/index-save: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/index/job/save -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/index/job/save -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/index/job/save/index-save: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,index/job/save,,,,,$@) -cmd/index/job/readreplica/rotate/readreplica-rotate: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/index/job/readreplica/rotate -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/index/job/readreplica/rotate -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') +cmd/index/job/readreplica/rotate/readreplica-rotate: $(eval CGO_ENABLED = 0) - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version + $(call go-build,index/job/readreplica/rotate,,,,,$@) -cmd/tools/benchmark/job/job: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/tools/benchmark/job -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/tools/benchmark/job -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') - CGO_ENABLED=$(CGO_ENABLED) \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -linkmode 'external' \ - -extldflags '-static -fPIC -pthread -fopenmp -std=gnu++20 -lhdf5 -lhdf5_hl -lm -ldl' \ - -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ - -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ - -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ - -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ - -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ - -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ - -X '$(GOPKG)/internal/info.CGOEnabled=${CGO_ENABLED}' \ - -X '$(GOPKG)/internal/info.NGTVersion=$(NGT_VERSION)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "cgo osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version +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),$@) -cmd/tools/benchmark/operator/operator: \ - $(GO_SOURCES_INTERNAL) \ - $(PBGOS) \ - $(shell find $(ROOTDIR)/cmd/tools/benchmark/operator -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') \ - $(shell find $(ROOTDIR)/pkg/tools/benchmark/operator -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') - CFLAGS="$(CFLAGS)" \ - CXXFLAGS="$(CXXFLAGS)" \ - CGO_ENABLED=1 \ - CGO_CXXFLAGS="-g -Ofast -march=native" \ - CGO_FFLAGS="-g -Ofast -march=native" \ - CGO_LDFLAGS="-g -Ofast -march=native" \ - GO111MODULE=on \ - GOPRIVATE=$(GOPRIVATE) \ - go build \ - --ldflags "-w -extldflags=-static \ - -X '$(GOPKG)/internal/info.CGOEnabled=${CGO_ENABLED}' \ - -X '$(GOPKG)/internal/info.NGTVersion=$(NGT_VERSION)' \ - -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ - -buildid=" \ - -mod=readonly \ - -modcacherw \ - -a \ - -tags "cgo osusergo netgo static_build" \ - -trimpath \ - -o $@ \ - $(dir $@)main.go - $@ -version +cmd/tools/benchmark/operator/operator: + $(eval CGO_ENABLED = 0) + $(call go-build,tools/benchmark/operator,,,,,$@) .PHONY: binary/build/zip ## build all binaries and zip them binary/build/zip: \ - artifacts/vald-agent-ngt-$(GOOS)-$(GOARCH).zip \ artifacts/vald-agent-faiss-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-agent-ngt-$(GOOS)-$(GOARCH).zip \ artifacts/vald-agent-sidecar-$(GOOS)-$(GOARCH).zip \ artifacts/vald-discoverer-k8s-$(GOOS)-$(GOARCH).zip \ - artifacts/vald-lb-gateway-$(GOOS)-$(GOARCH).zip \ artifacts/vald-filter-gateway-$(GOOS)-$(GOARCH).zip \ - artifacts/vald-manager-index-$(GOOS)-$(GOARCH).zip + artifacts/vald-index-correction-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-index-creation-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-index-save-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-lb-gateway-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-manager-index-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-mirror-gateway-$(GOOS)-$(GOARCH).zip \ + artifacts/vald-readreplica-rotate-$(GOOS)-$(GOARCH).zip artifacts/vald-agent-ngt-$(GOOS)-$(GOARCH).zip: cmd/agent/core/ngt/ngt $(call mkdir, $(dir $@)) @@ -493,3 +141,23 @@ artifacts/vald-benchmark-job-$(GOOS)-$(GOARCH).zip: cmd/tools/benchmark/job/job artifacts/vald-benchmark-operator-$(GOOS)-$(GOARCH).zip: cmd/tools/benchmark/operator/operator $(call mkdir, $(dir $@)) zip --junk-paths $@ $< + +artifacts/vald-mirror-gateway-$(GOOS)-$(GOARCH).zip: cmd/gateway/mirror/mirror + $(call mkdir, $(dir $@)) + zip --junk-paths $@ $< + +artifacts/vald-index-correction-$(GOOS)-$(GOARCH).zip: cmd/index/job/correction/index-correction + $(call mkdir, $(dir $@)) + zip --junk-paths $@ $< + +artifacts/vald-index-creation-$(GOOS)-$(GOARCH).zip: cmd/index/job/creation/index-creation + $(call mkdir, $(dir $@)) + zip --junk-paths $@ $< + +artifacts/vald-index-save-$(GOOS)-$(GOARCH).zip: cmd/index/job/save/index-save + $(call mkdir, $(dir $@)) + zip --junk-paths $@ $< + +artifacts/vald-readreplica-rotate-$(GOOS)-$(GOARCH).zip: cmd/index/job/readreplica/rotate/readreplica-rotate + $(call mkdir, $(dir $@)) + zip --junk-paths $@ $< diff --git a/Makefile.d/dependencies.mk b/Makefile.d/dependencies.mk index dac434deac..878dd866bd 100644 --- a/Makefile.d/dependencies.mk +++ b/Makefile.d/dependencies.mk @@ -48,6 +48,7 @@ go/download: .PHONY: go/deps ## install Go package dependencies go/deps: + sed -i "3s/go [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?/go $(GO_VERSION)/g" $(ROOTDIR)/hack/go.mod.default if $(GO_CLEAN_DEPS); then \ rm -rf $(ROOTDIR)/vendor \ /go/pkg \ @@ -76,6 +77,7 @@ go/example/deps: $(ROOTDIR)/example/client/vendor \ $(ROOTDIR)/example/client/go.mod \ $(ROOTDIR)/example/client/go.sum + sed -i "3s/go [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?/go $(GO_VERSION)/g" $(ROOTDIR)/example/client/go.mod.default cp $(ROOTDIR)/example/client/go.mod.default $(ROOTDIR)/example/client/go.mod cd $(ROOTDIR)/example/client && GOPRIVATE=$(GOPRIVATE) go mod tidy && cd - diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk index 2c4ba33736..3eec017859 100644 --- a/Makefile.d/docker.mk +++ b/Makefile.d/docker.mk @@ -93,14 +93,9 @@ docker/name/agent-faiss: .PHONY: docker/build/agent-faiss ## build agent-faiss image docker/build/agent-faiss: - $(DOCKER) build \ - $(DOCKER_OPTS) \ - -f dockers/agent/core/faiss/Dockerfile \ - -t $(ORG)/vald-agent-faiss:$(TAG) . \ - --build-arg GO_VERSION=$(GO_VERSION) \ - --build-arg DISTROLESS_IMAGE=$(DISTROLESS_IMAGE) \ - --build-arg DISTROLESS_IMAGE_TAG=$(DISTROLESS_IMAGE_TAG) \ - --build-arg MAINTAINER=$(MAINTAINER) + @make DOCKERFILE="$(ROOTDIR)/dockers/agent/core/faiss/Dockerfile" \ + IMAGE=$(AGENT_IMAGE) \ + docker/build/image .PHONY: docker/name/agent-sidecar docker/name/agent-sidecar: diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk index cd15298e0f..753349cd97 100644 --- a/Makefile.d/functions.mk +++ b/Makefile.d/functions.mk @@ -52,6 +52,44 @@ define go-vet | grep -v "Mutex" | sort | uniq endef +define go-build + echo $(GO_SOURCES_INTERNAL) + echo $(PBGOS) + echo $(shell find $(ROOTDIR)/cmd/$1 -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') + echo $(shell find $(ROOTDIR)/pkg/$1 -type f -name '*.go' -not -name '*_test.go' -not -name 'doc.go') + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" \ + CGO_ENABLED=$(CGO_ENABLED) \ + CGO_CXXFLAGS="-g -Ofast -march=native" \ + CGO_FFLAGS="-g -Ofast -march=native" \ + CGO_LDFLAGS="-g -Ofast -march=native" \ + GO111MODULE=on \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ + GOPRIVATE=$(GOPRIVATE) \ + GO_VERSION=$(GO_VERSION) \ + go build \ + --ldflags "-w $2 \ + -extldflags '-static $3' \ + -X '$(GOPKG)/internal/info.AlgorithmInfo=$5' \ + -X '$(GOPKG)/internal/info.BuildCPUInfoFlags=$(CPU_INFO_FLAGS)' \ + -X '$(GOPKG)/internal/info.BuildTime=$(DATETIME)' \ + -X '$(GOPKG)/internal/info.CGOEnabled=$(CGO_ENABLED)' \ + -X '$(GOPKG)/internal/info.GitCommit=$(GIT_COMMIT)' \ + -X '$(GOPKG)/internal/info.GoArch=$(GOARCH)' \ + -X '$(GOPKG)/internal/info.GoOS=$(GOOS)' \ + -X '$(GOPKG)/internal/info.GoVersion=$(GO_VERSION)' \ + -X '$(GOPKG)/internal/info.Version=$(VERSION)' \ + -buildid=" \ + -modcacherw \ + -mod=readonly \ + -a \ + -tags "osusergo netgo static_build$4" \ + -trimpath \ + -o $6 \ + $(ROOTDIR)/cmd/$1/main.go + $6 -version +endef define telepresence [ -z $(SWAP_IMAGE) ] && IMAGE=$2 || IMAGE=$(SWAP_IMAGE) \ @@ -66,6 +104,8 @@ endef define run-e2e-crud-test GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -race \ -mod=readonly \ @@ -92,6 +132,9 @@ define run-e2e-crud-test endef define run-e2e-crud-faiss-test + GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -race \ -mod=readonly \ @@ -115,6 +158,8 @@ endef define run-e2e-multi-crud-test GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -race \ -mod=readonly \ @@ -142,6 +187,8 @@ endef define run-e2e-max-dim-test GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -race \ -mod=readonly \ @@ -161,6 +208,8 @@ endef define run-e2e-sidecar-test GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test \ -race \ -mod=readonly \ @@ -234,7 +283,9 @@ define gen-vald-crd mv $(ROOTDIR)/charts/$1/crds/$2.yaml $(TEMP_DIR)/$2.yaml; \ fi; GOPRIVATE=$(GOPRIVATE) \ - go run -mod=readonly $(ROOTDIR)/hack/helm/schema/crd/main.go \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ + go run -mod=readonly $(ROOTDIR)/hack/helm/schema/crd/main.go \ $(ROOTDIR)/charts/$3.yaml > $(TEMP_DIR)/$2-spec.yaml $(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 diff --git a/Makefile.d/helm.mk b/Makefile.d/helm.mk index 0ebb7c78a6..e515043514 100644 --- a/Makefile.d/helm.mk +++ b/Makefile.d/helm.mk @@ -96,6 +96,8 @@ 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 .PHONY: helm/schema/vald-helm-operator @@ -106,6 +108,8 @@ 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 .PHONY: helm/schema/vald-benchmark-job @@ -116,6 +120,8 @@ 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 .PHONY: helm/schema/vald-benchmark-scenario @@ -126,6 +132,8 @@ 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 .PHONY: helm/schema/vald-benchmark-operator @@ -136,6 +144,8 @@ 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 diff --git a/Makefile.d/proto.mk b/Makefile.d/proto.mk index 5b8e503974..ef635b6972 100644 --- a/Makefile.d/proto.mk +++ b/Makefile.d/proto.mk @@ -22,7 +22,7 @@ proto/all: \ .PHONY: proto/clean ## clean proto artifacts proto/clean: - find apis/grpc -name "*.pb.go" | xargs rm -f + find apis/grpc -name "*.pb.go" | xargs -P$(CORES) rm -f rm -rf apis/swagger apis/docs .PHONY: proto/paths/print @@ -54,7 +54,7 @@ proto/gen: \ proto/deps @$(call green, "generating pb.go and swagger.json files and documents for API v1...") buf generate - find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs sed -i -E "s%google.golang.org/grpc/codes%github.com/vdaas/vald/internal/net/grpc/codes%g" - find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs sed -i -E "s%google.golang.org/grpc/status%github.com/vdaas/vald/internal/net/grpc/status%g" - find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs sed -i -E "s%\"io\"%\"github.com/vdaas/vald/internal/io\"%g" - find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs sed -i -E "s%\"sync\"%\"github.com/vdaas/vald/internal/sync\"%g" + find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs -P$(CORES) sed -i -E "s%google.golang.org/grpc/codes%github.com/vdaas/vald/internal/net/grpc/codes%g" + find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs -P$(CORES) sed -i -E "s%google.golang.org/grpc/status%github.com/vdaas/vald/internal/net/grpc/status%g" + find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs -P$(CORES) sed -i -E "s%\"io\"%\"github.com/vdaas/vald/internal/io\"%g" + find $(ROOTDIR)/apis/grpc/* -name '*.go' | xargs -P$(CORES) sed -i -E "s%\"sync\"%\"github.com/vdaas/vald/internal/sync\"%g" diff --git a/Makefile.d/test.mk b/Makefile.d/test.mk index 7100c90baf..3487acde3e 100644 --- a/Makefile.d/test.mk +++ b/Makefile.d/test.mk @@ -43,6 +43,8 @@ $(GOPATH)bin/gotests: ## run tests for cmd, internal, pkg test: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... .PHONY: test/tparse @@ -52,6 +54,8 @@ test/tparse: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -63,6 +67,8 @@ test/cmd/tparse: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -74,6 +80,8 @@ test/internal/tparse: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/internal/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -85,6 +93,8 @@ test/pkg/tparse: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -98,6 +108,8 @@ test/hack/tparse: \ GOPRIVATE=$(GOPRIVATE) \ go mod vendor -o $(ROOTDIR)/vendor GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=vendor -json -cover \ $(ROOTDIR)/hack/gorules/... \ $(ROOTDIR)/hack/helm/... \ @@ -114,6 +126,8 @@ test/all/tparse: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | tparse -pass -notests @@ -125,6 +139,8 @@ test/gotestfmt: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... $(ROOTDIR)/internal/... $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -136,6 +152,8 @@ test/cmd/gotestfmt: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/cmd/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -147,6 +165,8 @@ test/internal/gotestfmt: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/internal/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -158,6 +178,8 @@ test/pkg/gotestfmt: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/pkg/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -171,6 +193,8 @@ test/hack/gotestfmt: \ GOPRIVATE=$(GOPRIVATE) \ go mod vendor -o $(ROOTDIR)/vendor GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=vendor -json -cover \ $(ROOTDIR)/hack/gorules/... \ $(ROOTDIR)/hack/helm/... \ @@ -187,6 +211,8 @@ test/all/gotestfmt: \ set -euo pipefail rm -rf "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -json -cover -timeout=$(GOTEST_TIMEOUT) $(ROOTDIR)/... \ | tee "$(TEST_RESULT_DIR)/`echo $@ | sed -e 's%/%-%g'`-result.json" \ | gotestfmt -showteststatus @@ -222,18 +248,24 @@ test/remove-empty: ## run tests for pkg test/pkg: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/pkg/... .PHONY: test/internal ## run tests for internal test/internal: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/internal/... .PHONY: test/cmd ## run tests for cmd test/cmd: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/cmd/... .PHONY: test/hack @@ -242,6 +274,8 @@ test/hack: GOPRIVATE=$(GOPRIVATE) \ go mod vendor -o $(ROOTDIR)/vendor GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=vendor -cover \ $(ROOTDIR)/hack/gorules... \ $(ROOTDIR)/hack/helm/... \ @@ -253,14 +287,20 @@ test/hack: ## run tests for all Go codes test/all: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -cover $(ROOTDIR)/... .PHONY: coverage ## calculate coverages coverage: GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -short -shuffle=on -race -mod=readonly -v -race -covermode=atomic -timeout=$(GOTEST_TIMEOUT) -coverprofile=coverage.out $(ROOTDIR)/... GOPRIVATE=$(GOPRIVATE) \ + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go tool cover -html=coverage.out -o coverage.html .PHONY: gotests/gen @@ -285,16 +325,16 @@ gotests/gen-test: ## apply patches to generated go test files gotests/patch: @$(call green, "apply patches to go test files...") - find $(ROOTDIR)/internal/k8s/* -name '*_test.go' | xargs sed -i -E "s%k8s.io/apimachinery/pkg/api/errors%github.com/vdaas/vald/internal/errors%g" - find $(ROOTDIR)/* -name '*_test.go' | xargs sed -i -E "s%cockroachdb/errors%vdaas/vald/internal/errors%g" - find $(ROOTDIR)/* -name '*_test.go' | xargs sed -i -E "s%golang.org/x/sync/errgroup%github.com/vdaas/vald/internal/sync/errgroup%g" - find $(ROOTDIR)/* -name '*_test.go' | xargs sed -i -E "s%pkg/errors%vdaas/vald/internal/errors%g" - find $(ROOTDIR)/* -name '*_test.go' | xargs sed -i -E "s%go-errors/errors%vdaas/vald/internal/errors%g" - find $(ROOTDIR)/* -name '*_test.go' | xargs sed -i -E "s%go.uber.org/goleak%github.com/vdaas/vald/internal/test/goleak%g" - find $(ROOTDIR)/internal/errors -name '*_test.go' | xargs sed -i -E "s%\"github.com/vdaas/vald/internal/errors\"%%g" - find $(ROOTDIR)/internal/errors -name '*_test.go' -not -name '*_benchmark_test.go' | xargs sed -i -E "s/errors\.//g" - find $(ROOTDIR)/internal/test/goleak -name '*_test.go' | xargs sed -i -E "s%\"github.com/vdaas/vald/internal/test/goleak\"%%g" - find $(ROOTDIR)/internal/test/goleak -name '*_test.go' | xargs sed -i -E "s/goleak\.//g" + find $(ROOTDIR)/internal/k8s/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%k8s.io/apimachinery/pkg/api/errors%github.com/vdaas/vald/internal/errors%g" + find $(ROOTDIR)/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%cockroachdb/errors%vdaas/vald/internal/errors%g" + find $(ROOTDIR)/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%golang.org/x/sync/errgroup%github.com/vdaas/vald/internal/sync/errgroup%g" + find $(ROOTDIR)/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%pkg/errors%vdaas/vald/internal/errors%g" + find $(ROOTDIR)/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%go-errors/errors%vdaas/vald/internal/errors%g" + find $(ROOTDIR)/* -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%go.uber.org/goleak%github.com/vdaas/vald/internal/test/goleak%g" + find $(ROOTDIR)/internal/errors -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%\"github.com/vdaas/vald/internal/errors\"%%g" + find $(ROOTDIR)/internal/errors -name '*_test.go' -not -name '*_benchmark_test.go' | xargs -P$(CORES) sed -i -E "s/errors\.//g" + find $(ROOTDIR)/internal/test/goleak -name '*_test.go' | xargs -P$(CORES) sed -i -E "s%\"github.com/vdaas/vald/internal/test/goleak\"%%g" + find $(ROOTDIR)/internal/test/goleak -name '*_test.go' | xargs -P$(CORES) sed -i -E "s/goleak\.//g" .PHONY: test/patch-placeholder ## apply patches to the placeholder of the generated go test files diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index acb2a3d068..e370b08d2f 100644 --- a/Makefile.d/tools.mk +++ b/Makefile.d/tools.mk @@ -96,6 +96,12 @@ stern/install: $(GOPATH)/bin/stern $(GOPATH)/bin/stern: $(call go-install, github.com/stern/stern) +.PHONY: yamlfmt/install +yamlfmt/install: $(GOPATH)/bin/yamlfmt + +$(GOPATH)/bin/yamlfmt: + $(call go-install, github.com/google/yamlfmt/cmd/yamlfmt) + .PHONY: rust/install rust/install: $(CARGO_HOME)/bin/cargo diff --git a/charts/vald-benchmark-operator/schemas/scenario-values.yaml b/charts/vald-benchmark-operator/schemas/scenario-values.yaml index c1333060ab..2600b42a15 100644 --- a/charts/vald-benchmark-operator/schemas/scenario-values.yaml +++ b/charts/vald-benchmark-operator/schemas/scenario-values.yaml @@ -19,12 +19,10 @@ target: # @schema {"name": "target.host", "type": "string", "minLength": 1} # target.host -- target cluster host - host: - "vald-lb-gateway.default.svc.cluster.local" - # @schema {"name": "target.port", "type": "integer", "minimum": 0, "maximum": 65535} + host: "vald-lb-gateway.default.svc.cluster.local" + # @schema {"name": "target.port", "type": "integer", "minimum": 0, "maximum": 65535} # target.port -- target cluster port port: 8081 - # @schema {"name": "dataset", "type": "object", "required": ["name", "indexes", "group", "range"]} # dataset -- dataset information dataset: @@ -49,7 +47,6 @@ dataset: # @schema {"name": "dataset.url", "type": "string"} # dataset.url -- the dataset url which is used for executing benchmark job with user defined hdf5 file url: "" - # @schema {"name": "jobs", "type": "array", "items": {"type": "object"}} jobs: - target: diff --git a/charts/vald-benchmark-operator/values.yaml b/charts/vald-benchmark-operator/values.yaml index 95f1f8d184..155f13e655 100644 --- a/charts/vald-benchmark-operator/values.yaml +++ b/charts/vald-benchmark-operator/values.yaml @@ -17,19 +17,15 @@ # @schema {"name": "name", "type": "string"} # name -- name of the deployment name: vald-benchmark-operator - # @schema {"name": "replicas", "type": "integer"} # replicas -- the number of replica for deployment replicas: 1 - # @schema {"name": "version", "type": "string"} # version -- version of benchmark-operator config version: v0.0.0 - # @schema {"name": "time_zone", "type": "string"} # time_zone -- time_zone time_zone: "" - # @schema {"name": "image", "type": "object"} image: # @schema {"name": "image.repository", "type": "string"} @@ -41,7 +37,6 @@ image: # @schema {"name": "image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]} # image.pullPolicy -- image pull policy pullPolicy: Always - # @schema {"name": "job_image", "type": "object"} job_image: # @schema {"name": "job_image.repository", "type": "string"} @@ -53,7 +48,6 @@ job_image: # @schema {"name": "job_image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]} # image.pullPolicy -- image pull policy pullPolicy: Always - # @schema {"name": "rbac", "type": "object"} rbac: # @schema {"name": "rbac.create", "type": "boolean"} @@ -62,7 +56,6 @@ rbac: # @schema {"name": "rbac.name", "type": "string"} # rbac.name -- name of roles and rolebindings name: vald-benchmark-operator - # @schema {"name": "serviceAccount", "type": "object"} serviceAccount: # @schema {"name": "serviceAccount.create", "type": "boolean"} @@ -71,7 +64,6 @@ serviceAccount: # @schema {"name": "serviceAccount.name", "type": "string"} # serviceAccount.name -- name of service account name: vald-benchmark-operator - # @schema {"name": "service", "type": "object"} service: # @schema {"name": "service.enabled", "type": "boolean"} @@ -89,15 +81,12 @@ service: # @schema {"name": "service.externalTrafficPolicy", "type": "string"} # service.externalTrafficPolicy -- external traffic policy (can be specified when service type is LoadBalancer or NodePort) : Cluster or Local externalTrafficPolicy: "" - # @schema {"name": "annotations", "type": "object"} # annotations -- deployment annotations annotations: {} - # @schema {"name": "podAnnotations", "type": "object"} # podAnnotations -- pod annotations podAnnotations: {} - # @schema {"name": "securityContext", "type": "object"} # securityContext -- security context for container securityContext: @@ -110,7 +99,6 @@ securityContext: capabilities: drop: - ALL - # @schema {"name": "podSecurityContext", "type": "object"} # podSecurityContext -- security context for pod podSecurityContext: @@ -119,7 +107,6 @@ podSecurityContext: runAsGroup: 65532 fsGroup: 65532 fsGroupChangePolicy: "OnRootMismatch" - # @schema {"name": "resources", "type": "object"} # resources -- kubernetes resources of pod resources: @@ -131,19 +118,15 @@ resources: requests: cpu: 200m memory: 200Mi - # @schema {"name": "nodeSelector", "type": "object"} # nodeSelector -- node labels for pod assignment nodeSelector: {} - # @schema {"name": "tolerations", "type": "array", "items": {"type": "object"}} # tolerations -- tolerations tolerations: [] - # @schema {"name": "affinity", "type": "object"} # affinity -- affinity affinity: {} - # @schema {"name": "logging", "type": "object"} logging: # @schema {"name": "logging.logger", "type": "string", "enum": ["glg", "zap"]} @@ -158,7 +141,6 @@ logging: # logging.format -- logging format. # logging format must be `raw` or `json` format: raw - # @schema {"name": "server_config", "type": "object"} server_config: # @schema {"name": "server_config.servers", "type": "object"} @@ -449,7 +431,6 @@ server_config: # @schema {"name": "server_config.tls.insecure_skip_verify", "type": "boolean"} # server_config.tls.insecure_skip_verify -- enable/disable skip SSL certificate verification insecure_skip_verify: false - # @schema {"name": "observability", "type": "object"} observability: # @schema {"name": "observability.enabled", "type": "boolean"} diff --git a/charts/vald-benchmark-operator/values/benchmark-scenario.yaml b/charts/vald-benchmark-operator/values/benchmark-scenario.yaml index f3885cc824..ac9df3aa56 100644 --- a/charts/vald-benchmark-operator/values/benchmark-scenario.yaml +++ b/charts/vald-benchmark-operator/values/benchmark-scenario.yaml @@ -179,7 +179,6 @@ spec: client_config: health_check_duration: "10s" rps: 1000 - # @schema {"name": "target", "type": "array", "items": {"type": "object"}} # target -- target cluster host&port target: diff --git a/charts/vald-helm-operator/values.yaml b/charts/vald-helm-operator/values.yaml index d196eb969c..ed0efab7ca 100644 --- a/charts/vald-helm-operator/values.yaml +++ b/charts/vald-helm-operator/values.yaml @@ -17,11 +17,9 @@ # @schema {"name": "name", "type": "string"} # name -- name of the deployment name: vald-helm-operator - # @schema {"name": "replicas", "type": "integer"} # replicas -- number of replicas replicas: 2 - # @schema {"name": "image", "type": "object"} image: # @schema {"name": "image.repository", "type": "string"} @@ -33,7 +31,6 @@ image: # @schema {"name": "image.pullPolicy", "type": "string", "enum": ["Always", "Never", "IfNotPresent"]} # image.pullPolicy -- image pull policy pullPolicy: Always - # @schema {"name": "rbac", "type": "object"} rbac: # @schema {"name": "rbac.create", "type": "boolean"} @@ -42,7 +39,6 @@ rbac: # @schema {"name": "rbac.name", "type": "string"} # rbac.name -- name of roles and rolebindings name: vald-helm-operator - # @schema {"name": "serviceAccount", "type": "object"} serviceAccount: # @schema {"name": "serviceAccount.create", "type": "boolean"} @@ -51,7 +47,6 @@ serviceAccount: # @schema {"name": "serviceAccount.name", "type": "string"} # serviceAccount.name -- name of service account name: vald-helm-operator - # @schema {"name": "service", "type": "object"} service: # @schema {"name": "service.enabled", "type": "boolean"} @@ -69,15 +64,12 @@ service: # @schema {"name": "service.externalTrafficPolicy", "type": "string"} # service.externalTrafficPolicy -- external traffic policy (can be specified when service type is LoadBalancer or NodePort) : Cluster or Local externalTrafficPolicy: "" - # @schema {"name": "annotations", "type": "object"} # annotations -- deployment annotations annotations: {} - # @schema {"name": "podAnnotations", "type": "object"} # podAnnotations -- pod annotations podAnnotations: {} - # @schema {"name": "securityContext", "type": "object"} # securityContext -- security context for container securityContext: @@ -90,7 +82,6 @@ securityContext: capabilities: drop: - ALL - # @schema {"name": "podSecurityContext", "type": "object"} # podSecurityContext -- security context for pod podSecurityContext: @@ -99,7 +90,6 @@ podSecurityContext: runAsGroup: 65532 fsGroup: 65532 fsGroupChangePolicy: "OnRootMismatch" - # @schema {"name": "resources", "type": "object"} # resources -- kubernetes resources of pod resources: @@ -109,55 +99,42 @@ resources: requests: cpu: 200m memory: 200Mi - # @schema {"name": "nodeSelector", "type": "object"} # nodeSelector -- node labels for pod assignment nodeSelector: {} - # @schema {"name": "tolerations", "type": "array", "items": {"type": "object"}} # tolerations -- tolerations tolerations: [] - # @schema {"name": "affinity", "type": "object"} # affinity -- affinity affinity: {} - # @schema {"name": "enableLeaderElection", "type": "boolean"} # enableLeaderElection -- enable leader election for controller manager. enableLeaderElection: true - # @schema {"name": "leaderElectionID", "type": "string"} # leaderElectionID -- name of the configmap that is used for holding the leader lock. leaderElectionID: vald-helm-operator - # @schema {"name": "reconcilePeriod", "type": "string"} # reconcilePeriod -- reconcile duration of operator reconcilePeriod: 1m - # @schema {"name": "enableMetrics", "type": "boolean"} # enableMetrics -- enable metrics endpoint enableMetrics: true - # @schema {"name": "healthPort", "type": "integer"} # healthPort -- port of health endpoint healthPort: 8081 - # @schema {"name": "metricsPort", "type": "integer"} # metricsPort -- port of metrics endpoint metricsPort: 6061 - # @schema {"name": "maxConcurrentReconciles", "type": "integer"} # maxConcurrentReconciles -- max number of concurrent reconciles maxConcurrentReconciles: 1 - # @schema {"name": "namespaced", "type": "boolean"} # namespaced -- if it is true, operator will behave as a namespace-scoped operator, if it is false, it will behave as a cluster-scoped operator. namespaced: true - # @schema {"name": "watchNamespaces", "type": "string"} # watchNamespaces -- comma separated names of namespaces to watch, if it is empty, the namespace that the operator exists in is used. watchNamespaces: "" - # @schema {"name": "logging", "type": "object"} logging: # @schema {"name": "logging.level", "type": "string", "enum": ["debug", "info", "error"]} @@ -169,7 +146,6 @@ logging: # @schema {"name": "logging.format", "type": "string", "enum": ["console", "json"]} # logging.format -- logging format of operator (console or json) format: console - # @schema {"name": "livenessProbe", "type": "object"} livenessProbe: # @schema {"name": "livenessProbe.enabled", "type": "boolean"} @@ -201,7 +177,6 @@ livenessProbe: # @schema {"name": "livenessProbe.timeoutSeconds", "type": "integer"} # livenessProbe.timeoutSeconds -- liveness probe timeout seconds timeoutSeconds: 5 - # @schema {"name": "readinessProbe", "type": "object"} readinessProbe: # @schema {"name": "readinessProbe.enabled", "type": "boolean"} diff --git a/charts/vald/values/agent-ngt-standalone.yaml b/charts/vald/values/agent-ngt-standalone.yaml index 8b4e5403fe..66fde669f6 100644 --- a/charts/vald/values/agent-ngt-standalone.yaml +++ b/charts/vald/values/agent-ngt-standalone.yaml @@ -17,7 +17,6 @@ defaults: image: tag: latest - agent: ngt: auto_index_duration_limit: 30m @@ -28,14 +27,11 @@ agent: object_type: float creation_edge_size: 20 search_edge_size: 10 - gateway: lb: enabled: false - discoverer: enabled: false - manager: index: enabled: false diff --git a/charts/vald/values/dev-broken-index-backup.yaml b/charts/vald/values/dev-broken-index-backup.yaml index a02763feea..0e31aeed4c 100644 --- a/charts/vald/values/dev-broken-index-backup.yaml +++ b/charts/vald/values/dev-broken-index-backup.yaml @@ -40,7 +40,6 @@ defaults: collector_endpoint: "opentelemetry-collector-collector.default.svc.cluster.local:4317" trace: enabled: true - gateway: lb: podAnnotations: @@ -51,7 +50,6 @@ gateway: requests: cpu: 100m memory: 50Mi - agent: podAnnotations: profefe.com/enable: "true" @@ -75,7 +73,6 @@ agent: accessMode: ReadWriteOnce storageClass: local-path size: 1Gi - discoverer: podAnnotations: profefe.com/enable: "true" @@ -85,7 +82,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: podAnnotations: diff --git a/charts/vald/values/dev-observability.yaml b/charts/vald/values/dev-observability.yaml index 99d3eedec9..5a98ecf072 100644 --- a/charts/vald/values/dev-observability.yaml +++ b/charts/vald/values/dev-observability.yaml @@ -53,7 +53,6 @@ defaults: - podSelector: matchLabels: app.kubernetes.io/name: opentelemetry-collector-collector - gateway: lb: podAnnotations: @@ -64,7 +63,6 @@ gateway: requests: cpu: 100m memory: 50Mi - agent: podAnnotations: profefe.com/enable: "true" @@ -79,7 +77,6 @@ agent: memory: 50Mi ngt: dimension: 784 - discoverer: podAnnotations: profefe.com/enable: "true" @@ -89,7 +86,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: podAnnotations: diff --git a/charts/vald/values/dev.yaml b/charts/vald/values/dev.yaml index ec5c91fc61..153503c8b4 100644 --- a/charts/vald/values/dev.yaml +++ b/charts/vald/values/dev.yaml @@ -21,7 +21,6 @@ defaults: metrics: pprof: enabled: true - gateway: lb: podAnnotations: @@ -34,7 +33,6 @@ gateway: requests: cpu: 100m memory: 50Mi - agent: podAnnotations: profefe.com/enable: "true" @@ -49,7 +47,6 @@ agent: memory: 50Mi ngt: dimension: 784 - discoverer: podAnnotations: profefe.com/enable: "true" @@ -59,7 +56,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: podAnnotations: diff --git a/charts/vald/values/multi-vald/dev-vald-01.yaml b/charts/vald/values/multi-vald/dev-vald-01.yaml index 9c26c7c425..96bbdc32db 100644 --- a/charts/vald/values/multi-vald/dev-vald-01.yaml +++ b/charts/vald/values/multi-vald/dev-vald-01.yaml @@ -18,7 +18,6 @@ discoverer: name: vald-01 serviceAccount: name: vald-01 - gateway: mirror: enabled: true @@ -26,7 +25,6 @@ gateway: name: vald-mirror-01 serviceAccount: name: vald-mirror-01 - agent: ngt: dimension: 784 diff --git a/charts/vald/values/multi-vald/dev-vald-02.yaml b/charts/vald/values/multi-vald/dev-vald-02.yaml index 35d03c177b..b136753291 100644 --- a/charts/vald/values/multi-vald/dev-vald-02.yaml +++ b/charts/vald/values/multi-vald/dev-vald-02.yaml @@ -20,7 +20,6 @@ discoverer: name: vald-02 serviceAccount: name: vald-02 - gateway: mirror: enabled: true @@ -30,7 +29,6 @@ gateway: name: vald-mirror-02 serviceAccount: name: vald-mirror-02 - agent: ngt: dimension: 784 diff --git a/charts/vald/values/multi-vald/dev-vald-03.yaml b/charts/vald/values/multi-vald/dev-vald-03.yaml index 4579a564db..1c2b389454 100644 --- a/charts/vald/values/multi-vald/dev-vald-03.yaml +++ b/charts/vald/values/multi-vald/dev-vald-03.yaml @@ -20,7 +20,6 @@ discoverer: name: vald-03 serviceAccount: name: vald-03 - gateway: mirror: enabled: true @@ -30,7 +29,6 @@ gateway: name: vald-mirror-03 serviceAccount: name: vald-mirror-03 - agent: ngt: dimension: 784 diff --git a/charts/vald/values/multi-vald/dev-vald-with-mirror.yaml b/charts/vald/values/multi-vald/dev-vald-with-mirror.yaml index 4b687d3b65..05aa4770e1 100644 --- a/charts/vald/values/multi-vald/dev-vald-with-mirror.yaml +++ b/charts/vald/values/multi-vald/dev-vald-with-mirror.yaml @@ -40,7 +40,6 @@ defaults: collector_endpoint: "opentelemetry-collector-collector.default.svc.cluster.local:4317" trace: enabled: true - gateway: lb: podAnnotations: @@ -53,7 +52,6 @@ gateway: memory: 50Mi gateway_config: index_replica: 2 - mirror: enabled: true minReplicas: 3 @@ -62,7 +60,6 @@ gateway: enabled: false gateway_config: self_mirror_addr: "" - agent: podAnnotations: profefe.com/enable: "true" @@ -77,7 +74,6 @@ agent: memory: 50Mi ngt: dimension: 784 - discoverer: podAnnotations: profefe.com/enable: "true" @@ -87,7 +83,6 @@ discoverer: requests: cpu: 100m memory: 50Mi - manager: index: podAnnotations: diff --git a/charts/vald/values/multi-vald/mirror-target.yaml b/charts/vald/values/multi-vald/mirror-target.yaml index f5f49cf3a9..a9285d04ac 100644 --- a/charts/vald/values/multi-vald/mirror-target.yaml +++ b/charts/vald/values/multi-vald/mirror-target.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/charts/vald/values/vald-backup-via-pv.yaml b/charts/vald/values/vald-backup-via-pv.yaml index 2bc932a059..89f31a38fd 100644 --- a/charts/vald/values/vald-backup-via-pv.yaml +++ b/charts/vald/values/vald-backup-via-pv.yaml @@ -16,7 +16,6 @@ defaults: image: tag: latest - gateway: lb: resources: @@ -26,7 +25,6 @@ gateway: gateway_config: # number of index replica. index_replica: 2 - agent: minReplicas: 6 maxReplicas: 6 @@ -58,13 +56,11 @@ agent: auto_save_index_duration: 365h # batch process pool size of automatic create index operation. auto_create_index_pool_size: 1000 - discoverer: resources: requests: cpu: 100m memory: 50Mi - manager: index: resources: diff --git a/charts/vald/values/vald-in-memory-mode-no-backup.yaml b/charts/vald/values/vald-in-memory-mode-no-backup.yaml index d340507cd4..a42e0880a0 100644 --- a/charts/vald/values/vald-in-memory-mode-no-backup.yaml +++ b/charts/vald/values/vald-in-memory-mode-no-backup.yaml @@ -16,7 +16,6 @@ defaults: image: tag: latest - gateway: lb: resources: @@ -26,7 +25,6 @@ gateway: gateway_config: # number of index replica. index_replica: 2 - agent: minReplicas: 6 maxReplicas: 6 @@ -49,13 +47,11 @@ agent: auto_save_index_duration: 8760h # batch process pool size of automatic create index operation. auto_create_index_pool_size: 1000 - discoverer: resources: requests: cpu: 100m memory: 50Mi - manager: index: resources: diff --git a/cmd/agent/core/faiss/sample.yaml b/cmd/agent/core/faiss/sample.yaml index 69fdbda5ec..238fccb89c 100644 --- a/cmd/agent/core/faiss/sample.yaml +++ b/cmd/agent/core/faiss/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/agent/core/ngt/sample-cow.yaml b/cmd/agent/core/ngt/sample-cow.yaml index 22c39a193b..5bb445965e 100644 --- a/cmd/agent/core/ngt/sample-cow.yaml +++ b/cmd/agent/core/ngt/sample-cow.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/agent/core/ngt/sample-fp16.yaml b/cmd/agent/core/ngt/sample-fp16.yaml index a18b0d40da..698d85f6d5 100644 --- a/cmd/agent/core/ngt/sample-fp16.yaml +++ b/cmd/agent/core/ngt/sample-fp16.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/agent/core/ngt/sample.yaml b/cmd/agent/core/ngt/sample.yaml index d85547407b..2741e2ea70 100644 --- a/cmd/agent/core/ngt/sample.yaml +++ b/cmd/agent/core/ngt/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/index/job/correction/sample.yaml b/cmd/index/job/correction/sample.yaml index 53f5fc8764..97a7fce056 100644 --- a/cmd/index/job/correction/sample.yaml +++ b/cmd/index/job/correction/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/index/job/creation/sample.yaml b/cmd/index/job/creation/sample.yaml index 8f9b7fd6a2..dbb6b1cabe 100644 --- a/cmd/index/job/creation/sample.yaml +++ b/cmd/index/job/creation/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/index/job/readreplica/rotate/sample.yaml b/cmd/index/job/readreplica/rotate/sample.yaml index ed00033080..fbdb3dd43a 100644 --- a/cmd/index/job/readreplica/rotate/sample.yaml +++ b/cmd/index/job/readreplica/rotate/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/index/job/save/sample.yaml b/cmd/index/job/save/sample.yaml index 3c25835648..9a2b3b6a8d 100644 --- a/cmd/index/job/save/sample.yaml +++ b/cmd/index/job/save/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/cmd/tools/cli/loadtest/sample.yaml b/cmd/tools/cli/loadtest/sample.yaml index 0a966d89e5..1abf61af7f 100644 --- a/cmd/tools/cli/loadtest/sample.yaml +++ b/cmd/tools/cli/loadtest/sample.yaml @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # - ---- version: v0.0.0 time_zone: JST logging: diff --git a/dockers/agent/core/faiss/Dockerfile b/dockers/agent/core/faiss/Dockerfile index 0fc2308a2a..f037f4b94f 100644 --- a/dockers/agent/core/faiss/Dockerfile +++ b/dockers/agent/core/faiss/Dockerfile @@ -15,18 +15,16 @@ # limitations under the License. # -ARG GO_VERSION=latest # ARG DISTROLESS_IMAGE=gcr.io/distroless/static # ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -55,8 +53,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -66,9 +71,9 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ - make go/download +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 WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -92,9 +97,9 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN update-alternatives --set libblas.so-x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/libmkl_rt.so \ && make faiss/install -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ +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} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile index 293b819988..8bdb671c5e 100644 --- a/dockers/agent/core/ngt/Dockerfile +++ b/dockers/agent/core/ngt/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH +ARG TARGETOS +ARG GO_VERSION ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -56,8 +55,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -69,7 +75,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -91,9 +97,10 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN make ngt/install + RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile index 7784edf21a..c57dffc531 100644 --- a/dockers/agent/sidecar/Dockerfile +++ b/dockers/agent/sidecar/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV GOPATH /go @@ -49,8 +48,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -62,7 +68,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -85,7 +91,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + 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} diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 0221d64b2b..ed5977616d 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -15,15 +15,14 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder LABEL maintainer="${MAINTAINER}" +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -33,10 +32,6 @@ ENV GOROOT /opt/go ENV GOPATH /go ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin:/usr/local/bin -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p $GOPATH/src - - RUN sysctl -w net.ipv6.conf.all.disable_ipv6=1 \ && sysctl -w net.ipv6.conf.default.disable_ipv6=1 \ && sysctl -w net.ipv6.conf.lo.disable_ipv6=1 @@ -67,6 +62,16 @@ 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 . @@ -83,7 +88,7 @@ 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 deps ROOTDIR=${ROOTDIR} GO_CLEAN_DEPS=false \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps ROOTDIR=${ROOTDIR} GO_CLEAN_DEPS=false \ && make ngt/install \ && make faiss/install \ && make helm/install \ @@ -93,8 +98,8 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ && make kubelinter/install \ && make yq/install \ && make tparse/install \ - && make gotestfmt/install \ - && make golangci-lint/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} gotestfmt/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install \ && make reviewdog/install \ && make kubectl/install \ && make buf/install \ diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index f2e2b4bd11..30449e7ad8 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -18,10 +18,16 @@ ARG MAINTAINER="vdaas.org vald team " # skipcq: DOK-DL3026 -FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/vscode/devcontainers/go:1 AS base +FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder LABEL maintainer="${MAINTAINER}" +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS + +ENV GOROOT /opt/go +ENV GOPATH /go +ENV PATH ${PATH}:${GOROOT}/bin:${GOPATH}/bin:/usr/local/bin SHELL ["/bin/bash", "-o", "pipefail", "-c"] # skipcq: DOK-DL3008 @@ -47,6 +53,16 @@ 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 @@ -58,14 +74,14 @@ COPY example/client/go.mod.default example/client/go.mod.default # basic deps RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make deps GO_CLEAN_DEPS=false \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \ && make ngt/install \ && make faiss/install \ && make helm/install \ && make helm-docs/install \ && make valdcli/install \ && make yq/install \ - && make golangci-lint/install \ + && make GOARCH=${TARGETARCH} GOOS=${TARGETOS} golangci-lint/install \ && make reviewdog/install \ && make kubectl/install \ && make k3d/install \ diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile index 7de2fd243a..0c11f4151f 100644 --- a/dockers/discoverer/k8s/Dockerfile +++ b/dockers/discoverer/k8s/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -49,8 +48,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -62,7 +68,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -82,7 +88,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile index 2ca5eb6301..cb3dfc2e6c 100644 --- a/dockers/gateway/filter/Dockerfile +++ b/dockers/gateway/filter/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile index 7d67100c8c..ddb50c0c5b 100644 --- a/dockers/gateway/lb/Dockerfile +++ b/dockers/gateway/lb/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile index 58d41d32f1..f10ad34646 100644 --- a/dockers/gateway/mirror/Dockerfile +++ b/dockers/gateway/mirror/Dockerfile @@ -14,16 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -47,8 +46,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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} @@ -83,7 +89,7 @@ COPY .git . RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + 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} diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile index b230baa3e8..744cf6cb5c 100644 --- a/dockers/index/job/correction/Dockerfile +++ b/dockers/index/job/correction/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/index/job/creation/Dockerfile b/dockers/index/job/creation/Dockerfile index aec6cded89..f227528fc3 100644 --- a/dockers/index/job/creation/Dockerfile +++ b/dockers/index/job/creation/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile index d22f7a6e95..042a29cafe 100644 --- a/dockers/index/job/readreplica/rotate/Dockerfile +++ b/dockers/index/job/readreplica/rotate/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/index/job/save/Dockerfile b/dockers/index/job/save/Dockerfile index 9146892bba..3fa5067223 100644 --- a/dockers/index/job/save/Dockerfile +++ b/dockers/index/job/save/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile index 056624f3ff..237f1a78cb 100644 --- a/dockers/manager/index/Dockerfile +++ b/dockers/manager/index/Dockerfile @@ -15,16 +15,15 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -81,7 +87,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/operator/helm/Dockerfile b/dockers/operator/helm/Dockerfile index a8d0cfd6a0..bc9ac58900 100644 --- a/dockers/operator/helm/Dockerfile +++ b/dockers/operator/helm/Dockerfile @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG OPERATOR_SDK_VERSION @@ -27,15 +26,17 @@ 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} golang:${GO_VERSION} AS golang FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG OPERATOR_SDK_VERSION ARG VERSION ARG GROUP ARG VALD_KIND ARG VALD_HELM_OPERATOR_KIND ARG UPX_OPTIONS +ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -67,8 +68,15 @@ RUN apt-get clean \ /var/cache/* \ && apt-get autoremove -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 "---"; \ @@ -90,7 +98,7 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN make go/download +RUN make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal/errors COPY internal/errors . @@ -117,7 +125,7 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/hack/helm/schema/gen COPY hack/helm/schema/gen . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN make helm/schema/vald helm/schema/vald-helm-operator \ +RUN make GOARCH=${TARGETARCH} GOOS=${TARGETOS} helm/schema/vald helm/schema/vald-helm-operator \ && cp -r charts /charts COPY --from=operator /usr/local/bin/${APP_NAME} /usr/bin/${APP_NAME} diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile index acef095c7e..4edb54929f 100644 --- a/dockers/tools/benchmark/job/Dockerfile +++ b/dockers/tools/benchmark/job/Dockerfile @@ -15,7 +15,6 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG ZLIB_VERSION ARG HDF5_VERSION ARG DISTROLESS_IMAGE=gcr.io/distroless/static @@ -23,14 +22,14 @@ ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG UPX_OPTIONS ARG ZLIB_VERSION ARG HDF5_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -77,8 +76,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && make install \ && ldconfig -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -91,7 +97,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -111,7 +117,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile index e629f68ca1..e546e61be0 100644 --- a/dockers/tools/benchmark/operator/Dockerfile +++ b/dockers/tools/benchmark/operator/Dockerfile @@ -15,17 +15,16 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -50,10 +49,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN mkdir -p ${GOPATH}/src - -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -66,7 +70,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . @@ -86,7 +90,7 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ - make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile index eeabbc9dda..e16ff06b33 100644 --- a/dockers/tools/cli/loadtest/Dockerfile +++ b/dockers/tools/cli/loadtest/Dockerfile @@ -15,14 +15,13 @@ # limitations under the License. # -ARG GO_VERSION=latest ARG MAINTAINER="vdaas.org vald team " -FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang - FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder +ARG GO_VERSION ARG TARGETARCH +ARG TARGETOS ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive @@ -48,8 +47,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY --from=golang /usr/local/go $GOROOT -RUN mkdir -p "$GOPATH/src" +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 . @@ -61,7 +67,7 @@ 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 go/download + make GOARCH=${TARGETARCH} GOOS=${TARGETOS} go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal COPY internal . diff --git a/example/client/go.mod b/example/client/go.mod index 7e2849f3a8..78689d3ad0 100644 --- a/example/client/go.mod +++ b/example/client/go.mod @@ -1,6 +1,6 @@ module github.com/vdaas/vald/example/client -go 1.21 +go 1.22.0 replace ( github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v1.0.4 @@ -8,8 +8,8 @@ replace ( github.com/golang/protobuf => github.com/golang/protobuf v1.5.3 github.com/kpango/glg => github.com/kpango/glg v1.6.15 github.com/pkg/sftp => github.com/pkg/sftp v1.13.6 - golang.org/x/crypto => golang.org/x/crypto v0.18.0 - golang.org/x/net => golang.org/x/net v0.20.0 + 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 @@ -34,7 +34,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/kpango/fastime v1.1.9 // indirect golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.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 diff --git a/example/client/go.mod.default b/example/client/go.mod.default index 396196b96d..257d184b47 100644 --- a/example/client/go.mod.default +++ b/example/client/go.mod.default @@ -1,6 +1,6 @@ module github.com/vdaas/vald/example/client -go 1.21 +go 1.22.0 replace ( github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate latest diff --git a/example/client/go.sum b/example/client/go.sum index f3f3f54a67..89fa1f078d 100644 --- a/example/client/go.sum +++ b/example/client/go.sum @@ -23,10 +23,10 @@ go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= 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= diff --git a/example/helm/values-standalone-agent-ngt.yaml b/example/helm/values-standalone-agent-ngt.yaml index 3dd0192013..d797cdde7a 100644 --- a/example/helm/values-standalone-agent-ngt.yaml +++ b/example/helm/values-standalone-agent-ngt.yaml @@ -19,7 +19,6 @@ default: level: debug image: tag: latest - agent: minReplicas: 4 maxReplicas: 8 @@ -41,14 +40,11 @@ agent: auto_index_duration_limit: 1m # Check duration of automatic indexing. auto_index_check_duration: 10s - gateway: lb: enabled: false - discoverer: enabled: false - manager: index: enabled: false diff --git a/example/helm/values-with-pyroscope.yaml b/example/helm/values-with-pyroscope.yaml index ae2a15489c..c428bda76e 100644 --- a/example/helm/values-with-pyroscope.yaml +++ b/example/helm/values-with-pyroscope.yaml @@ -31,20 +31,17 @@ defaults: readiness: readinessProbe: initialDelaySeconds: 60 - discoverer: resources: requests: cpu: 150m memory: 50Mi - manager: index: resources: requests: cpu: 150m memory: 30Mi - gateway: lb: minReplicas: 2 @@ -64,7 +61,6 @@ gateway: traefik.ingress.kubernetes.io/service.serversscheme: h2c gateway_config: index_replica: 2 - agent: # /* These annotations will be set automatically when successful deployment */ # podAnnotations: diff --git a/example/helm/values.yaml b/example/helm/values.yaml index a56e1863d2..a845537436 100644 --- a/example/helm/values.yaml +++ b/example/helm/values.yaml @@ -27,7 +27,6 @@ defaults: readiness: readinessProbe: initialDelaySeconds: 60 - ## vald-lb-gateway settings gateway: lb: @@ -48,7 +47,6 @@ gateway: # NOTE: https://doc.traefik.io/traefik/routing/providers/kubernetes-ingress/#on-service annotations: traefik.ingress.kubernetes.io/service.serversscheme: h2c - ## vald-agent settings agent: minReplicas: 6 @@ -75,14 +73,12 @@ agent: auto_create_index_pool_size: 100 # The default create index batch pool size default_pool_size: 100 - ## vald-discoverer settings discoverer: resources: requests: cpu: 150m memory: 50Mi - ## vald-manager settings manager: index: diff --git a/example/manifest/scylla/configmap.yaml b/example/manifest/scylla/configmap.yaml index 3545f3bdc2..e1ba14ee96 100644 --- a/example/manifest/scylla/configmap.yaml +++ b/example/manifest/scylla/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/example/manifest/scylla/job.yaml b/example/manifest/scylla/job.yaml index 6ef3a2808f..4dc3b0bd7c 100644 --- a/example/manifest/scylla/job.yaml +++ b/example/manifest/scylla/job.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/go.mod b/go.mod index bb92e87914..57fd84b18d 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,15 @@ module github.com/vdaas/vald -go 1.21 +go 1.22.0 replace ( cloud.google.com/go => cloud.google.com/go v0.112.0 - cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.58.0 + cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.59.0 cloud.google.com/go/compute => cloud.google.com/go/compute v1.23.4 cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.15.0 cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.14.0 cloud.google.com/go/iam => cloud.google.com/go/iam v1.1.6 - cloud.google.com/go/kms => cloud.google.com/go/kms v1.15.6 + cloud.google.com/go/kms => cloud.google.com/go/kms v1.15.7 cloud.google.com/go/monitoring => cloud.google.com/go/monitoring v1.17.1 cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.36.1 cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager v1.11.5 @@ -22,9 +22,9 @@ replace ( git.sr.ht/~sbinet/gg => git.sr.ht/~sbinet/gg v0.5.0 github.com/Azure/azure-amqp-common-go/v3 => github.com/Azure/azure-amqp-common-go/v3 v3.2.3 github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v68.0.0+incompatible - github.com/Azure/azure-sdk-for-go/sdk/azcore => github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 + github.com/Azure/azure-sdk-for-go/sdk/azcore => github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 github.com/Azure/azure-sdk-for-go/sdk/azidentity => github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 - github.com/Azure/azure-sdk-for-go/sdk/internal => github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 + github.com/Azure/azure-sdk-for-go/sdk/internal => github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 github.com/Azure/go-amqp => github.com/Azure/go-amqp v1.0.4 github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20240104002855-4c0e21ca2bbb+incompatible github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.30-0.20240104002855-4c0e21ca2bbb @@ -44,7 +44,7 @@ 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.11 + github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.50.13 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 @@ -154,11 +154,11 @@ replace ( github.com/google/gofuzz => github.com/google/gofuzz v1.2.0 github.com/google/martian => github.com/google/martian v2.1.0+incompatible github.com/google/martian/v3 => github.com/google/martian/v3 v3.3.2 - github.com/google/pprof => github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e + github.com/google/pprof => github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 github.com/google/shlex => github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 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.5.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/gorilla/mux => github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket => github.com/gorilla/websocket v1.5.1 @@ -189,7 +189,7 @@ replace ( github.com/josharian/intern => github.com/josharian/intern v1.0.0 github.com/json-iterator/go => github.com/json-iterator/go v1.1.12 github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v1.0.0 - github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.6.3 + github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.7.0 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 github.com/klauspost/compress => github.com/klauspost/compress v1.17.7-0.20240205163310-8e5ae404d473 github.com/klauspost/cpuid/v2 => github.com/klauspost/cpuid/v2 v2.2.6 @@ -274,17 +274,17 @@ replace ( github.com/zeebo/xxh3 => github.com/zeebo/xxh3 v1.0.2 go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.8 go.opencensus.io => go.opencensus.io v0.24.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 - go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.22.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 + go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.23.1 go.opentelemetry.io/otel/exporters/otlp/internal/retry => go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.17.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric => go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.43.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 - go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.22.0 - go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.22.0 - go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.22.0 - go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.22.0 + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1 + go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 + go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.23.1 + go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.23.1 + go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v1.23.1 + go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.23.1 go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v1.1.0 go.starlark.net => go.starlark.net v0.0.0-20240123142251-f86470692795 go.uber.org/atomic => go.uber.org/atomic v1.11.0 @@ -293,18 +293,18 @@ replace ( go.uber.org/multierr => go.uber.org/multierr v1.11.0 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.18.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/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/mod => golang.org/x/mod v0.14.0 - golang.org/x/net => golang.org/x/net v0.20.0 + 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.16.0 golang.org/x/sync => golang.org/x/sync v0.6.0 - golang.org/x/sys => golang.org/x/sys v0.16.0 - golang.org/x/term => golang.org/x/term v0.16.0 + golang.org/x/sys => golang.org/x/sys v0.17.0 + golang.org/x/term => golang.org/x/term v0.17.0 golang.org/x/text => golang.org/x/text v0.14.0 golang.org/x/time => golang.org/x/time v0.5.0 golang.org/x/tools => golang.org/x/tools v0.17.0 @@ -349,7 +349,7 @@ replace ( require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.32.0-20231115204500-e097f827e652.1 - cloud.google.com/go/storage v1.36.0 + cloud.google.com/go/storage v1.37.0 code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6 github.com/akrylysov/pogreb v0.0.0-00010101000000-000000000000 github.com/aws/aws-sdk-go v1.49.0 @@ -363,7 +363,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v0.0.0-00010101000000-000000000000 github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 - github.com/klauspost/compress v1.15.9 + github.com/klauspost/compress v1.16.7 github.com/kpango/fastime v1.1.9 github.com/kpango/fuid v0.0.0-00010101000000-000000000000 github.com/kpango/gache/v2 v2.0.0-00010101000000-000000000000 @@ -380,14 +380,14 @@ require ( github.com/zeebo/xxh3 v1.0.2 go.etcd.io/bbolt v1.3.8 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 - go.opentelemetry.io/otel v1.22.0 + go.opentelemetry.io/otel v1.23.1 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.0.0-00010101000000-000000000000 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 - go.opentelemetry.io/otel/metric v1.22.0 - go.opentelemetry.io/otel/sdk v1.22.0 - go.opentelemetry.io/otel/sdk/metric v1.22.0 - go.opentelemetry.io/otel/trace v1.22.0 + go.opentelemetry.io/otel/metric v1.23.1 + go.opentelemetry.io/otel/sdk v1.23.1 + go.opentelemetry.io/otel/sdk/metric v1.23.1 + go.opentelemetry.io/otel/trace v1.23.1 go.uber.org/automaxprocs v0.0.0-00010101000000-000000000000 go.uber.org/goleak v1.3.0 go.uber.org/ratelimit v0.3.0 @@ -396,14 +396,14 @@ require ( golang.org/x/net v0.20.0 golang.org/x/oauth2 v0.16.0 golang.org/x/sync v0.6.0 - golang.org/x/sys v0.16.0 + 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 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-20240125205218-1f4bbc51befe - google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe + google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 + google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 google.golang.org/grpc v1.61.0 google.golang.org/protobuf v1.32.0 gopkg.in/yaml.v2 v2.4.0 @@ -471,7 +471,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/moby/spdystream v0.2.0 // indirect @@ -497,18 +497,18 @@ require ( github.com/xlab/treeprint v1.2.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect - go.opentelemetry.io/proto/otlp v1.0.0 // indirect + go.opentelemetry.io/proto/otlp v1.1.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/image v0.15.0 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/term v0.16.0 // indirect + 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.160.0 // indirect + google.golang.org/api v0.162.0 // indirect google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index ee4308ba3e..b649d52730 100644 --- a/go.sum +++ b/go.sum @@ -19,7 +19,7 @@ cloud.google.com/go/automl v1.13.5/go.mod h1:MDw3vLem3yh+SvmSgeYUmUKqyls6NzSumDm cloud.google.com/go/baremetalsolution v1.2.4/go.mod h1:BHCmxgpevw9IEryE99HbYEfxXkAEA3hkMJbYYsHtIuY= cloud.google.com/go/batch v1.8.0/go.mod h1:k8V7f6VE2Suc0zUM4WtoibNrA6D3dqBpB+++e3vSGYc= cloud.google.com/go/beyondcorp v1.0.4/go.mod h1:Gx8/Rk2MxrvWfn4WIhHIG1NV7IBfg14pTKv1+EArVcc= -cloud.google.com/go/bigquery v1.58.0/go.mod h1:0eh4mWNY0KrBTjUzLjoYImapGORq9gEPT7MWjCy9lik= +cloud.google.com/go/bigquery v1.59.0/go.mod h1:VP1UJYgevyTwsV7desjzNzDND5p6hZB+Z8gZJN1GQUc= cloud.google.com/go/billing v1.18.2/go.mod h1:PPIwVsOOQ7xzbADCwNe8nvK776QpfrOAUkvKjCUcpSE= cloud.google.com/go/binaryauthorization v1.8.1/go.mod h1:1HVRyBerREA/nhI7yLang4Zn7vfNVA3okoAR9qYQJAQ= cloud.google.com/go/certificatemanager v1.7.5/go.mod h1:uX+v7kWqy0Y3NG/ZhNvffh0kuqkKZIXdvlZRO7z0VtM= @@ -35,7 +35,6 @@ cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2Aawl 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/containeranalysis v0.11.4/go.mod h1:cVZT7rXYBS9NG1rhQbWL9pWbXCKHWJPYraE8/FTSYPE= -cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= 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= @@ -70,7 +69,7 @@ cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWO cloud.google.com/go/iap v1.9.4/go.mod h1:vO4mSq0xNf/Pu6E5paORLASBwEmphXEjgCFg7aeNu1w= cloud.google.com/go/ids v1.4.5/go.mod h1:p0ZnyzjMWxww6d2DvMGnFwCsSxDJM666Iir1bK1UuBo= cloud.google.com/go/iot v1.7.5/go.mod h1:nq3/sqTz3HGaWJi1xNiX7F41ThOzpud67vwk0YsSsqs= -cloud.google.com/go/kms v1.15.6/go.mod h1:yF75jttnIdHfGBoE51AKsD/Yqf+/jICzB9v1s1acsms= +cloud.google.com/go/kms v1.15.7/go.mod h1:ub54lbsa6tDkUwnu4W7Yt1aAIFLnspgh0kPGToDukeI= cloud.google.com/go/language v1.12.3/go.mod h1:evFX9wECX6mksEva8RbRnr/4wi/vKGYnAJrTRXU8+f8= cloud.google.com/go/lifesciences v0.9.5/go.mod h1:OdBm0n7C0Osh5yZB7j9BXyrMnTRGBJIZonUMxo5CzPw= cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE= @@ -177,15 +176,20 @@ github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkK github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/akrylysov/pogreb v0.10.2 h1:e6PxmeyEhWyi2AKOBIJzAEi4HkiC+lKyCocRGlnDi78= github.com/akrylysov/pogreb v0.10.2/go.mod h1:pNs6QmpQ1UlTJKDezuRWmaqkgUE2TuU0YTWyqJZ7+lI= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/participle/v2 v2.0.0/go.mod h1:rAKZdJldHu8084ojcWevWAL8KmEU+AT+Olodb+WoN2Y= +github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/andybalholm/stroke v0.0.0-20221221101821-bd29b49d73f0/go.mod h1:ccdDYaY5+gO+cbnQdFxEXqfy0RkoV25H3jLXUDNM3wg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWMLpY67QwZ/WWw= -github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= +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.11 h1:BxUqMbkzKzzQ6FXLlZFNFkFjHnv6utbc4PItVs5SvaE= -github.com/aws/aws-sdk-go v1.50.11/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.13 h1:yeXram2g7q8uKkQkAEeZyk9FmPzxI4UpGwAZGZtEGmM= +github.com/aws/aws-sdk-go v1.50.13/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= @@ -271,6 +275,9 @@ github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -283,6 +290,7 @@ github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/Gr github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E= github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0= github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-fonts/dejavu v0.3.3 h1:YZxbkwCBqVC0BojBvGdDdQuDqtm0oRs95eGhSPYbTvg= @@ -311,6 +319,10 @@ github.com/go-openapi/swag v0.22.9 h1:XX2DssF+mQKM2DHsbgZK74y/zj4mo9I99+89xUmuZC github.com/go-openapi/swag v0.22.9/go.mod h1:3/OXnFfnMAwBD099SwYRk7GD3xOrr1iL7d/XNLXVVwE= github.com/go-pdf/fpdf v1.4.3 h1:0ZbUVyy3URshI6fCIaCD/iTVW33dqA8zbUHuGynxAPA= github.com/go-pdf/fpdf v1.4.3/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= @@ -333,6 +345,8 @@ github.com/gobwas/ws v1.3.2/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/K github.com/goccmack/gocc v0.0.0-20230228185258-2292f9e40198/go.mod h1:DTh/Y2+NbnOVVoypCCQrovMPDKUGp4yZpSbWg5D0XIM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-yaml v1.9.8/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE= +github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng= github.com/gocql/gocql v1.6.0 h1:IdFdOTbnpbd0pDhl4REKQDM+Q0SzKXQ1Yh+YZZ8T/qU= github.com/gocql/gocql v1.6.0/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/gocraft/dbr/v2 v2.7.6 h1:ASHKFgCbTLODbb9f756Cl8VAlnvQLKqIzx9E1Cfb7eo= @@ -358,7 +372,7 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -372,8 +386,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e h1:E+3PBMCXn0ma79O7iCrne0iUpKtZ7rIcZvoz+jNtNtw= -github.com/google/pprof v0.0.0-20240130152714-0ed6a68c8d9e/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5 h1:E/LAvt58di64hlYjx7AsNS6C/ysHWYo+2qPCZKTQhRo= +github.com/google/pprof v0.0.0-20240207164012-fb44976bdcd5/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= @@ -383,8 +397,8 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/wire v0.5.0 h1:I7ELFeVBr3yfPIcc8+MWvrjk+3VjbcSzoXm3JVa+jD8= -github.com/google/wire v0.5.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU= +github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= +github.com/google/wire v0.6.0/go.mod h1:F4QhpQ9EDIdJ1Mbop/NZBRB+5yrR6qg3BnctaoUk6NA= github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= @@ -407,6 +421,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0Q github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= @@ -434,7 +449,7 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= +github.com/kisielk/errcheck v1.7.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.17.7-0.20240205163310-8e5ae404d473 h1:e3U09U4wmQtZiO5Gu9NIUaMdoHXiljvil24vEwMpU3o= @@ -461,6 +476,7 @@ github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0/go.mod h1:oGXx2X github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= @@ -473,6 +489,7 @@ github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLO github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mandolyte/mdtopdf v1.3.2/go.mod h1:c28Ldk+tVc/y7QQcEcILStS/OFlerdXGGdBUzJQBgEo= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= @@ -514,7 +531,7 @@ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= github.com/pierrec/lz4/v3 v3.3.5 h1:JzKda6jLXZpQK5/ulrEfT1I66tsKiGlw6sjKssFpwt8= github.com/pierrec/lz4/v3 v3.3.5/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= -github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= @@ -574,6 +591,7 @@ github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/substrait-io/substrait-go v0.4.2/go.mod h1:qhpnLmrcvAnlZsUyPXZRqldiHapPTXC3t7xFgDi3aQg= github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg= github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= @@ -588,27 +606,27 @@ go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 h1:P+/g8GpuJGYbOp2tAdKrIPUX9JO02q8Q0YNlHolpibA= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= -go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= -go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0/go.mod h1:AKFZIEPOnqB00P63bTjOiah4ZTaRzl1TKwUWpZdYUHI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 h1:H2JFgRcGiyHg7H7bwcwaQJYrNFqCqrbTQ8K4p1OvDu8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0/go.mod h1:WfCWp1bGoYK8MeULtI15MmQVczfR+bFkk0DF3h06QmQ= -go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= -go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= -go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= -go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= -go.opentelemetry.io/otel/sdk/metric v1.22.0 h1:ARrRetm1HCVxq0cbnaZQlfwODYJHo3gFL8Z3tSmHBcI= -go.opentelemetry.io/otel/sdk/metric v1.22.0/go.mod h1:KjQGeMIDlBNEOo6HvjhxIec1p/69/kULDcp4gr0oLQQ= -go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= -go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= +go.opentelemetry.io/otel v1.23.1 h1:Za4UzOqJYS+MUczKI320AtqZHZb7EqxO00jAHE0jmQY= +go.opentelemetry.io/otel v1.23.1/go.mod h1:Td0134eafDLcTS4y+zQ26GE8u3dEuRBiBCTUIRHaikA= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1 h1:ZqRWZJGHXV/1yCcEEVJ6/Uz2JtM79DNS8OZYa3vVY/A= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1/go.mod h1:D7ynngPWlGJrqyGSDOdscuv7uqttfCE3jcBvffDv9y4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 h1:o8iWeVFa1BcLtVEV0LzrCxV2/55tB3xLxADr6Kyoey4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1/go.mod h1:SEVfdK4IoBnbT2FXNM/k8yC08MrfbhWk3U4ljM8B3HE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 h1:p3A5+f5l9e/kuEBwLOrnpkIDHQFlHmbiVxMURWRK6gQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1/go.mod h1:OClrnXUjBqQbInvjJFjYSnMxBSCXBF8r3b34WqjiIrQ= +go.opentelemetry.io/otel/metric v1.23.1 h1:PQJmqJ9u2QaJLBOELl1cxIdPcpbwzbkjfEyelTl2rlo= +go.opentelemetry.io/otel/metric v1.23.1/go.mod h1:mpG2QPlAfnK8yNhNJAxDZruU9Y1/HubbC+KyH8FaCWI= +go.opentelemetry.io/otel/sdk v1.23.1 h1:O7JmZw0h76if63LQdsBMKQDWNb5oEcOThG9IrxscV+E= +go.opentelemetry.io/otel/sdk v1.23.1/go.mod h1:LzdEVR5am1uKOOwfBWFef2DCi1nu3SA8XQxx2IerWFk= +go.opentelemetry.io/otel/sdk/metric v1.23.1 h1:T9/8WsYg+ZqIpMWwdISVVrlGb/N0Jr1OHjR/alpKwzg= +go.opentelemetry.io/otel/sdk/metric v1.23.1/go.mod h1:8WX6WnNtHCgUruJ4TJ+UssQjMtpxkpX0zveQC8JG/E0= +go.opentelemetry.io/otel/trace v1.23.1 h1:4LrmmEd8AU2rFvU1zegmvqW7+kWarxtNOPyeL6HmYY8= +go.opentelemetry.io/otel/trace v1.23.1/go.mod h1:4IpnpJFwr1mo/6HL8XIPJaE9y0+u1KcVmuW7dwFSVrI= go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= go.starlark.net v0.0.0-20240123142251-f86470692795 h1:LmbG8Pq7KDGkglKVn8VpZOZj6vb9b8nKEGcg9l03epM= @@ -627,8 +645,8 @@ go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= gocloud.dev v0.36.0 h1:q5zoXux4xkOZP473e1EZbG8Gq9f0vlg1VNH5Du/ybus= gocloud.dev v0.36.0/go.mod h1:bLxah6JQVKBaIxzsr5BQLYB4IYdWHkMZdzCXlo6F0gg= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +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/shiny v0.0.0-20220827204233-334a2380cb91/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8= @@ -640,18 +658,18 @@ 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/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +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= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -719,50 +737,35 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= -modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= +lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= +modernc.org/cc/v3 v3.38.1/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= -modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= -modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw= modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI= -modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= -modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= -modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws= -modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo= +modernc.org/ccgo/v3 v3.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0= modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g= modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= -modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= -modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= -modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= -modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= -modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= -modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0= modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA= modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0= +modernc.org/libc v1.19.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= +modernc.org/libc v1.21.2/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= -modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug= -modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= -modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0= -modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= +modernc.org/sqlite v1.21.2/go.mod h1:cxbLkB5WS32DnQqeH4h4o1B0eMr8W/y8/RGuxQ3JsC0= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= -modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0= -modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= +modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs= modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= -modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= +modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s= diff --git a/hack/go.mod.default b/hack/go.mod.default index 33efd46fae..edc674e229 100644 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -1,6 +1,6 @@ module github.com/vdaas/vald -go 1.21 +go 1.22.0 replace ( cloud.google.com/go => cloud.google.com/go upgrade diff --git a/internal/core/algorithm/ngt/Makefile b/internal/core/algorithm/ngt/Makefile index 8b3cf6fb0e..9610a6c9c4 100644 --- a/internal/core/algorithm/ngt/Makefile +++ b/internal/core/algorithm/ngt/Makefile @@ -15,7 +15,11 @@ # bench: + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -count=5 -run=NONE -bench . -benchmem bench-lite: + GOARCH=$(GOARCH) \ + GOOS=$(GOOS) \ go test -count=1 -run=NONE -bench . -benchmem diff --git a/internal/servers/server/option_test.go b/internal/servers/server/option_test.go index cd80764fee..1b6477a5f5 100644 --- a/internal/servers/server/option_test.go +++ b/internal/servers/server/option_test.go @@ -2411,7 +2411,7 @@ func TestDefaultHealthServerOption(t *testing.T) { args: args{ name: "name", host: "host", - path: "path", + path: "/path", port: 8080, }, checkFunc: func(opts []Option) error { diff --git a/k8s/agent/daemonset.yaml b/k8s/agent/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/daemonset.yaml +++ b/k8s/agent/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/deployment.yaml b/k8s/agent/deployment.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/deployment.yaml +++ b/k8s/agent/deployment.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/faiss/configmap.yaml b/k8s/agent/faiss/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/faiss/configmap.yaml +++ b/k8s/agent/faiss/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/hpa.yaml b/k8s/agent/hpa.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/hpa.yaml +++ b/k8s/agent/hpa.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/networkpolicy.yaml b/k8s/agent/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/networkpolicy.yaml +++ b/k8s/agent/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/ngt/configmap.yaml b/k8s/agent/ngt/configmap.yaml index 44b9f2b8df..73d8508b59 100644 --- a/k8s/agent/ngt/configmap.yaml +++ b/k8s/agent/ngt/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/agent/pdb.yaml b/k8s/agent/pdb.yaml index d1cab1d576..d0e9bdd66d 100644 --- a/k8s/agent/pdb.yaml +++ b/k8s/agent/pdb.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/agent/priorityclass.yaml b/k8s/agent/priorityclass.yaml index 13b7b507a2..55d0262daf 100644 --- a/k8s/agent/priorityclass.yaml +++ b/k8s/agent/priorityclass.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/agent/sidecar/configmap.yaml b/k8s/agent/sidecar/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/sidecar/configmap.yaml +++ b/k8s/agent/sidecar/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/sidecar/svc.yaml b/k8s/agent/sidecar/svc.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/agent/sidecar/svc.yaml +++ b/k8s/agent/sidecar/svc.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/agent/statefulset.yaml b/k8s/agent/statefulset.yaml index 32f1dff753..06ae92a35e 100644 --- a/k8s/agent/statefulset.yaml +++ b/k8s/agent/statefulset.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/agent/svc.yaml b/k8s/agent/svc.yaml index 73f1709a8b..abe0865594 100644 --- a/k8s/agent/svc.yaml +++ b/k8s/agent/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/clusterrole.yaml b/k8s/discoverer/clusterrole.yaml index 8849c4b28a..8507ab10a7 100644 --- a/k8s/discoverer/clusterrole.yaml +++ b/k8s/discoverer/clusterrole.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/clusterrolebinding.yaml b/k8s/discoverer/clusterrolebinding.yaml index fcdcac96bd..372291843a 100644 --- a/k8s/discoverer/clusterrolebinding.yaml +++ b/k8s/discoverer/clusterrolebinding.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/configmap.yaml b/k8s/discoverer/configmap.yaml index 762c87ec74..acb8a486ef 100644 --- a/k8s/discoverer/configmap.yaml +++ b/k8s/discoverer/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/daemonset.yaml b/k8s/discoverer/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/discoverer/daemonset.yaml +++ b/k8s/discoverer/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/discoverer/deployment.yaml b/k8s/discoverer/deployment.yaml index 7a5509f597..1b5ba51962 100644 --- a/k8s/discoverer/deployment.yaml +++ b/k8s/discoverer/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/hpa.yaml b/k8s/discoverer/hpa.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/discoverer/hpa.yaml +++ b/k8s/discoverer/hpa.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/discoverer/networkpolicy.yaml b/k8s/discoverer/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/discoverer/networkpolicy.yaml +++ b/k8s/discoverer/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/discoverer/pdb.yaml b/k8s/discoverer/pdb.yaml index f3ff40a0e0..d712f3085e 100644 --- a/k8s/discoverer/pdb.yaml +++ b/k8s/discoverer/pdb.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/priorityclass.yaml b/k8s/discoverer/priorityclass.yaml index 90f05918ee..e6115bd17d 100644 --- a/k8s/discoverer/priorityclass.yaml +++ b/k8s/discoverer/priorityclass.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/serviceaccount.yaml b/k8s/discoverer/serviceaccount.yaml index bcdf21efb2..ec850bac06 100644 --- a/k8s/discoverer/serviceaccount.yaml +++ b/k8s/discoverer/serviceaccount.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/discoverer/svc.yaml b/k8s/discoverer/svc.yaml index e82fcdc74e..c28bc2b094 100644 --- a/k8s/discoverer/svc.yaml +++ b/k8s/discoverer/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/external/minio/mb-job.yaml b/k8s/external/minio/mb-job.yaml index a532b09a30..2d7ebe07b0 100644 --- a/k8s/external/minio/mb-job.yaml +++ b/k8s/external/minio/mb-job.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/filter/configmap.yaml b/k8s/gateway/gateway/filter/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/configmap.yaml +++ b/k8s/gateway/gateway/filter/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/daemonset.yaml b/k8s/gateway/gateway/filter/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/daemonset.yaml +++ b/k8s/gateway/gateway/filter/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/deployment.yaml b/k8s/gateway/gateway/filter/deployment.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/deployment.yaml +++ b/k8s/gateway/gateway/filter/deployment.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/hpa.yaml b/k8s/gateway/gateway/filter/hpa.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/hpa.yaml +++ b/k8s/gateway/gateway/filter/hpa.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/networkpolicy.yaml b/k8s/gateway/gateway/filter/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/networkpolicy.yaml +++ b/k8s/gateway/gateway/filter/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/pdb.yaml b/k8s/gateway/gateway/filter/pdb.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/pdb.yaml +++ b/k8s/gateway/gateway/filter/pdb.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/priorityclass.yaml b/k8s/gateway/gateway/filter/priorityclass.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/priorityclass.yaml +++ b/k8s/gateway/gateway/filter/priorityclass.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/filter/svc.yaml b/k8s/gateway/gateway/filter/svc.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/filter/svc.yaml +++ b/k8s/gateway/gateway/filter/svc.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/ing.yaml b/k8s/gateway/gateway/ing.yaml index 0410fd952a..3f436cadcb 100644 --- a/k8s/gateway/gateway/ing.yaml +++ b/k8s/gateway/gateway/ing.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/configmap.yaml b/k8s/gateway/gateway/lb/configmap.yaml index ea1bec138b..bc4c32fd4a 100644 --- a/k8s/gateway/gateway/lb/configmap.yaml +++ b/k8s/gateway/gateway/lb/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/daemonset.yaml b/k8s/gateway/gateway/lb/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/lb/daemonset.yaml +++ b/k8s/gateway/gateway/lb/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/lb/deployment.yaml b/k8s/gateway/gateway/lb/deployment.yaml index 4052eb6b88..238f9e8f19 100644 --- a/k8s/gateway/gateway/lb/deployment.yaml +++ b/k8s/gateway/gateway/lb/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/hpa.yaml b/k8s/gateway/gateway/lb/hpa.yaml index bc655a6606..29c7827d16 100644 --- a/k8s/gateway/gateway/lb/hpa.yaml +++ b/k8s/gateway/gateway/lb/hpa.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/networkpolicy.yaml b/k8s/gateway/gateway/lb/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/lb/networkpolicy.yaml +++ b/k8s/gateway/gateway/lb/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/lb/pdb.yaml b/k8s/gateway/gateway/lb/pdb.yaml index 308d9ca0f4..b6fdf3b58d 100644 --- a/k8s/gateway/gateway/lb/pdb.yaml +++ b/k8s/gateway/gateway/lb/pdb.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/priorityclass.yaml b/k8s/gateway/gateway/lb/priorityclass.yaml index 8f4fdb0686..29c6ec06fd 100644 --- a/k8s/gateway/gateway/lb/priorityclass.yaml +++ b/k8s/gateway/gateway/lb/priorityclass.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/lb/svc.yaml b/k8s/gateway/gateway/lb/svc.yaml index 49bbc07924..82fcb1f746 100644 --- a/k8s/gateway/gateway/lb/svc.yaml +++ b/k8s/gateway/gateway/lb/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/gateway/gateway/mirror/clusterrole.yaml b/k8s/gateway/gateway/mirror/clusterrole.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/clusterrole.yaml +++ b/k8s/gateway/gateway/mirror/clusterrole.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/clusterrolebinding.yaml b/k8s/gateway/gateway/mirror/clusterrolebinding.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/clusterrolebinding.yaml +++ b/k8s/gateway/gateway/mirror/clusterrolebinding.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/configmap.yaml b/k8s/gateway/gateway/mirror/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/configmap.yaml +++ b/k8s/gateway/gateway/mirror/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/daemonset.yaml b/k8s/gateway/gateway/mirror/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/daemonset.yaml +++ b/k8s/gateway/gateway/mirror/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/deployment.yaml b/k8s/gateway/gateway/mirror/deployment.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/deployment.yaml +++ b/k8s/gateway/gateway/mirror/deployment.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/hpa.yaml b/k8s/gateway/gateway/mirror/hpa.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/hpa.yaml +++ b/k8s/gateway/gateway/mirror/hpa.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/networkpolicy.yaml b/k8s/gateway/gateway/mirror/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/networkpolicy.yaml +++ b/k8s/gateway/gateway/mirror/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/pdb.yaml b/k8s/gateway/gateway/mirror/pdb.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/pdb.yaml +++ b/k8s/gateway/gateway/mirror/pdb.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/priorityclass.yaml b/k8s/gateway/gateway/mirror/priorityclass.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/priorityclass.yaml +++ b/k8s/gateway/gateway/mirror/priorityclass.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/serviceaccount.yaml b/k8s/gateway/gateway/mirror/serviceaccount.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/serviceaccount.yaml +++ b/k8s/gateway/gateway/mirror/serviceaccount.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/gateway/gateway/mirror/svc.yaml b/k8s/gateway/gateway/mirror/svc.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/gateway/gateway/mirror/svc.yaml +++ b/k8s/gateway/gateway/mirror/svc.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/correction/configmap.yaml b/k8s/index/job/correction/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/correction/configmap.yaml +++ b/k8s/index/job/correction/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/correction/cronjob.yaml b/k8s/index/job/correction/cronjob.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/correction/cronjob.yaml +++ b/k8s/index/job/correction/cronjob.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/correction/networkpolicy.yaml b/k8s/index/job/correction/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/correction/networkpolicy.yaml +++ b/k8s/index/job/correction/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/creation/configmap.yaml b/k8s/index/job/creation/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/creation/configmap.yaml +++ b/k8s/index/job/creation/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/creation/cronjob.yaml b/k8s/index/job/creation/cronjob.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/creation/cronjob.yaml +++ b/k8s/index/job/creation/cronjob.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/creation/networkpolicy.yaml b/k8s/index/job/creation/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/creation/networkpolicy.yaml +++ b/k8s/index/job/creation/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/clusterrole.yaml b/k8s/index/job/readreplica/rotate/clusterrole.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/clusterrole.yaml +++ b/k8s/index/job/readreplica/rotate/clusterrole.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/clusterrolebinding.yaml b/k8s/index/job/readreplica/rotate/clusterrolebinding.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/clusterrolebinding.yaml +++ b/k8s/index/job/readreplica/rotate/clusterrolebinding.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/configmap.yaml b/k8s/index/job/readreplica/rotate/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/configmap.yaml +++ b/k8s/index/job/readreplica/rotate/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/cronjob.yaml b/k8s/index/job/readreplica/rotate/cronjob.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/cronjob.yaml +++ b/k8s/index/job/readreplica/rotate/cronjob.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/networkpolicy.yaml b/k8s/index/job/readreplica/rotate/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/networkpolicy.yaml +++ b/k8s/index/job/readreplica/rotate/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/readreplica/rotate/serviceaccount.yaml b/k8s/index/job/readreplica/rotate/serviceaccount.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/readreplica/rotate/serviceaccount.yaml +++ b/k8s/index/job/readreplica/rotate/serviceaccount.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/save/configmap.yaml b/k8s/index/job/save/configmap.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/save/configmap.yaml +++ b/k8s/index/job/save/configmap.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/save/cronjob.yaml b/k8s/index/job/save/cronjob.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/save/cronjob.yaml +++ b/k8s/index/job/save/cronjob.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/index/job/save/networkpolicy.yaml b/k8s/index/job/save/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/index/job/save/networkpolicy.yaml +++ b/k8s/index/job/save/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/manager/index/configmap.yaml b/k8s/manager/index/configmap.yaml index 0b9552b3bf..5a52884564 100644 --- a/k8s/manager/index/configmap.yaml +++ b/k8s/manager/index/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/manager/index/daemonset.yaml b/k8s/manager/index/daemonset.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/manager/index/daemonset.yaml +++ b/k8s/manager/index/daemonset.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/manager/index/deployment.yaml b/k8s/manager/index/deployment.yaml index acbef7dc59..d8c2801431 100644 --- a/k8s/manager/index/deployment.yaml +++ b/k8s/manager/index/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/manager/index/networkpolicy.yaml b/k8s/manager/index/networkpolicy.yaml index ed97d539c0..e69de29bb2 100644 --- a/k8s/manager/index/networkpolicy.yaml +++ b/k8s/manager/index/networkpolicy.yaml @@ -1 +0,0 @@ ---- diff --git a/k8s/manager/index/pdb.yaml b/k8s/manager/index/pdb.yaml index 2846a009f1..3a5fdc457a 100644 --- a/k8s/manager/index/pdb.yaml +++ b/k8s/manager/index/pdb.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/manager/index/priorityclass.yaml b/k8s/manager/index/priorityclass.yaml index 08b82db222..9136b533d6 100644 --- a/k8s/manager/index/priorityclass.yaml +++ b/k8s/manager/index/priorityclass.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/manager/index/svc.yaml b/k8s/manager/index/svc.yaml index efe3ec74fd..2d9d28c217 100644 --- a/k8s/manager/index/svc.yaml +++ b/k8s/manager/index/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/configmap.yaml b/k8s/metrics/grafana/configmap.yaml index 73c3a7129a..b45c4adc3c 100644 --- a/k8s/metrics/grafana/configmap.yaml +++ b/k8s/metrics/grafana/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml b/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml index 541b3202c1..d9fc285a66 100644 --- a/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml +++ b/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml b/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml index 31dcc9e911..3402c01b69 100644 --- a/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml +++ b/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/07-vald-helm-operator.yaml b/k8s/metrics/grafana/dashboards/07-vald-helm-operator.yaml index 856c34cd2b..0e790388f8 100644 --- a/k8s/metrics/grafana/dashboards/07-vald-helm-operator.yaml +++ b/k8s/metrics/grafana/dashboards/07-vald-helm-operator.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml b/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml index 93861ea81e..884ade674d 100644 --- a/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml +++ b/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/09-vald-index-correction.yaml b/k8s/metrics/grafana/dashboards/09-vald-index-correction.yaml index 309e2af596..d78d38865c 100644 --- a/k8s/metrics/grafana/dashboards/09-vald-index-correction.yaml +++ b/k8s/metrics/grafana/dashboards/09-vald-index-correction.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/dashboards/99-vald-agent-memory.yaml b/k8s/metrics/grafana/dashboards/99-vald-agent-memory.yaml index aee5021c05..813a131f87 100644 --- a/k8s/metrics/grafana/dashboards/99-vald-agent-memory.yaml +++ b/k8s/metrics/grafana/dashboards/99-vald-agent-memory.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/deployment.yaml b/k8s/metrics/grafana/deployment.yaml index fe7854560c..cfdee03814 100644 --- a/k8s/metrics/grafana/deployment.yaml +++ b/k8s/metrics/grafana/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/grafana/svc.yaml b/k8s/metrics/grafana/svc.yaml index d74bd5c576..c85429bce1 100644 --- a/k8s/metrics/grafana/svc.yaml +++ b/k8s/metrics/grafana/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/jaeger/jaeger.yaml b/k8s/metrics/jaeger/jaeger.yaml index 369a7d5f8c..18d93a4019 100644 --- a/k8s/metrics/jaeger/jaeger.yaml +++ b/k8s/metrics/jaeger/jaeger.yaml @@ -19,12 +19,10 @@ metadata: name: jaeger spec: strategy: allInOne - allInOne: image: jaegertracing/all-in-one:latest options: log-level: debug - # spec for jaeger-collector components. collector: replicas: 3 @@ -33,14 +31,12 @@ spec: prometheus.io/path: "/metrics" prometheus.io/port: "14268" serviceType: ClusterIP - # spec for sampling of jaeger-collector. sampling: options: default_strategy: type: probabilistic param: 0.5 - # spec for ui of jaeger-query. ui: options: @@ -48,7 +44,6 @@ spec: dagMaxNumServices: 500 menuEnabled: true archiveEnabled: true - # spec for in memory storage. storage: type: memory diff --git a/k8s/metrics/loki/loki.yaml b/k8s/metrics/loki/loki.yaml index 49f2b63776..6bac578c12 100644 --- a/k8s/metrics/loki/loki.yaml +++ b/k8s/metrics/loki/loki.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/loki/promtail.yaml b/k8s/metrics/loki/promtail.yaml index 4ae43e7303..75f7d5578d 100644 --- a/k8s/metrics/loki/promtail.yaml +++ b/k8s/metrics/loki/promtail.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/clusterrole.yaml b/k8s/metrics/profefe/clusterrole.yaml index 0611a0e7e7..6b47ea5c08 100644 --- a/k8s/metrics/profefe/clusterrole.yaml +++ b/k8s/metrics/profefe/clusterrole.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/clusterrolebinding.yaml b/k8s/metrics/profefe/clusterrolebinding.yaml index 3d68454f78..0f79eb022c 100644 --- a/k8s/metrics/profefe/clusterrolebinding.yaml +++ b/k8s/metrics/profefe/clusterrolebinding.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/cronjob.yaml b/k8s/metrics/profefe/cronjob.yaml index 3c3b318ae1..abc703fe07 100644 --- a/k8s/metrics/profefe/cronjob.yaml +++ b/k8s/metrics/profefe/cronjob.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/deployment.yaml b/k8s/metrics/profefe/deployment.yaml index 13cef48981..150f191800 100644 --- a/k8s/metrics/profefe/deployment.yaml +++ b/k8s/metrics/profefe/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/serviceaccount.yaml b/k8s/metrics/profefe/serviceaccount.yaml index 2222896fe9..1c23966973 100644 --- a/k8s/metrics/profefe/serviceaccount.yaml +++ b/k8s/metrics/profefe/serviceaccount.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/profefe/svc.yaml b/k8s/metrics/profefe/svc.yaml index 1c99c22ef9..fdbb23c02e 100644 --- a/k8s/metrics/profefe/svc.yaml +++ b/k8s/metrics/profefe/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/clusterrole.yaml b/k8s/metrics/prometheus/clusterrole.yaml index 7a52b32b31..94159b9a96 100644 --- a/k8s/metrics/prometheus/clusterrole.yaml +++ b/k8s/metrics/prometheus/clusterrole.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/clusterrolebinding.yaml b/k8s/metrics/prometheus/clusterrolebinding.yaml index 2781da6f42..1f1fd9e90b 100644 --- a/k8s/metrics/prometheus/clusterrolebinding.yaml +++ b/k8s/metrics/prometheus/clusterrolebinding.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/configmap.yaml b/k8s/metrics/prometheus/configmap.yaml index 85c3313fd5..a34963adff 100644 --- a/k8s/metrics/prometheus/configmap.yaml +++ b/k8s/metrics/prometheus/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/deployment.yaml b/k8s/metrics/prometheus/deployment.yaml index 9c3dd1e4df..b1259b9f6e 100644 --- a/k8s/metrics/prometheus/deployment.yaml +++ b/k8s/metrics/prometheus/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/serviceaccount.yaml b/k8s/metrics/prometheus/serviceaccount.yaml index 606da95104..24d1da18fe 100644 --- a/k8s/metrics/prometheus/serviceaccount.yaml +++ b/k8s/metrics/prometheus/serviceaccount.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/prometheus/svc.yaml b/k8s/metrics/prometheus/svc.yaml index 168aa8cc2d..87d87b8fa2 100644 --- a/k8s/metrics/prometheus/svc.yaml +++ b/k8s/metrics/prometheus/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/pyroscope/base/kustomization.yaml b/k8s/metrics/pyroscope/base/kustomization.yaml index 44b6bf881b..b1c335f37d 100644 --- a/k8s/metrics/pyroscope/base/kustomization.yaml +++ b/k8s/metrics/pyroscope/base/kustomization.yaml @@ -15,7 +15,6 @@ # apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - resources: - clusterrole.yaml - clusterrolebinding.yaml diff --git a/k8s/metrics/pyroscope/overlay/kustomization.yaml b/k8s/metrics/pyroscope/overlay/kustomization.yaml index 4e3085e2fd..36d298cd06 100644 --- a/k8s/metrics/pyroscope/overlay/kustomization.yaml +++ b/k8s/metrics/pyroscope/overlay/kustomization.yaml @@ -15,12 +15,9 @@ # apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: - ../base - resources: - pvc.yaml - patches: - deployment.yaml diff --git a/k8s/metrics/tempo/jaeger-agent.yaml b/k8s/metrics/tempo/jaeger-agent.yaml index 0b756d60d1..14b2921139 100644 --- a/k8s/metrics/tempo/jaeger-agent.yaml +++ b/k8s/metrics/tempo/jaeger-agent.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/metrics/tempo/tempo.yaml b/k8s/metrics/tempo/tempo.yaml index 1c96b0649f..d88bb1d8ef 100644 --- a/k8s/metrics/tempo/tempo.yaml +++ b/k8s/metrics/tempo/tempo.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/operator/helm/clusterrole.yaml b/k8s/operator/helm/clusterrole.yaml index 3e9d1860a5..63f20a4e5d 100644 --- a/k8s/operator/helm/clusterrole.yaml +++ b/k8s/operator/helm/clusterrole.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/operator/helm/clusterrolebinding.yaml b/k8s/operator/helm/clusterrolebinding.yaml index e66180e470..5e82bf58cd 100644 --- a/k8s/operator/helm/clusterrolebinding.yaml +++ b/k8s/operator/helm/clusterrolebinding.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/operator/helm/operator.yaml b/k8s/operator/helm/operator.yaml index 668ef53e10..a137206f0e 100644 --- a/k8s/operator/helm/operator.yaml +++ b/k8s/operator/helm/operator.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/operator/helm/serviceaccount.yaml b/k8s/operator/helm/serviceaccount.yaml index 6169e0eb59..38c05ae7e2 100644 --- a/k8s/operator/helm/serviceaccount.yaml +++ b/k8s/operator/helm/serviceaccount.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/operator/helm/svc.yaml b/k8s/operator/helm/svc.yaml index 426181647e..4b984ec463 100644 --- a/k8s/operator/helm/svc.yaml +++ b/k8s/operator/helm/svc.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/clusterrole.yaml b/k8s/tools/benchmark/operator/clusterrole.yaml index 9a25bc3d89..f982e24918 100644 --- a/k8s/tools/benchmark/operator/clusterrole.yaml +++ b/k8s/tools/benchmark/operator/clusterrole.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/clusterrolebinding.yaml b/k8s/tools/benchmark/operator/clusterrolebinding.yaml index 4cb1cbc833..f8086424dc 100644 --- a/k8s/tools/benchmark/operator/clusterrolebinding.yaml +++ b/k8s/tools/benchmark/operator/clusterrolebinding.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/configmap.yaml b/k8s/tools/benchmark/operator/configmap.yaml index 0694d84471..6e292e19a1 100644 --- a/k8s/tools/benchmark/operator/configmap.yaml +++ b/k8s/tools/benchmark/operator/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/deployment.yaml b/k8s/tools/benchmark/operator/deployment.yaml index e2740649c7..11aa1bea00 100644 --- a/k8s/tools/benchmark/operator/deployment.yaml +++ b/k8s/tools/benchmark/operator/deployment.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/service.yaml b/k8s/tools/benchmark/operator/service.yaml index aebdd7d328..72c0c9f34a 100644 --- a/k8s/tools/benchmark/operator/service.yaml +++ b/k8s/tools/benchmark/operator/service.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/benchmark/operator/serviceaccount.yaml b/k8s/tools/benchmark/operator/serviceaccount.yaml index e9be258daa..7101f91c7e 100644 --- a/k8s/tools/benchmark/operator/serviceaccount.yaml +++ b/k8s/tools/benchmark/operator/serviceaccount.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/cli/loadtest/configmap.yaml b/k8s/tools/cli/loadtest/configmap.yaml index c725c00bb7..5fe208c75f 100644 --- a/k8s/tools/cli/loadtest/configmap.yaml +++ b/k8s/tools/cli/loadtest/configmap.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/cli/loadtest/cronjob.yaml b/k8s/tools/cli/loadtest/cronjob.yaml index 7ca57e14f7..dee83a52de 100644 --- a/k8s/tools/cli/loadtest/cronjob.yaml +++ b/k8s/tools/cli/loadtest/cronjob.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/k8s/tools/cli/loadtest/job.yaml b/k8s/tools/cli/loadtest/job.yaml index 75f73c817e..5cd6073f31 100644 --- a/k8s/tools/cli/loadtest/job.yaml +++ b/k8s/tools/cli/loadtest/job.yaml @@ -1,4 +1,3 @@ ---- # # Copyright (C) 2019-2024 vdaas.org vald team # diff --git a/tests/chaos/chart/values.yaml b/tests/chaos/chart/values.yaml index a885f8076f..2c593ce560 100644 --- a/tests/chaos/chart/values.yaml +++ b/tests/chaos/chart/values.yaml @@ -35,7 +35,6 @@ podChaos: namespaces: - default schedule: "*/2 * * * *" - networkChaos: partition: enabled: false diff --git a/versions/GOLANGCILINT_VERSION b/versions/GOLANGCILINT_VERSION index 21fed05e8f..e7e45c8298 100644 --- a/versions/GOLANGCILINT_VERSION +++ b/versions/GOLANGCILINT_VERSION @@ -1 +1 @@ -v1.55.2 +v1.56.0 diff --git a/versions/GO_VERSION b/versions/GO_VERSION index c262b1f0df..57807d6d0d 100644 --- a/versions/GO_VERSION +++ b/versions/GO_VERSION @@ -1 +1 @@ -1.21.6 +1.22.0