17727 Commits

Author SHA1 Message Date
Wenjia Zhang
9a5533382d version: bump up to 3.5.15 v3.5.15 tests/v3.5.15 etcdctl/v3.5.15 etcdutl/v3.5.15 server/v3.5.15 client/v3.5.15 client/v2.305.15 client/pkg/v3.5.15 raft/v3.5.15 pkg/v3.5.15 api/v3.5.15 2024-07-19 20:13:00 +00:00
James Blair
d6479db0ef
Merge pull request #18289 from jmhbnz/backport-enforce-listen-metrics-tls-info
[3.5] Backport fix(server/embed) enforce non-empty client TLS if scheme is https/unixs
2024-07-16 15:10:55 +12:00
Benjamin Wang
e940b8e4cc
Merge pull request #18319 from ahrtr/3.5_log_20240714
[3.5] Differentiate the warning message for rejected client and peer connections
2024-07-14 11:02:33 +01:00
Benjamin Wang
12854ec00d Differentiate the warning message for rejected client and peer connections
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
2024-07-14 08:50:54 +01:00
Benjamin Wang
4548f41e11
Merge pull request #18312 from mohamedawnallah/backport-3.5-fmtgRPCMetadata
[3.5] client/v3/watch.go: use fmt go pkg for gRPC metadata map printing
2024-07-13 07:02:27 +01:00
Mohamed Awnallah
1bfca729f5
client/v3/watch_test.go: test fmt metadata print
Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
Co-authored-by: Benjamin Wang <ahrtr>
2024-07-12 14:50:59 +03:00
Mohamed Awnallah
b1fc94f88e
client/v3/watch.go: use fmt for metadata printing
Signed-off-by: Mohamed Awnallah <mohamedmohey2352@gmail.com>
2024-07-12 14:50:54 +03:00
James Blair
c6b0b55847
Backport: fix(server/embed): enforce non-empty client TLS if scheme is https/unixs
Backports a657f06, 22f20a8, 497f1a4 and 3e86af6 from #18186.

Also backports required test util elements of 4c77726 from #17661.

Signed-off-by: James Blair <mail@jamesblair.net>
2024-07-09 21:09:23 +12:00
James Blair
301b1246aa
Merge pull request #18288 from k8s-infra-cherrypick-robot/cherry-pick-18108-to-release-3.5
[3.5] Fix ts with no trailing zeros
2024-07-09 21:06:10 +12:00
Benjamin Wang
2b2473ce7c
Merge pull request #18284 from thedtripp/check-tools-mod-in-verify-deps
[3.5] make: Include tools/mod when checking dependency versions
2024-07-09 07:23:05 +01:00
Chao Chen
af009be983 fix ts with no trailing zeros
Signed-off-by: Chao Chen <chaochn@amazon.com>
2024-07-06 10:52:11 +00:00
James Blair
472de10204
Merge pull request #18286 from k8s-infra-cherrypick-robot/cherry-pick-18250-to-release-3.5
[release-3.5] Remove gsutil acl command for bucket permissions from release.sh
2024-07-06 22:35:48 +12:00
James Blair
9aaaafe8d9 Remove gsutil acl command for bucket permissions.
The bucket is already fully public so new releases don't need to run this command.

This will prevent significant terminal spam during the release process as there are thousands of objects in the bucket.

Signed-off-by: James Blair <mail@jamesblair.net>
2024-07-05 06:12:35 +00:00
D Tripp
35a9140d8d dependency: bump tools/mod google.golang.org/genproto
to v0.0.0-20230822172742-b8732ec3820d

bump tools/mod google.golang.org/genproto/googleapis/api

to v0.0.0-20230822172742-b8732ec3820d

Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:20:50 +00:00
D Tripp
64d8a63fde dependency: bump tools/mod github.com/spf13/cobra to v1.1.3
bump honnef.co/go/tools to v0.0.1-2019.2.3

bump gopkg.in/yaml.v2 to v2.4.0

Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:11:33 +00:00
D Tripp
4420b5501b dependency: bump tools/mod github.com/olekukonko/tablewriter to v0.0.5
Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:08:57 +00:00
D Tripp
a56281544c dependency: bump tools/mod github.com/mattn/go-runewidth
to v0.0.9.

Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:07:00 +00:00
D Tripp
cab6d1dcac dependency: bump tools/mod github.com/mattn/go-colorable
to v0.1.11

github.com/mattn/go-isatty v0.0.12 to v0.0.14

Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:03:50 +00:00
D Tripp
d15fbc6959 dependency: bump tools/mod github.com/grpc-ecosystem/grpc-gateway
to v1.16.0.

Use the same version across all the modules from the project.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-05 00:00:00 +00:00
D Tripp
5727c64b96 make: Include tools/mod when checking dependency versions
Backport of ba4b2bffeb

Related issue: https://github.com/etcd-io/etcd/issues/18180

As tools/mod is not part of the test library's modules, the check to verify
consistent dependency versions ignored it. Explicitly get the dependencies from
this module when running verify-dep.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-04 22:31:03 +00:00
Benjamin Wang
f2b966216c
Merge pull request #18265 from k8s-infra-cherrypick-robot/cherry-pick-18245-to-release-3.5
[3.5] Suppress noisy basic auth token deletion log
2024-07-03 10:16:12 +01:00
Benjamin Wang
9946156452
Merge pull request #18271 from thedtripp/3.5-go-2024-2963
[3.5] Bump Go version to 1.21.12: GO-2024-2963 fix
2024-07-03 07:30:26 +01:00
D Tripp
e2c6c4754a Bump Go version to 1.21.12: GO-2024-2963 fix
Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-07-03 05:17:11 +00:00
Ahmet Alp Balkan
0a960a272d Suppress noisy basic auth token deletion log
Right now the basic auth tokens that are deleted after `--auth-token-ttl`
cause info-level logs to be emitted. Change this to debug. This helps with
the issue at #18244 where calling `/readyz` frequently pollutes the etcd server
logs with this log message.

Fixes #18244.

Signed-off-by: Ahmet Alp Balkan <ahmet@linkedin.com>
2024-07-02 18:07:09 +00:00
Benjamin Wang
5b4c548a2c
Merge pull request #18254 from ivanvc/release-3.5-dont-swallow-govulncheck-exit-code
[3.5] github/govuln: don't swallow govulncheck errors
2024-06-30 07:50:55 +01:00
Benjamin Wang
7b9854790e
Merge pull request #18253 from YaoC/backport-16523-to-release-3.5
[3.5] backport deflake TestV3AuthWithLeaseRevokeWithRootJWT
2024-06-30 07:40:27 +01:00
Ivan Valdes
20f7988c1d
github/govuln: don't swallow govulncheck errors
By running `find -exec`, an error exit code doesn't properly return the
error if there's a failure in a command executed. Use `xargs` to force
an exit with error when a command fails to run.

Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-06-29 15:12:36 -07:00
Yao Cheng
2dc3a3c1ae tests/integration: deflake TestV3AuthWithLeaseRevokeWithRootJWT
Signed-off-by: Yao Cheng <chengyao09@hotmail.com>
2024-06-29 14:55:32 +00:00
James Blair
8fde09b634
Merge pull request #18229 from thedtripp/feature/installShellcheckBackport3.5
etcd 3.5: Install shellcheck if not exists.
2024-06-28 21:28:02 +12:00
D Tripp
31bce64a70 etcd 3.5: Install shellcheck if not installed.
Include conditional logic to install shellcheck with correct architecture.

This is based on commit 4f23883 and pull request #14872.

Signed-off-by: D Tripp <38776199+thedtripp@users.noreply.github.com>
2024-06-27 06:03:27 +00:00
Benjamin Wang
f7ab198fb6
Merge pull request #18160 from lhy1024/pick-cn
[3.5] Support multiple values for allowed client and peer TLS identities
2024-06-21 06:45:08 +01:00
Benjamin Wang
dcd7f29ec9
Merge pull request #18207 from henrybear327/ci/fix_dep_inconsistency
[3.5] Fix dependency inconsistency detection and add make verify-dep
2024-06-20 12:57:54 +01:00
Chun-Hung Tseng
49a0263016
dependency: dump golang.org/x/sys to the highest version v0.18.0
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-19 23:30:38 +02:00
Chun-Hung Tseng
9e4c045a08
dependency: bump github.com/modern-go/concurrent to the highest version v0.0.0-20180306012644-bacd9c7ef1dd
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-19 23:29:44 +02:00
Chun-Hung Tseng
5362dcec3d
dependency: bump github.com/google/go-cmp to the highest version v0.6.0
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-19 23:29:44 +02:00
Chun-Hung Tseng
fb3fe32ae9
Fix dependency inconsistency detection and add make verify-dep
Makefile's target `verify-dep` current behavior is to use `go list` to
check consistent dependency versions from direct dependencies. Ignoring
indirect dependencies in a multi-module project could lead to version
mismatches. If module A imports module B, module B's dependency will be
an indirect dependency in module A. Which can potentially have a version
mismatch. Therefore, use `go mod edit` with indirect dependencies, too.
So it can work with all dependencies defined in go.mod.

Fix displaying dependencies with mismatches, as the old code was
searching with grep just for the prefix, which would show other
dependencies that shared the same prefix.

Reference:
- https://github.com/etcd-io/etcd/pull/18205

Signed-off-by: Ivan Valdes <ivan@vald.es>
Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-19 23:25:23 +02:00
Benjamin Wang
5b25d6b5a5
Merge pull request #18174 from andyxning/automated-cherry-pick-of-#18164-origin-release-3.5
bugfix: register of walWriteSec
2024-06-15 06:23:34 +01:00
Benjamin Wang
6267a12500
Merge pull request #18170 from henrybear327/ci/fix_govulncheck_release_3.5
Fix govulncheck CI check on release-3.5
2024-06-14 21:29:24 +01:00
Chun-Hung Tseng
e72a7994b2
dependency: bump golang.org/x/sys from v0.0.0-20210403161142-5e06dd20ab57 to v0.0.0-20220412211240-33da011f77ad
Extracted log from govulncheck, suggesting that we should bump the
version of golang.org/x/sys

Vulnerability #1: GO-2022-0493
    Incorrect privilege reporting in syscall and golang.org/x/sys/unix
  More info: https://pkg.go.dev/vuln/GO-2022-0493
  Module: golang.org/x/sys
    Found in: golang.org/x/sys@v0.0.0-20210403161142-5e06dd20ab57
    Fixed in: golang.org/x/sys@v0.0.0-20220412211240-33da011f77ad

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-14 11:33:21 +02:00
Chun-Hung Tseng
26769754ad
dependency: bump golang.org/x/net from 0.17.0 to 0.23.0
Extracted log from govulncheck, suggesting that we should bump the
version of golang.org/x/net

=== Symbol Results ===

Vulnerability #1: GO-2024-2687
    HTTP/2 CONTINUATION flood in net/http
  More info: https://pkg.go.dev/vuln/GO-2024-2687
  Module: golang.org/x/net
    Found in: golang.org/x/net@v0.17.0
    Fixed in: golang.org/x/net@v0.23.0

Reference:
- https://github.com/etcd-io/etcd/pull/17708

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-14 11:33:21 +02:00
Chun-Hung Tseng
551bff4628
Fix govulncheck CI check on release-3.5
This commit fixed the Go Vulnerability Checker CI job, which isn't
scanning for all go.mod files within the project.

Reference:
- https://github.com/etcd-io/etcd/discussions/18168

Signed-off-by: Chun-Hung Tseng <henrybear327@gmail.com>
2024-06-14 11:33:20 +02:00
Andy Xie
b9ae5ef638 bugfix: register of walWriteSec
Signed-off-by: Andy Xie <andy.xning@gmail.com>
2024-06-14 09:37:21 +08:00
lhy1024
f8befd94f6 Support multiple values for allowed client and peer TLS identities(#18015)
Signed-off-by: lhy1024 <admin@liudos.us>
2024-06-13 14:32:24 +08:00
Benjamin Wang
fb66ea68da
Merge pull request #18138 from ahrtr/apply_log_20240606
[3.5] print error log when validation on conf change failed
2024-06-07 09:53:09 +01:00
Benjamin Wang
b00646cb6e print error log when validation on conf change failed
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
2024-06-06 19:28:59 +01:00
Benjamin Wang
102193b92c
Merge pull request #18129 from ArkaSaha30/release-3.5-cve-2024-24790
[3.5]Bump Go version to 1.21.11: CVE 2024-24790 fix
2024-06-05 10:37:31 +01:00
ArkaSaha30
a64ddefe00
Bump Go version to 1.21.11: CVE 2024-24790 fix
Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
2024-06-05 13:48:25 +05:30
Marek Siarkowicz
0362da29c6
Merge pull request #18105 from ivanvc/release-3.5-scripts-release-shallow-clone
[3.5] scripts/release: shallow clone repository
2024-06-01 07:20:50 +02:00
Ivan Valdes
dcbcb3afc5
scripts/release: shallow clone repository
Backport of commit 4881e53677f6cb592aa1cf7ee15bfd51e6cf1ff9 / pull
request #18095.

Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-05-31 15:36:00 -07:00
James Blair
58859eb2de
Merge pull request #18104 from jmhbnz/remove-asset-transparency
[3.5] Backport removal of asset transparency workflow
2024-05-31 21:37:49 +12:00