17700 Commits

Author SHA1 Message Date
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
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
James Blair
a3ba7e2c36
Backport removal of asset transparency workflow.
The service at https://beta.transparencylog.net/ has already been
shutdown on November 9th 2021 and the workflow has failed ever since.

Signed-off-by: James Blair <mail@jamesblair.net>
2024-05-31 20:25:22 +12:00
James Blair
bf51a53a7e
version: bump up to 3.5.14 v3.5.14 tests/v3.5.14 etcdctl/v3.5.14 etcdutl/v3.5.14 server/v3.5.14 client/v3.5.14 client/v2.305.14 client/pkg/v3.5.14 raft/v3.5.14 pkg/v3.5.14 api/v3.5.14 2024-05-30 06:33:09 +12:00
Benjamin Wang
47c5fb845f
Merge pull request #18063 from ArkaSaha30/backport-config-support
[3.5] config: support AllowedCN and AllowedHostname through config file
2024-05-23 19:48:47 +01:00
Seena Fallah
8bc3271af4
config: support AllowedCN and AllowedHostname through config file
Allow setting AllowedCN and AllowedHostname tls fields through config file for peer transport security.

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
2024-05-23 23:37:11 +05:30
Benjamin Wang
3afe949552
Merge pull request #18017 from MadhavJivrajani/go-version-setup-35
[release-3.5] Setup a way to consistently manage go versions across scripts and go.mods
2024-05-16 10:44:58 +01:00
Madhav Jivrajani
3c990bc43b scripts: default to using .go-version's version for tests and builds
Additionally, provide ability to opt-out of the .go-version and use a
custom one via env vars: FORCE_HOST_GO and GO_VERSION.

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>
2024-05-16 14:45:48 +05:30
Madhav Jivrajani
474031588a .*: sync go toolchain version and add ability to verify versions
This commit adds a script to sync the version present in .go-version
across all go.mod files as the toolchain directive. As part of that,
this commit also modifies go.mod files that did not have synced toolchain
directives.

Additionally, this also adds a script to verify all toolchain and go
directives against the version present in .go-version as follows:
(1) The go directive <= version in .go-version
(2) The toolchain directive == version in .go-version

This script runs as part of the `make verify` target, making it run
as a presbumit by default.

Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>
2024-05-16 14:45:42 +05:30
Benjamin Wang
297130d002
Merge pull request #17980 from lavishpal/upgrade/go-to-1.21.10
[3.5] dependency : update the go v1.21.10
2024-05-10 19:57:51 +01:00
Lavish pal
f715ffd773 update the go v1.21.10
Signed-off-by: Lavish pal <lvishpal408@gmail.com>
2024-05-10 18:25:42 +05:30
Marek Siarkowicz
8f6d2dc403
Merge pull request #17977 from ivanvc/release-3.5-backport-etcdutl-memory-allocation-issue
[3.5] backport etcdutl memory allocation issue
2024-05-10 10:50:23 +02:00
Ivan Valdes
9e1dadd748
etcdutl: Fix snapshot restore memory alloc issue
When running the snapshot command, allow receiving an initial memory map
allocation for the database, avoiding future memory allocation issues.

Backports commit: be2883321240340479f9e334bc4a3b2959ad7639 / PR: #17277

Co-authored-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-05-09 21:41:23 -04:00
Ivan Valdes
6abc349dc9
server: Implement WithMmapSize option for backend config
Accept a third argument for NewDefaultBackend for overrides to the
BackendConfig.
Add a new function, WithMmapSize, which modifies the backend config to
provide a custom InitiamMmapSize.

Backports commit: d69adf45f9e95661966204460f019b8164aaef12 / PR: #17277

Signed-off-by: Ivan Valdes <ivan@vald.es>
2024-05-09 21:41:16 -04:00
Marek Siarkowicz
0f0af63eaa
Merge pull request #17914 from tjungblu/backport_35_grpc_defragserv
[3.5] gRPC health server sets serving status to NOT_SERVING on defrag
2024-05-07 09:14:05 +02:00
Benjamin Wang
f2cbef2379
Merge pull request #17931 from siyuanfoundation/3.5-downgrade-test
[3.5] Backport cluster downgrade test.
2024-05-06 19:47:56 +01:00
Siyuan Zhang
99a64341f2 Add cluster downgrade test.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-05-06 10:31:18 -07:00
Benjamin Wang
a5cf8419bc
Merge pull request #17943 from tjungblu/bboltbump_1.3.10
Bump bbolt to 1.3.10 for 3.5
2024-05-06 11:53:27 +01:00
Thomas Jungblut
a5eec4d78d Bump bbolt to 1.3.10 for 3.5
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
2024-05-06 12:02:49 +02:00
Thomas Jungblut
cee181d1ab v3rpc: run health notifier to listen on online defrag state change
Backport from 3.6 in #16836

Co-authored-by: Chao Chen <chaochn@amazon.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
2024-05-06 10:03:08 +02:00
James Blair
2c7f6d6b08
Merge pull request #17920 from etcd-io/dependabot/docker/release-3.5/distroless/static-debian11-6d31326376a7834b106f281b04f67b5d015c31732f594930f2ea81365f99d60c
build(deps): bump distroless/static-debian11 from `046b92c` to `6d31326`
2024-05-03 05:34:03 +12:00
dependabot[bot]
22ca6151c6
build(deps): bump distroless/static-debian11 from 046b92c to 6d31326
Bumps distroless/static-debian11 from `046b92c` to `6d31326`.

---
updated-dependencies:
- dependency-name: distroless/static-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-05-01 17:26:02 +00:00
Thomas Jungblut
750bc0b1e4 gRPC health server sets serving status to NOT_SERVING on defrag
gRPC health server sets serving status to NOT_SERVING on defrag
Backport from 3.6 in #16278

Co-authored-by: Chao Chen <chaochn@amazon.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
2024-04-30 15:09:51 +02:00
Marek Siarkowicz
31a87cff37
Merge pull request #17888 from siyuanfoundation/3.5-downgrade-test
[3.5] add mix version test of adding last ver to current ver.
2024-04-30 09:10:09 +02:00
Siyuan Zhang
daec41c29e e2e: add mix version test of adding last ver to current ver.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2024-04-29 18:55:52 +00:00
Benjamin Wang
a7a8fb82c8
Merge pull request #17865 from fuweid/backport-17815-35
[3.5] fix revision loss issue caused by compaction - 17780
2024-04-24 09:50:15 +01:00
Wei Fu
0af22abc6c server/mvcc: should update currentRev in revMu
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 12:28:20 +08:00
Wei Fu
c06b17b9ff server/storage: update currentRev if scheduledCompact > currentRev
Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 9ea234913a99670d18b66aa23915781f89713177)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 12:25:19 +08:00
Wei Fu
7beff57107 tests/e2e: reproduce #17780
Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit 71733911544f8fce6d06d2a8e9cca0944b3659be)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-04-24 12:23:33 +08:00