Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport PR main changes to release/v1.7 #2740

Merged
merged 2 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,16 @@
"code",
"research"
]
},
{
"login": "highpon",
"name": "s-shiraki",
"avatar_url": "https://avatars.githubusercontent.com/u/54130718?v=4",
"profile": "https://www.highpon.com/",
"contributions": [
"test",
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@

# https://github.com/github/linguist/blob/master/docs/overrides.md
.all-contributorsrc linguist-language=JSON
*.Dockerfile text eol=lf
22 changes: 18 additions & 4 deletions .gitfiles
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
.github/workflows/dockers-ci-container-image.yaml
.github/workflows/dockers-dev-container-image.yaml
.github/workflows/dockers-discoverer-k8s-image.yaml
.github/workflows/dockers-example-client-image.yaml
.github/workflows/dockers-gateway-filter-image.yaml
.github/workflows/dockers-gateway-lb-image.yaml
.github/workflows/dockers-gateway-mirror-image.yaml
Expand All @@ -97,6 +98,7 @@
.github/workflows/dockers-index-correction-image.yaml
.github/workflows/dockers-index-creation-image.yaml
.github/workflows/dockers-index-deletion-image.yaml
.github/workflows/dockers-index-deletion.yaml
.github/workflows/dockers-index-operator-image.yaml
.github/workflows/dockers-index-save-image.yaml
.github/workflows/dockers-loadtest-image.yaml
Expand All @@ -123,7 +125,7 @@
.github/workflows/semver-patch.yaml
.github/workflows/test-hack.yaml
.github/workflows/unit-test.yaml
.github/workflows/update-actions.yaml
.github/workflows/update-deps.yaml
.github/workflows/update-protobuf.yaml
.github/workflows/update-pull-request-and-issue-template.yaml
.github/workflows/update-web-docs.yaml
Expand Down Expand Up @@ -199,8 +201,6 @@ apis/grpc/v1/vald/update_vtproto.pb.go
apis/grpc/v1/vald/upsert.pb.go
apis/grpc/v1/vald/upsert_vtproto.pb.go
apis/grpc/v1/vald/vald.go
apis/proto/buf.lock
apis/proto/buf.yaml
apis/proto/v1/agent/core/agent.proto
apis/proto/v1/agent/sidecar/sidecar.proto
apis/proto/v1/discoverer/discoverer.proto
Expand Down Expand Up @@ -304,7 +304,8 @@ assets/test/templates/option/function.tmpl
assets/test/templates/option/header.tmpl
assets/test/templates/option/results.tmpl
buf.gen.yaml
buf.work.yaml
buf.lock
buf.yaml
charts/vald-benchmark-operator/Chart.yaml
charts/vald-benchmark-operator/README.md
charts/vald-benchmark-operator/README.md.gotmpl
Expand Down Expand Up @@ -490,6 +491,8 @@ cmd/index/job/correction/sample.yaml
cmd/index/job/creation/main.go
cmd/index/job/creation/main_test.go
cmd/index/job/creation/sample.yaml
cmd/index/job/deletion/main.go
cmd/index/job/deletion/sample.yaml
cmd/index/job/readreplica/rotate/main.go
cmd/index/job/readreplica/rotate/main_test.go
cmd/index/job/readreplica/rotate/sample.yaml
Expand Down Expand Up @@ -537,13 +540,15 @@ dockers/dev/Dockerfile
dockers/dev/README.md
dockers/discoverer/k8s/Dockerfile
dockers/discoverer/k8s/README.md
dockers/example/client/Dockerfile
dockers/gateway/filter/Dockerfile
dockers/gateway/filter/README.md
dockers/gateway/lb/Dockerfile
dockers/gateway/lb/README.md
dockers/gateway/mirror/Dockerfile
dockers/index/job/correction/Dockerfile
dockers/index/job/creation/Dockerfile
dockers/index/job/deletion/Dockerfile
dockers/index/job/readreplica/rotate/Dockerfile
dockers/index/job/save/Dockerfile
dockers/index/operator/Dockerfile
Expand Down Expand Up @@ -838,6 +843,7 @@ internal/config/grpc_test.go
internal/config/index.go
internal/config/index_creation.go
internal/config/index_creation_test.go
internal/config/index_deleter.go
internal/config/index_operator.go
internal/config/index_operator_test.go
internal/config/index_save.go
Expand Down Expand Up @@ -1245,6 +1251,8 @@ internal/net/net.go
internal/net/net_test.go
internal/net/option.go
internal/net/option_test.go
internal/net/quic/conn.go
internal/net/quic/listener.go
internal/observability/attribute/attribute.go
internal/observability/attribute/attribute_test.go
internal/observability/exporter/exporter.go
Expand Down Expand Up @@ -1455,6 +1463,8 @@ k8s/index/job/correction/configmap.yaml
k8s/index/job/correction/cronjob.yaml
k8s/index/job/creation/configmap.yaml
k8s/index/job/creation/cronjob.yaml
k8s/index/job/deletion/configmap.yaml
k8s/index/job/deletion/cronjob.yaml
k8s/index/job/save/configmap.yaml
k8s/index/job/save/cronjob.yaml
k8s/index/operator/configmap.yaml
Expand Down Expand Up @@ -1789,6 +1799,10 @@ pkg/index/job/creation/service/options.go
pkg/index/job/creation/service/options_test.go
pkg/index/job/creation/usecase/creation.go
pkg/index/job/creation/usecase/creation_test.go
pkg/index/job/deletion/config/config.go
pkg/index/job/deletion/service/deleter.go
pkg/index/job/deletion/service/options.go
pkg/index/job/deletion/usecase/deletion.go
pkg/index/job/readreplica/rotate/config/config.go
pkg/index/job/readreplica/rotate/config/config_test.go
pkg/index/job/readreplica/rotate/service/options.go
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ assignees: ""

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

- Vald Version: v1.7.13
- Go Version: v1.23.2
- Rust Version: v1.81.0
- Vald Version: v1.7.14
- Go Version: v1.23.3
- Rust Version: v1.82.0
- Docker Version: v27.3.1
- Kubernetes Version: v1.31.1
- Kubernetes Version: v1.31.2
- Helm Version: v3.16.2
- NGT Version: v2.2.4
- NGT Version: v2.3.4
- Faiss Version: v1.9.0
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/security_issue_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ assignees: ""

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

- Vald Version: v1.7.13
- Go Version: v1.23.2
- Rust Version: v1.81.0
- Vald Version: v1.7.14
- Go Version: v1.23.3
- Rust Version: v1.82.0
- Docker Version: v27.3.1
- Kubernetes Version: v1.31.1
- Kubernetes Version: v1.31.2
- Helm Version: v3.16.2
- NGT Version: v2.2.4
- NGT Version: v2.3.4
- Faiss Version: v1.9.0
10 changes: 5 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
### Versions

<!--- Please change the versions below along with your environment -->
- Vald Version: v1.7.13
- Go Version: v1.23.2
- Rust Version: v1.81.0
- Vald Version: v1.7.14
- Go Version: v1.23.3
- Rust Version: v1.82.0
- Docker Version: v27.3.1
- Kubernetes Version: v1.31.1
- Kubernetes Version: v1.31.2
- Helm Version: v3.16.2
- NGT Version: v2.2.4
- NGT Version: v2.3.4
- Faiss Version: v1.9.0

### Checklist
Expand Down
Empty file modified .github/workflows/dockers-agent-faiss-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-agent-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-agent-ngt-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-agent-sidecar-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-benchmark-job-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-binfmt-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-buildbase-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-buildkit-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-buildkit-syft-scanner-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-ci-container-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-dev-container-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-discoverer-k8s-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-gateway-filter-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-gateway-lb-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-helm-operator-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-index-correction-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-index-creation-image.yaml
100755 → 100644
Empty file.
98 changes: 49 additions & 49 deletions .github/workflows/dockers-index-deletion-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,63 +15,63 @@
#

# DO_NOT_EDIT this workflow file is generated by https://github.com/vdaas/vald/blob/main/hack/actions/gen/main.go
name: 'Build docker image: index-deletion'

name: "Build docker image: index-deletion"
on:
push:
branches:
- main
- release/v*.*
- '!release/v*.*.*'
- main
- release/v*.*
- "!release/v*.*.*"
tags:
- '*.*.*'
- v*.*.*
- '*.*.*-*'
- v*.*.*-*
- "*.*.*"
- v*.*.*
- "*.*.*-*"
- v*.*.*-*
pull_request:
paths:
- hack/docker/gen/main.go
- dockers/index/job/deletion/Dockerfile
- hack/actions/gen/main.go
- .github/workflows/dockers-index-deletion-image.yaml
- .github/actions/docker-build/action.yaml
- .github/workflows/_docker-image.yaml
- cmd/index/job/deletion/**
- pkg/index/job/deletion/**
- apis/grpc/**
- apis/proto/**
- go.mod
- go.sum
- versions/GO_VERSION
- internal/**
- '!internal/**/*_test.go'
- '!internal/**/*_mock.go'
- '!internal/db/**'
- '!internal/k8s/**'
- Makefile
- Makefile.d/**
- hack/docker/gen/main.go
- dockers/index/job/deletion/Dockerfile
- hack/actions/gen/main.go
- .github/workflows/dockers-index-deletion-image.yaml
- .github/actions/docker-build/action.yaml
- .github/workflows/_docker-image.yaml
- cmd/index/job/deletion/**
- pkg/index/job/deletion/**
- apis/grpc/**
- apis/proto/**
- go.mod
- go.sum
- versions/GO_VERSION
- internal/**
- "!internal/**/*_test.go"
- "!internal/**/*_mock.go"
- "!internal/db/**"
- "!internal/k8s/**"
- Makefile
- Makefile.d/**
pull_request_target:
paths:
- hack/docker/gen/main.go
- dockers/index/job/deletion/Dockerfile
- hack/actions/gen/main.go
- .github/workflows/dockers-index-deletion-image.yaml
- .github/actions/docker-build/action.yaml
- .github/workflows/_docker-image.yaml
- cmd/index/job/deletion/**
- pkg/index/job/deletion/**
- apis/grpc/**
- apis/proto/**
- go.mod
- go.sum
- versions/GO_VERSION
- internal/**
- '!internal/**/*_test.go'
- '!internal/**/*_mock.go'
- '!internal/db/**'
- '!internal/k8s/**'
- Makefile
- Makefile.d/**
- hack/docker/gen/main.go
- dockers/index/job/deletion/Dockerfile
- hack/actions/gen/main.go
- .github/workflows/dockers-index-deletion-image.yaml
- .github/actions/docker-build/action.yaml
- .github/workflows/_docker-image.yaml
- cmd/index/job/deletion/**
- pkg/index/job/deletion/**
- apis/grpc/**
- apis/proto/**
- go.mod
- go.sum
- versions/GO_VERSION
- internal/**
- "!internal/**/*_test.go"
- "!internal/**/*_mock.go"
- "!internal/db/**"
- "!internal/k8s/**"
- Makefile
- Makefile.d/**
jobs:
build:
uses: ./.github/workflows/_docker-image.yaml
Expand Down
Empty file modified .github/workflows/dockers-index-operator-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-index-save-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-loadtest-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-manager-index-image.yaml
100755 → 100644
Empty file.
Empty file modified .github/workflows/dockers-readreplica-rotate-image.yaml
100755 → 100644
Empty file.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ MIRROR_GATEWAY_IMAGE = $(NAME)-mirror-gateway
READREPLICA_ROTATE_IMAGE = $(NAME)-readreplica-rotate
MAINTAINER = "$(ORG).org $(NAME) team <$(NAME)@$(ORG).org>"

DEADLINK_CHECK_PATH ?= ""
DEADLINK_IGNORE_PATH ?= ""
DEADLINK_CHECK_FORMAT = html

DEFAULT_BUILDKIT_SYFT_SCANNER_IMAGE = $(GHCRORG)/$(BUILDKIT_SYFT_SCANNER_IMAGE):nightly

VERSION ?= $(eval VERSION := $(shell cat versions/VALD_VERSION))$(VERSION)
Expand Down Expand Up @@ -471,6 +475,11 @@ dockerfile:
workflow:
$(call gen-workflow,$(ROOTDIR),$(MAINTAINER))

.PHONY: deadlink-checker
## generate deadlink-checker
deadlink-checker:
$(call gen-deadlink-checker,$(ROOTDIR),$(MAINTAINER),$(DEADLINK_CHECK_PATH),$(DEADLINK_IGNORE_PATH),$(DEADLINK_CHECK_FORMAT))

.PHONY: init
## initialize development environment
init: \
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ make init

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

Expand Down Expand Up @@ -300,6 +300,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://hrichik.xyz"><img src="https://avatars.githubusercontent.com/u/57860916?v=4?s=100" width="100px;" alt="Hrichik Mazumder"/><br /><sub><b>Hrichik Mazumder</b></sub></a><br /><a href="https://github.com/vdaas/vald/commits?author=hrichiksite" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/smorihira"><img src="https://avatars.githubusercontent.com/u/105629359?v=4?s=100" width="100px;" alt="Shunya Morihira (森平 隼矢)"/><br /><sub><b>Shunya Morihira (森平 隼矢)</b></sub></a><br /><a href="#tool-smorihira" title="Tools">🔧</a> <a href="https://github.com/vdaas/vald/commits?author=smorihira" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/iammytoo"><img src="https://avatars.githubusercontent.com/u/64457274?v=4?s=100" width="100px;" alt="miyamoto"/><br /><sub><b>miyamoto</b></sub></a><br /><a href="https://github.com/vdaas/vald/commits?author=iammytoo" title="Code">💻</a> <a href="#research-iammytoo" title="Research">🔬</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.highpon.com/"><img src="https://avatars.githubusercontent.com/u/54130718?v=4?s=100" width="100px;" alt="s-shiraki"/><br /><sub><b>s-shiraki</b></sub></a><br /><a href="https://github.com/vdaas/vald/commits?author=highpon" title="Tests">⚠️</a> <a href="https://github.com/vdaas/vald/commits?author=highpon" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
Loading
Loading