Skip to content

Rebase v3.6.12#385

Open
redhat-chai-bot wants to merge 124 commits into
openshift:openshift-5.0from
redhat-chai-bot:06091453-bot-changes
Open

Rebase v3.6.12#385
redhat-chai-bot wants to merge 124 commits into
openshift:openshift-5.0from
redhat-chai-bot:06091453-bot-changes

Conversation

@redhat-chai-bot

Copy link
Copy Markdown

Rebase openshift-5.0 onto upstream etcd v3.6.12.

Changes

  • Rebased 315 upstream commits from v3.6.4 to v3.6.12
  • Merged openshift-5.0 carry patches on top
  • Resolved go.mod conflict: took upstream cobra v1.10.2, testify v1.11.1, kept pflag v1.0.10 as direct
  • Ran go mod tidy

CHANGELOG

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

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 22 commits April 27, 2026 20:26
[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>
@coderabbitai

coderabbitai Bot commented Jun 9, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: bc6f7afb-7d83-4da1-ae61-2800d396951a

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@dusk125

dusk125 commented Jun 9, 2026

Copy link
Copy Markdown

/hold

@openshift-ci openshift-ci Bot requested review from deads2k and dusk125 June 9, 2026 14:58
@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 9, 2026
@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: redhat-chai-bot
Once this PR has been reviewed and has the lgtm label, please assign dusk125 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 9, 2026
@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown

Hi @redhat-chai-bot. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.