diff --git a/.gitfiles b/.gitfiles index 64f792a39cd..6f563790f45 100644 --- a/.gitfiles +++ b/.gitfiles @@ -77,15 +77,27 @@ .github/workflows/coverage.yml .github/workflows/detect-internal-config-changes.yml .github/workflows/dockers-agent-faiss-image.yml +<<<<<<< HEAD +.github/workflows/dockers-agent-image.yml +======= +.github/workflows/dockers-agent-faiss-image.yml +.github/workflows/dockers-agent-faiss-image.yml +.github/workflows/dockers-agent-image.yml .github/workflows/dockers-agent-image.yml .github/workflows/dockers-agent-ngt-image.yml +.github/workflows/dockers-agent-ngt-image.yml +>>>>>>> backport/main/release/v1.7 +.github/workflows/dockers-agent-ngt-image.yml .github/workflows/dockers-agent-sidecar-image.yml .github/workflows/dockers-benchmark-job-image.yml .github/workflows/dockers-benchmark-operator-image.yaml .github/workflows/dockers-binfmt-image.yaml .github/workflows/dockers-buildbase-image.yml .github/workflows/dockers-buildkit-image.yaml +<<<<<<< HEAD .github/workflows/dockers-buildkit-syft-scanner-image.yaml +======= +>>>>>>> backport/main/release/v1.7 .github/workflows/dockers-ci-container-image.yml .github/workflows/dockers-dev-container-image.yml .github/workflows/dockers-discoverer-k8s-image.yml @@ -137,6 +149,11 @@ CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE Makefile +<<<<<<< HEAD +======= +Makefile +Makefile +>>>>>>> backport/main/release/v1.7 Makefile.d/actions.mk Makefile.d/bench.mk Makefile.d/build.mk @@ -293,11 +310,23 @@ assets/test/templates/common/call.tmpl assets/test/templates/common/fill.tmpl assets/test/templates/common/function.tmpl assets/test/templates/common/header.tmpl +<<<<<<< HEAD +======= +assets/test/templates/common/inline.tmpl +assets/test/templates/common/inputs.tmpl +assets/test/templates/common/message.tmpl +>>>>>>> backport/main/release/v1.7 assets/test/templates/common/results.tmpl assets/test/templates/option/call.tmpl assets/test/templates/option/fill.tmpl assets/test/templates/option/function.tmpl assets/test/templates/option/header.tmpl +<<<<<<< HEAD +======= +assets/test/templates/option/inline.tmpl +assets/test/templates/option/inputs.tmpl +assets/test/templates/option/message.tmpl +>>>>>>> backport/main/release/v1.7 assets/test/templates/option/results.tmpl buf.gen.yaml buf.work.yaml @@ -511,13 +540,25 @@ cmd/tools/cli/loadtest/main_test.go cmd/tools/cli/loadtest/sample.yaml cmd/tools/cli/vdctl/main.go cmd/tools/cli/vdctl/main_test.go +<<<<<<< HEAD +======= +design/.gitkeep +>>>>>>> backport/main/release/v1.7 design/Vald Architecture Assets.drawio design/Vald Architecture Dataflow.drawio design/Vald Architecture Overview.drawio design/vald_architecture_overview.png dockers/agent/core/agent/Dockerfile +<<<<<<< HEAD dockers/agent/core/agent/README.md dockers/agent/core/faiss/Dockerfile +======= +dockers/agent/core/agent/Dockerfile +dockers/agent/core/agent/README.md +dockers/agent/core/faiss/Dockerfile +dockers/agent/core/faiss/Dockerfile +dockers/agent/core/faiss/Dockerfile +>>>>>>> backport/main/release/v1.7 dockers/agent/core/ngt/Dockerfile dockers/agent/core/ngt/README.md dockers/agent/sidecar/Dockerfile @@ -525,10 +566,20 @@ dockers/agent/sidecar/README.md dockers/binfmt/Dockerfile dockers/buildbase/Dockerfile dockers/buildkit/Dockerfile +<<<<<<< HEAD dockers/buildkit/syft/scanner/Dockerfile dockers/ci/base/Dockerfile dockers/ci/base/README.md dockers/dev/Dockerfile +======= +dockers/ci/base/Dockerfile +dockers/ci/base/Dockerfile +dockers/ci/base/Dockerfile +dockers/ci/base/README.md +dockers/dev/Dockerfile +dockers/dev/Dockerfile +dockers/dev/Dockerfile +>>>>>>> backport/main/release/v1.7 dockers/dev/README.md dockers/discoverer/k8s/Dockerfile dockers/discoverer/k8s/README.md @@ -555,6 +606,10 @@ docs/api/README.md docs/api/build_proto.md docs/api/filter-gateway.md docs/api/flush.md +<<<<<<< HEAD +======= +docs/api/flush.md +>>>>>>> backport/main/release/v1.7 docs/api/insert.md docs/api/mirror-gateway.md docs/api/object.md @@ -622,8 +677,17 @@ example/helm/values-with-pyroscope.yaml example/helm/values.yaml example/manifest/scylla/configmap.yaml example/manifest/scylla/job.yaml +<<<<<<< HEAD +go.mod +======= +github_info.json +go.mod +go.mod go.mod go.sum +go.sum +>>>>>>> backport/main/release/v1.7 +go.sum hack/CHANGELOG.template.md hack/benchmark/assets/checksum/fashion-mnist-784-euclidean.md5 hack/benchmark/assets/checksum/gist-960-euclidean.md5 @@ -699,6 +763,10 @@ hack/benchmark/internal/starter/starter.go hack/benchmark/metrics/metrics.go hack/benchmark/src/singleflight/singleflight_bench_test.go hack/docker/gen/main.go +<<<<<<< HEAD +======= +hack/docker/gen/main.go +>>>>>>> backport/main/release/v1.7 hack/git/hooks/pre-commit hack/go.mod.default hack/gorules/rules.go @@ -1398,16 +1466,39 @@ internal/worker/worker.go internal/worker/worker_option.go internal/worker/worker_option_test.go internal/worker/worker_test.go +<<<<<<< HEAD k8s/agent/ngt/configmap.yaml k8s/agent/pdb.yaml k8s/agent/priorityclass.yaml +======= +k8s/agent/clusterrole.yaml +k8s/agent/clusterrolebinding.yaml +k8s/agent/daemonset.yaml +k8s/agent/deployment.yaml +k8s/agent/faiss/configmap.yaml +k8s/agent/hpa.yaml +k8s/agent/networkpolicy.yaml +k8s/agent/ngt/configmap.yaml +k8s/agent/pdb.yaml +k8s/agent/priorityclass.yaml +k8s/agent/serviceaccount.yaml +k8s/agent/sidecar/configmap.yaml +k8s/agent/sidecar/svc.yaml +>>>>>>> backport/main/release/v1.7 k8s/agent/statefulset.yaml k8s/agent/svc.yaml k8s/debug/kind/config.yaml k8s/discoverer/clusterrole.yaml k8s/discoverer/clusterrolebinding.yaml k8s/discoverer/configmap.yaml +<<<<<<< HEAD +k8s/discoverer/deployment.yaml +======= +k8s/discoverer/daemonset.yaml k8s/discoverer/deployment.yaml +k8s/discoverer/hpa.yaml +k8s/discoverer/networkpolicy.yaml +>>>>>>> backport/main/release/v1.7 k8s/discoverer/pdb.yaml k8s/discoverer/priorityclass.yaml k8s/discoverer/serviceaccount.yaml @@ -1415,6 +1506,7 @@ k8s/discoverer/svc.yaml k8s/external/minio/deployment.yaml k8s/external/minio/mb-job.yaml k8s/external/minio/svc.yaml +<<<<<<< HEAD k8s/gateway/gateway/ing.yaml k8s/gateway/gateway/lb/configmap.yaml k8s/gateway/gateway/lb/deployment.yaml @@ -1428,11 +1520,61 @@ k8s/index/job/creation/configmap.yaml k8s/index/job/creation/cronjob.yaml k8s/index/job/save/configmap.yaml k8s/index/job/save/cronjob.yaml +======= +k8s/gateway/gateway/filter/configmap.yaml +k8s/gateway/gateway/filter/daemonset.yaml +k8s/gateway/gateway/filter/deployment.yaml +k8s/gateway/gateway/filter/hpa.yaml +k8s/gateway/gateway/filter/networkpolicy.yaml +k8s/gateway/gateway/filter/pdb.yaml +k8s/gateway/gateway/filter/priorityclass.yaml +k8s/gateway/gateway/filter/svc.yaml +k8s/gateway/gateway/ing.yaml +k8s/gateway/gateway/lb/configmap.yaml +k8s/gateway/gateway/lb/daemonset.yaml +k8s/gateway/gateway/lb/deployment.yaml +k8s/gateway/gateway/lb/hpa.yaml +k8s/gateway/gateway/lb/networkpolicy.yaml +k8s/gateway/gateway/lb/pdb.yaml +k8s/gateway/gateway/lb/priorityclass.yaml +k8s/gateway/gateway/lb/svc.yaml +k8s/gateway/gateway/mirror/clusterrole.yaml +k8s/gateway/gateway/mirror/clusterrolebinding.yaml +k8s/gateway/gateway/mirror/configmap.yaml +k8s/gateway/gateway/mirror/daemonset.yaml +k8s/gateway/gateway/mirror/deployment.yaml +k8s/gateway/gateway/mirror/hpa.yaml +k8s/gateway/gateway/mirror/networkpolicy.yaml +k8s/gateway/gateway/mirror/pdb.yaml +k8s/gateway/gateway/mirror/priorityclass.yaml +k8s/gateway/gateway/mirror/serviceaccount.yaml +k8s/gateway/gateway/mirror/svc.yaml +k8s/index/job/correction/configmap.yaml +k8s/index/job/correction/cronjob.yaml +k8s/index/job/correction/networkpolicy.yaml +k8s/index/job/creation/configmap.yaml +k8s/index/job/creation/cronjob.yaml +k8s/index/job/creation/networkpolicy.yaml +k8s/index/job/readreplica/rotate/clusterrole.yaml +k8s/index/job/readreplica/rotate/clusterrolebinding.yaml +k8s/index/job/readreplica/rotate/configmap.yaml +k8s/index/job/readreplica/rotate/networkpolicy.yaml +k8s/index/job/readreplica/rotate/serviceaccount.yaml +k8s/index/job/save/configmap.yaml +k8s/index/job/save/cronjob.yaml +k8s/index/job/save/networkpolicy.yaml +>>>>>>> backport/main/release/v1.7 k8s/index/operator/configmap.yaml k8s/index/operator/deployment.yaml k8s/index/operator/priorityclass.yaml k8s/manager/index/configmap.yaml +<<<<<<< HEAD +k8s/manager/index/deployment.yaml +======= +k8s/manager/index/daemonset.yaml k8s/manager/index/deployment.yaml +k8s/manager/index/networkpolicy.yaml +>>>>>>> backport/main/release/v1.7 k8s/manager/index/pdb.yaml k8s/manager/index/priorityclass.yaml k8s/manager/index/svc.yaml @@ -1491,6 +1633,15 @@ k8s/operator/helm/operator.yaml k8s/operator/helm/serviceaccount.yaml k8s/operator/helm/svc.yaml k8s/readreplica/configmap.yaml +<<<<<<< HEAD +======= +k8s/readreplica/deployment.yaml +k8s/readreplica/hpa.yaml +k8s/readreplica/networkpolicy.yaml +k8s/readreplica/pvc.yaml +k8s/readreplica/snapshot.yaml +k8s/readreplica/svc.yaml +>>>>>>> backport/main/release/v1.7 k8s/tools/benchmark/job/clusterrole.yaml k8s/tools/benchmark/job/clusterrolebinding.yaml k8s/tools/benchmark/job/serviceaccount.yaml @@ -1886,8 +2037,17 @@ pkg/tools/cli/loadtest/usecase/load.go pkg/tools/cli/loadtest/usecase/load_test.go renovate.json rust/Cargo.lock +<<<<<<< HEAD rust/Cargo.toml rust/bin/agent/Cargo.toml +======= +rust/Cargo.lock +rust/Cargo.lock +rust/Cargo.toml +rust/bin/agent/Cargo.toml +rust/bin/agent/Cargo.toml +rust/bin/agent/Cargo.toml +>>>>>>> backport/main/release/v1.7 rust/bin/agent/src/handler.rs rust/bin/agent/src/handler/common.rs rust/bin/agent/src/handler/index.rs @@ -1905,6 +2065,7 @@ rust/libs/ngt-rs/src/lib.rs rust/libs/ngt/Cargo.toml rust/libs/ngt/src/lib.rs rust/libs/proto/Cargo.toml +<<<<<<< HEAD rust/libs/proto/src/core.v1.tonic.rs rust/libs/proto/src/discoverer.v1.tonic.rs rust/libs/proto/src/filter.egress.v1.tonic.rs @@ -1914,12 +2075,34 @@ rust/libs/proto/src/mirror.v1.tonic.rs rust/libs/proto/src/payload.v1.rs rust/libs/proto/src/rpc.v1.rs rust/libs/proto/src/sidecar.v1.tonic.rs +======= +rust/libs/proto/src/core.v1.rs +rust/libs/proto/src/core.v1.tonic.rs +rust/libs/proto/src/discoverer.v1.rs +rust/libs/proto/src/discoverer.v1.tonic.rs +rust/libs/proto/src/filter.egress.v1.rs +rust/libs/proto/src/filter.egress.v1.tonic.rs +rust/libs/proto/src/filter.ingress.v1.rs +rust/libs/proto/src/filter.ingress.v1.tonic.rs +rust/libs/proto/src/lib.rs +rust/libs/proto/src/mirror.v1.rs +rust/libs/proto/src/mirror.v1.tonic.rs +rust/libs/proto/src/payload.v1.rs +rust/libs/proto/src/rpc.v1.rs +rust/libs/proto/src/sidecar.v1.rs +rust/libs/proto/src/sidecar.v1.tonic.rs +rust/libs/proto/src/vald.v1.rs +>>>>>>> backport/main/release/v1.7 rust/libs/proto/src/vald.v1.tonic.rs rust/rust-toolchain rust/rust-toolchain.toml tests/chaos/chart/.helmignore tests/chaos/chart/Chart.yaml tests/chaos/chart/README.md +<<<<<<< HEAD +======= +tests/chaos/chart/templates/NOTES.txt +>>>>>>> backport/main/release/v1.7 tests/chaos/chart/templates/_helpers.tpl tests/chaos/chart/templates/network/bandwidth.yaml tests/chaos/chart/templates/network/partition.yaml @@ -1961,6 +2144,11 @@ versions/NGT_VERSION versions/OPERATOR_SDK_VERSION versions/OTEL_OPERATOR_VERSION versions/PROMETHEUS_STACK_VERSION +<<<<<<< HEAD +======= +versions/PROMETHEUS_STACK_VERSION +versions/PROMETHEUS_STACK_VERSION +>>>>>>> backport/main/release/v1.7 versions/PROTOBUF_VERSION versions/REVIEWDOG_VERSION versions/RUST_VERSION diff --git a/dockers/buildkit/syft/scanner/Dockerfile b/dockers/buildkit/syft/scanner/Dockerfile index 4a23207c47f..df32fe57052 100644 --- a/dockers/buildkit/syft/scanner/Dockerfile +++ b/dockers/buildkit/syft/scanner/Dockerfile @@ -16,4 +16,4 @@ # # DO_NOT_EDIT this Dockerfile is generated by https://github.com/vdaas/vald/blob/main/hack/docker/gen/main.go -FROM docker/buildkit-syft-scanner:edge AS scanner +FROM docker/buildkit-syft-scanner:edge AS scanner \ No newline at end of file diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index 09fccb1e35e..5137df570ae 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -44,8 +44,8 @@ ENV REPO=vald ENV RUST_HOME=/usr/loacl/lib/rust ENV TZ=Etc/UTC ENV USER=root -ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV CARGO_HOME=${RUST_HOME}/cargo +ENV RUSTUP_HOME=${RUST_HOME}/rustup ENV PATH=${CARGO_HOME}/bin:${GOPATH}/bin:${GOROOT}/bin:${RUSTUP_HOME}/bin:/usr/local/bin:${PATH} WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/github_info.json b/github_info.json new file mode 100644 index 00000000000..dea04dd45d6 --- /dev/null +++ b/github_info.json @@ -0,0 +1,192 @@ +{ + "body": "\r\n\r\n### Description\r\nThe following modifications have been made to this PR.\r\n- Refactoring of IndexManager\r\n - Integration of Index proto into Vald proto\r\n - IndexInfo, IndexDetail, and GetTimestamp APIs are now available outside of Index manager\r\n- Automatic Dockerfile generation\r\n - https://github.com/vdaas/vald/blob/refactor/manager-index/small-refactor/hack/docker/gen/main.go\r\n- Fixes to Typo\r\n- Expose IndexDetail API\r\n- Ingress Route optimization\r\n - Added pass-through to LB when using MirrorGateway or FilterGateway as specific API processing is not needed\r\n- Add Formatter (crlfmt)\r\n - https://github.com/cockroachdb/crlfmt\r\n- Detailing of internal info API\r\n　- Add GoMaxProcs, CGOCall, GoroutineCount, RuntimeCPUCores\r\n\r\nTranslated with DeepL.com (free version)\r\n\r\n### Related Issue\r\n\r\n\r\n\r\n\r\n\r\n\r\n### Versions\r\n\r\n\r\n\r\n- Go Version: 1.22.5\r\n- Rust Version: 1.77.2\r\n- Docker Version: 20.10.8\r\n- Kubernetes Version: v1.30.2\r\n- NGT Version: 2.2.2\r\n\r\n### Checklist\r\n\r\n\r\n\r\n\r\n- [ ] 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).\r\n- [ ] I have checked open [Pull Requests](https://github.com/vdaas/vald/pulls) for the similar feature or fixes?\r\n\r\n### Special notes for your reviewer\r\n\r\n\r\n", + "headRefName": "refactor/manager-index/small-refactor", + "headRefOid": "6ad94c0afcf9152801412ea22aef8bb6178ebb3d", + "labels": [ + { + "id": "MDU6TGFiZWwxNzI5NDQ2Mjg4", + "name": "team/core", + "description": "Core team", + "color": "fbca04" + }, + { + "id": "MDU6TGFiZWwxNzI5NDQ5MTc4", + "name": "type/feature", + "description": "New feature", + "color": "1fa874" + }, + { + "id": "MDU6TGFiZWwxNzI5NTgxMzcy", + "name": "priority/high", + "description": "", + "color": "5319e7" + }, + { + "id": "MDU6TGFiZWwxNzI5NTgyMjA2", + "name": "type/refactoring", + "description": "", + "color": "055e5e" + }, + { + "id": "MDU6TGFiZWwxNzI5NTgyODUz", + "name": "status/in-review", + "description": "", + "color": "defca6" + }, + { + "id": "MDU6TGFiZWwxNzI5NTg3Njk5", + "name": "area/agent", + "description": "", + "color": "5c099b" + }, + { + "id": "MDU6TGFiZWwxNzI5NTg3OTMy", + "name": "area/discoverer", + "description": "", + "color": "abc3fc" + }, + { + "id": "MDU6TGFiZWwxNzI5NTg5OTA5", + "name": "area/manager/index", + "description": "", + "color": "6d7dc6" + }, + { + "id": "MDU6TGFiZWwxNzI5NTkwMzYx", + "name": "area/filter/ingress", + "description": "", + "color": "dd6761" + }, + { + "id": "MDU6TGFiZWwxNzI5NTkwNTEz", + "name": "area/filter/egress", + "description": "", + "color": "e04c96" + }, + { + "id": "MDU6TGFiZWwxNzI5NTkwODA0", + "name": "area/internal", + "description": "", + "color": "d86586" + }, + { + "id": "MDU6TGFiZWwxNzI5NTkxODE3", + "name": "type/ci", + "description": "", + "color": "006b75" + }, + { + "id": "MDU6TGFiZWwxNzQ5MTMzNDMy", + "name": "size/XXXL", + "description": "", + "color": "d37054" + }, + { + "id": "MDU6TGFiZWwxODM3NjQ2MjQw", + "name": "area/helm", + "description": "", + "color": "bfd4f2" + }, + { + "id": "MDU6TGFiZWwxOTA2MDk1OTkz", + "name": "area/makefile", + "description": "", + "color": "c379e0" + }, + { + "id": "MDU6TGFiZWwyMDg2NDk2MDI3", + "name": "area/agent/core", + "description": "", + "color": "ba400d" + }, + { + "id": "MDU6TGFiZWwyMDg2NDk2MDI5", + "name": "area/agent/sidecar", + "description": "", + "color": "8befc0" + }, + { + "id": "MDU6TGFiZWwyMTIyNzQyODI5", + "name": "area/tools/cli/loadtest", + "description": "", + "color": "99b2f7" + }, + { + "id": "MDU6TGFiZWwyMjQ5MDg2Mjc2", + "name": "area/gateway/lb", + "description": "", + "color": "ededed" + }, + { + "id": "MDU6TGFiZWwyMjQ5MDg2Mjc5", + "name": "area/gateway/filter", + "description": "", + "color": "ededed" + }, + { + "id": "MDU6TGFiZWwyNDk0MTI0ODE5", + "name": "actions/e2e-deploy", + "description": "", + "color": "ededed" + }, + { + "id": "MDU6TGFiZWwyNTExODU3NzM3", + "name": "actions/fossa", + "description": "", + "color": "ededed" + }, + { + "id": "MDU6TGFiZWwyNjAxOTYyNTQ5", + "name": "actions/e2e-chaos", + "description": "", + "color": "ededed" + }, + { + "id": "MDU6TGFiZWwzMjAwNTA4ODg5", + "name": "actions/e2e-profiling", + "description": "", + "color": "ededed" + }, + { + "id": "LA_kwDOC6jpA872fNxB", + "name": "actions/e2e-max-dim", + "description": "", + "color": "ededed" + }, + { + "id": "LA_kwDOC6jpA88AAAABJP5xbA", + "name": "ci/approved", + "description": "", + "color": "0E8A16" + }, + { + "id": "LA_kwDOC6jpA88AAAABefFjpw", + "name": "actions/backport/release/v1.7", + "description": "", + "color": "fef2c0" + }, + { + "id": "LA_kwDOC6jpA88AAAABgwMFlA", + "name": "area/agent/core/faiss", + "description": "", + "color": "ededed" + }, + { + "id": "LA_kwDOC6jpA88AAAABgwMFlQ", + "name": "area/agent/core/ngt", + "description": "", + "color": "ededed" + }, + { + "id": "LA_kwDOC6jpA88AAAABgwMFlg", + "name": "area/gateway/mirror", + "description": "", + "color": "ededed" + } + ], + "mergeCommit": { + "oid": "76eb8d7b596e611078a6b53351daf444ee401756" + }, + "number": 2525, + "title": "refactor index manager service add index service API to expose index informations" +}