Skip to content

WIP: Rebase v3.6.12#13

Open
redhat-chai-bot wants to merge 125 commits into
JSampsonIV:openshift-4.21from
redhat-chai-bot:rebase-v3.6.12
Open

WIP: Rebase v3.6.12#13
redhat-chai-bot wants to merge 125 commits into
JSampsonIV:openshift-4.21from
redhat-chai-bot:rebase-v3.6.12

Conversation

@redhat-chai-bot

Copy link
Copy Markdown

Changelog https://github.com/etcd-io/etcd/blob/master/CHANGELOG/CHANGELOG-3.6.md#v3612

/hold for ocp-build-data PR (builder stream update to Go 1.25)

serathius and others added 30 commits September 23, 2025 17:47
…st negative revision

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…ry-pick-20693-to-release-3.6

[release-3.6] Reject watch request with -1 revision to prevent invalid resync behavior on uncompacted etcd and make rangeEvents safe against negative revision.
When EOF is encountered during TLS handshake, it is still logged as a
warning. This seems excessive and not really useful.

This patch ensures EOF is logged on debug only.

Signed-off-by: Ondra Kupka <okupka@redhat.com>
…ry-pick-20568-to-release-3.6

[release-3.6] server/embed: Log EOF on DEBUG in TLS handshake
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: hwdef <hwdefcom@outlook.com>
Adds two test cases for the member promote operation when auth is
enabled. In the first case, the member promote request is submitted to
the leader, and in the second case it's submitted to the follower. The
leader case succeeds. In the other case, the follower forwards the
promote request to the leader. But, the forwarded request fails due to
a bug. The logs on the leader include this message:

```
failed to promote a member
```

as well as the error:

```
auth: user name is empty
```

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
When auth is enabled, sending a promotion request to a follower node was failing because
the auth token was not being propagated when the follower forwards the request to the leader.

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
Signed-off-by: xUser5000 <abdallahar1974@gmail.com>
…ry-pick-20792-to-release-3.6

[release-3.6] etcdserver: Fix: cannot promote member from follower when auth is enabled
…move learner issue

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…ry-pick-20894-to-release-3.6

[release-3.6] Fix the issue that `--force-new-cluster` can't clean up learner after creating v2 snapshot
Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>
…12410

[release-3.6] Bump from go1.24.9 to go1.24.10
…ry-pick-20887-to-release-3.6

[release-3.6] fix duplicate metrics collector registration attempted
Signed-off-by: Ivan Valdes <iv@a.ki>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Print token fingerprint instead of the original tokens in log messages
Signed-off-by: hwdef <hwdefcom@outlook.com>
Addresses CVE-2025-47914, CVE-2025-58181.

Signed-off-by: Ivan Valdes <ivan@vald.es>
[release-3.6] dependency: Bump golang.org/x/crypto from 0.36.0 to 0.45.0
Signed-off-by: joshjms <joshjms1607@gmail.com>
Running genproto fails with:

% (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
stderr: /home/prow/go/pkg/mod/golang.org/x/tools@v0.38.0/cmd/goimports/goimports.go:23:2: missing go.sum entry for module providing package golang.org/x/telemetry/counter (imported by golang.org/x/tools/cmd/goimports); to add:
stderr: go get golang.org/x/tools/cmd/goimports@v0.38.0
FAIL: (code:1):
  % (cd tools/mod && 'go' 'install' 'golang.org/x/tools/cmd/goimports')
Failed to install tool 'golang.org/x/tools/cmd/goimports'

Signed-off-by: Ivan Valdes <ivan@vald.es>
ahrtr and others added 27 commits April 8, 2026 21:06
…r is down

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…g member is down

Assume the new member is unavailable and check whether quorum is still preserved.

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Bump golang.org/x/image to v0.39.0 to resolve GO-2026-4962
[release-3.6] Fix the issue that cannot add a new member when one member is down, even if quorum is still satisfied
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Refactor auth check for Put requests in TXN
…rbac check issue

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…XN bypass RBAC check

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
…ck issue

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.6] Fix read access via PrevKv or lease attachment in a Put request in etcd transactions bypass RBAC authorization checks
Signed-off-by: Ivan Valdes <iv@a.ki>
Signed-off-by: shenmu.wy <shenmu.wy@antfin.com>
Signed-off-by: shenmu.wy <shenmu.wy@antfin.com>
…mberupdate-learner

[release-3.6] bugfix: MemberUpdate implicitly and unexpectedly promotes a learner
… of panic when given non-existent paths

Signed-off-by: shenmu.wy <shenmu.wy@antfin.com>
…nvalid-datadir

[release-3.6] etcdutl: validate data file path instead of panic
- replace user.Current().Name == "root" with os.Getuid() == 0.
- drop os/user import and user.Current() error path.
- backport of etcd-io#21788
- address: etcd-io#21787

Signed-off-by: vivekpatani <9080894+vivekpatani@users.noreply.github.com>
…elease-3.6

[release-3.6] client/pkg/fileutil: use os.Getuid() to skip TestIsDirWriteable as root
Signed-off-by: kunal.behbudzade <kunal.behbudzade@btsgrp.com>
Signed-off-by: Ian Chechin <ian00chechin@gmail.com>
[release-3.6] server: allow non-admin maintenance status
Signed-off-by: Ivan Valdes <iv@a.ki>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.