Benjamin Wang
880004c55c
Merge pull request #17123 from ZhouJianMS/member-place-3.5
...
[3.5] member replace e2e test
2024-01-11 08:34:02 +00:00
Benjamin Wang
fe32cf9e7e
Merge pull request #17205 from jmhbnz/backport-reproducible-image-builds
...
[3.5] Backport adding digest for etcd base image
2024-01-09 09:58:38 +00:00
Marek Siarkowicz
5777a37277
Merge pull request #17206 from serathius/dont-flock-3.5
...
[release-3.5] Don't flock snapshot files
2024-01-08 16:12:31 +01:00
Marek Siarkowicz
f3a27b3745
Don't flock snapshot files
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2024-01-08 15:06:12 +01:00
James Blair
5f571ba2df
Backport adding digest for etcd base image.
...
To ensure etcd official image builds can be reproduced.
Signed-off-by: James Blair <mail@jamesblair.net>
2024-01-08 14:55:42 +13:00
Benjamin Wang
8d88e437d1
Merge pull request #17201 from ishan16696/backport-PR16465
...
[3.5]Add a unit tests and missing flags in etcd help.
2024-01-05 10:52:47 +00:00
Ishan Tyagi
0ac8e50a1a
Add a unit tests and missing flags in etcd help.
...
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
2024-01-05 14:46:42 +05:30
Benjamin Wang
af1fb6f31f
Merge pull request #17177 from amit-rastogi/release-3.5
...
Backport testutils.ExecuteUntil to 3.5 branch
2024-01-03 13:53:44 +00:00
Marek Siarkowicz
d0ebcb56b1
Merge pull request #17190 from ishan16696/add/missing-flag
...
[3.5] Add missing `experimental-enable-lease-checkpoint-persist` flag in etcd help
2024-01-03 11:40:45 +01:00
Ishan Tyagi
f87048a92b
Add missing flag in etcd help.
...
Signed-off-by: ishan16696 <ishan.tyagi@sap.com>
2024-01-02 18:08:20 +05:30
Amit Rastogi
b075426e54
Backport testutils.ExecuteUntil to 3.5 branch
...
Signed-off-by: Amit Rastogi <amitrastogi2206@gmail.com>
2024-01-01 16:48:59 +05:30
ZhouJianMS
bd587c08bb
member replace e2e test
...
Signed-off-by: ZhouJianMS <zhoujian@microsoft.com>
2023-12-29 09:46:58 +08:00
Marek Siarkowicz
ae3b43a924
Merge pull request #17151 from serathius/fix-bootstrap
...
[release-3.5] Fix etcd bootstrap: Etcd not validating database consistent index, closing database and panicking on nil backend.
2023-12-20 16:33:24 +01:00
Marek Siarkowicz
d6d263ac8d
Check if be is nil to avoid panic when be is overriden with nil by recoverSnapshotBackend on line 517
...
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-12-20 11:41:54 +01:00
Marek Siarkowicz
a2e9dc8cc0
Don't redeclare err and snapshot variable, fixing validation of consistent index and closing database on defer
...
`err` variable shared throughout the NewServer function and used on line
396 to defer decision whether backend should be closed when starting
the server failed.
`snapshot` variable is first defined 407, redeclared locally on line 496 and later
again used on line 625. Creation of local variable is a bug introduced
in https://github.com/etcd-io/etcd/pull/11888 .
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
2023-12-20 11:31:47 +01:00
Marek Siarkowicz
39330e33d6
Merge pull request #17083 from siyuanfoundation/livez-bp-step3
...
[3.5] Backport e2e tests for livez/readyz.
2023-12-12 11:14:05 +01:00
Siyuan Zhang
cb65c1f032
test: enable gofail in release e2e test.
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-12-11 09:15:56 -08:00
Siyuan Zhang
b8d5e79fc1
[3.5] backport health check e2e tests.
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-12-07 09:51:39 -08:00
Marek Siarkowicz
fa0eb078fa
Merge pull request #17075 from siyuanfoundation/3.5-e2e-fw
...
[3.5] tests: Backport Extract e2e cluster setup to separate package
2023-12-07 13:03:36 +01:00
Marek Siarkowicz
3b252db4f6
version: bump up to 3.5.11
2023-12-07 11:29:12 +01:00
Marek Siarkowicz
6f125ce33b
Merge pull request #17039 from siyuanfoundation/release-3.5-step2
...
[3.5] Backport livez/readyz
2023-12-07 09:53:18 +01:00
Benjamin Wang
33cf21c9b7
Merge pull request #17077 from jonasrdl/release-3.5-update-to-go-1.20.12
...
[3.5] Update go version to 1.20.12
2023-12-06 19:38:15 +00:00
Siyuan Zhang
ebb7e796c3
etcdserver: add linearizable_read check to readyz.
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-12-06 11:12:14 -08:00
Jonas Riedel
13bafdffb8
etcd: Update go version to 1.20.12
...
Signed-off-by: Jonas Riedel <jonasriedel@pm.me>
2023-12-06 20:02:25 +01:00
Marek Siarkowicz
795dcedd1d
tests: Extract e2e cluster setup to separate package
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-12-06 09:13:36 -08:00
Benjamin Wang
7df2e908a1
Merge pull request #17070 from ivanvc/release-3.5-backport-ssrf
...
Backport disable redirects in peer communication to release-3.5
2023-12-06 09:09:07 +00:00
Ivan Valdes
98aa466905
server: disable redirects in peer communication
...
Disable following redirects from peer HTTP communication on the client's side.
Etcd server may run into SSRF (Server-side request forgery) when adding a new
member. If users provide a malicious peer URL, the existing etcd members may be
redirected to another unexpected internal URL when getting the new member's
version.
Signed-off-by: Ivan Valdes <ivan@vald.es>
2023-12-05 10:59:25 -08:00
Marek Siarkowicz
ce4ae2beb6
Merge pull request #17024 from jmhbnz/backport-ssrf-fix
...
[3.5] Backport disable following redirects when checking peer urls
2023-11-28 21:22:32 +01:00
Siyuan Zhang
293fc21cd8
etcdserver: add metric counters for livez/readyz health checks.
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 12:52:15 -08:00
Siyuan Zhang
f5d7f997d6
etcdserver: add livez and ready http endpoints for etcd.
...
Add two separate probes, one for liveness and one for readiness. The liveness probe would check that the local individual node is up and running, or else restart the node, while the readiness probe would check that the cluster is ready to serve traffic. This would make etcd health-check fully Kubernetes API complient.
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 12:52:15 -08:00
Chao Chen
2b54660a04
http health check bug fixes
...
Signed-off-by: Chao Chen <chaochn@amazon.com>
2023-11-27 12:52:15 -08:00
Marek Siarkowicz
d4e86108e3
Merge pull request #17000 from siyuanfoundation/livez-bp-3.5-step1
...
[3.5] Backport healthcheck code cleanup
2023-11-27 19:59:40 +01:00
Marek Siarkowicz
46e394242f
server: Split metrics and health code
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
8ab1c0f25b
server: Cover V3 health with tests
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
9db8ddbb8c
server: Refactor health checks
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
eed94f6f94
server: Run health check tests in subtests
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
2f6c84e91d
server: Rename test case expect fields
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
Marek Siarkowicz
c6784a7e82
server: Use named struct initialization in healthcheck test
...
Signed-off-by: Siyuan Zhang <sizhang@google.com>
2023-11-27 09:31:00 -08:00
James Blair
9e21048c4b
Backport server: Don't follow redirects when checking peer urls.
...
It's possible that etcd server may run into SSRF situation when adding a new member. If users provide a malicious peer URL, the existing etcd members may be redirected to other unexpected internal URL when getting the new member's version.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-27 21:48:50 +13:00
Marek Siarkowicz
0e64a6d40e
Merge pull request #16951 from jmhbnz/fix-distributed-tracing
...
[3.5] Backport add sampling rate to fix distributed tracing
2023-11-26 15:02:13 +01:00
James Blair
f952197890
Backport embed: Add tracing integration test.
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:30:49 +13:00
James Blair
5a564d56d7
Backport server: Have tracingExporter own resources it initialises.
...
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:22:10 +13:00
James Blair
3a54851f48
Backport server: Add sampling rate to distributed tracing.
...
ExperimentalDistributedTracingSamplingRatePerMillion is the
number of samples to collect per million spans.
Defaults to 0.
Signed-off-by: James Blair <mail@jamesblair.net>
2023-11-26 10:22:10 +13:00
Benjamin Wang
0b46d431ec
Merge pull request #16921 from ivanvc/enable-arm64-builds-for-every-push-and-pr-in-release-3.5
...
github workflow: run arm64 tests on every push
2023-11-20 17:00:32 +00:00
Benjamin Wang
a733d92c5e
Merge pull request #16946 from sharathsivakumar/release-3.5
...
[3.5] CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.open…
2023-11-16 07:38:57 +00:00
sharath sivakumar
7f7b91508d
upgrade github.com/stretchr/testify,google.golang.org/genproto/googleapis/api,google.golang.org/grpc to make it consistent
...
Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
2023-11-15 17:10:40 +01:00
sharath sivakumar
f26074ae56
CVE-2023-47108: Backport go.opentelemetry.io/otel@v1.20.0 and go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.46.0
...
Signed-off-by: sharath sivakumar <sharath.sivakumar@mollie.com>
2023-11-15 14:09:07 +01:00
Ivan Valdes
f9f38bc97a
github workflow: run arm64 tests on every push
...
Use a template to consolidate arm64 and amd64 test workflows. Enable
running armd64 tests on every push and pull request.
Signed-off-by: Ivan Valdes <ivan@vald.es>
2023-11-13 16:56:29 -08:00
Benjamin Wang
a0cb92e8b9
Merge pull request #16915 from arjunmalhotra1/release-3.5
...
[3.5] etcd: upgrade go version from 1.20.10 to 1.20.11
2023-11-13 09:31:49 +00:00
arjunmalhotra1
e1aa1b97af
etcd: upgrade go version from 1.20.10 to 1.20.11
...
To keep etcd projects up to date with the latest patch releases &
incorporate the latest security updates.
Signed-off-by: arjunmalhotra1 <am2cj@virginia.edu>
2023-11-12 17:45:27 -06:00
