OCPBUGS-82497: Bump to etcd v3.6.12 in openshift 4.22 by JSampsonIV · Pull Request #387 · openshift/etcd

JSampsonIV · 2026-06-15T13:44:55Z

Rebase process handled by chai-bot using script created by JSampsonIV

…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>

[release-3.6] Bump go to 1.24.9

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>

…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

Signed-off-by: mingl1 <minglin.me@gmail.com>

…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>

[release-3.6] Bump go to 1.24.11

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>

Addresses CVE-2025-47914, CVE-2025-58181. Signed-off-by: Ivan Valdes <ivan@vald.es>

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>

…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>

WIP: Rebase v3.6.12

coderabbitai · 2026-06-15T13:45:05Z

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: c08b1fa0-c972-463d-80b9-4e53514e79e3

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.}

openshift-ci · 2026-06-15T13:45:20Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: JSampsonIV
Once this PR has been reviewed and has the lgtm label, please assign deads2k 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:

OWNERS

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

JSampsonIV · 2026-06-16T14:34:45Z

/retest

openshift-ci · 2026-06-16T14:52:10Z

@JSampsonIV: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/upstream-integration	`6631009`	link	false	`/test upstream-integration`
ci/prow/upstream-e2e	`6631009`	link	false	`/test upstream-e2e`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

dusk125 · 2026-06-16T17:18:40Z

BTW @JSampsonIV , you don't need to worry about upstream-e2e or upstream-integration... they're very very flakey

JSampsonIV · 2026-06-16T19:18:06Z

/jira refresh

openshift-ci-robot · 2026-06-16T19:18:09Z

@JSampsonIV: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-06-16T19:18:51Z

@JSampsonIV: This pull request references Jira Issue OCPBUGS-82497, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-85258 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-85258 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

Requesting review from QA contact:
/cc @sandeepknd

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Rebase process handled by chai-bot using script created by JSampsonIV

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 openshift-eng/jira-lifecycle-plugin repository.

dusk125 · 2026-06-17T14:30:59Z

/hold to go directly from chai bot's fork to openshift target branch

serathius and others added 30 commits September 23, 2025 17:47

Reject watch request with -1 revision and make rangeEvents safe again…

3bb4470

…st negative revision Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>

Merge pull request etcd-io#20707 from k8s-infra-cherrypick-robot/cher…

4790130

…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.

server/embed: Log EOF on DEBUG in TLS handshake

ee85ed3

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>

Merge pull request etcd-io#20749 from k8s-infra-cherrypick-robot/cher…

3bbdd68

…ry-pick-20568-to-release-3.6 [release-3.6] server/embed: Log EOF on DEBUG in TLS handshake

Fix endpoint status not retuning the correct storage quota

4973fd4

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

Merge pull request etcd-io#20790 from ahrtr/20251012_quota_3.6

4dfe6c1

Bump go to 1.24.9

1e02301

Signed-off-by: hwdef <hwdefcom@outlook.com>

Merge pull request etcd-io#20801 from hwdef/release-36-bump-go1249

9d7222c

[release-3.6] Bump go to 1.24.9

etcdserver: follow convention to extract auth token in cluster_util.go

76ee0bc

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>

tests: use WaitLeader() in memberPromoteWithAuth()

db6be4c

Signed-off-by: xUser5000 <abdallahar1974@gmail.com>

Merge pull request etcd-io#20874 from k8s-infra-cherrypick-robot/cher…

52b2948

…ry-pick-20792-to-release-3.6 [release-3.6] etcdserver: Fix: cannot promote member from follower when auth is enabled

Add an e2e test cases to reproduce the '--force-new-cluster' can't re…

7d3fc02

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

Fix the '--force-new-cluster' can't clean up learners issue

523100b

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

Merge pull request etcd-io#20896 from k8s-infra-cherrypick-robot/cher…

d1a3bee

…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

Bump from go1.24.9 to go1.24.10

2c0db32

Signed-off-by: ronaldngounou <ronald.ngounou@yahoo.com>

Merge pull request etcd-io#20901 from ronaldngounou/release36-bump-go…

88b9794

…12410 [release-3.6] Bump from go1.24.9 to go1.24.10

v3rpc: add and use getServerMetrics() with global metricsServerCached

145d927

Signed-off-by: mingl1 <minglin.me@gmail.com>

Merge pull request etcd-io#20905 from k8s-infra-cherrypick-robot/cher…

0745315

…ry-pick-20887-to-release-3.6 [release-3.6] fix duplicate metrics collector registration attempted

version: bump up to 3.6.6

d2809cf

Signed-off-by: Ivan Valdes <iv@a.ki>

Print token fingerprint instead of the original tokens in log messages

554dc70

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

Merge pull request etcd-io#20941 from ahrtr/20251117_tokens_3.6

f185ce6

[release-3.6] Print token fingerprint instead of the original tokens in log messages

Bump go to 1.24.11

97141e1

Signed-off-by: hwdef <hwdefcom@outlook.com>

Merge pull request etcd-io#20998 from hwdef/release36-bump-go-12411

dbaf5cf

[release-3.6] Bump go to 1.24.11

dependency: Bump golang.org/x/net from 0.38.0 to 0.45.0

61af088

Addresses CVE-2025-47914, CVE-2025-58181. Signed-off-by: Ivan Valdes <ivan@vald.es>

Merge pull request etcd-io#21024 from ivanvc/release-3.6-x-net-0.45.0

6bfd01c

[release-3.6] dependency: Bump golang.org/x/crypto from 0.36.0 to 0.45.0

version: bump up to 3.6.7

e838ef1

Signed-off-by: joshjms <joshjms1607@gmail.com>

dependency: Bump golang.org/x/crypto from 0.42.0 to 0.45.0

f767aa2

Addresses CVE-2025-47914, CVE-2025-58181. Signed-off-by: Ivan Valdes <ivan@vald.es>

fuweid and others added 9 commits May 20, 2026 16:25

Merge pull request etcd-io#21768 from silentred/release-3.6-etcdutl-i…

aaf38f8

…nvalid-datadir [release-3.6] etcdutl: validate data file path instead of panic

Merge pull request etcd-io#21794 from vivekpatani/cherry-pick-21788-r…

2286051

…elease-3.6 [release-3.6] client/pkg/fileutil: use os.Getuid() to skip TestIsDirWriteable as root

server: allow non-admin maintenance status

576a6a0

Signed-off-by: kunal.behbudzade <kunal.behbudzade@btsgrp.com> Signed-off-by: Ian Chechin <ian00chechin@gmail.com>

Merge pull request etcd-io#21811 from Deln0r/release-3.6-backport-21666

8b95963

[release-3.6] server: allow non-admin maintenance status

version: bump up to 3.6.12

90b034a

Signed-off-by: Ivan Valdes <iv@a.ki>

Merge branch 'openshift-4.22' into HEAD

fafea36

UPSTREAM: <drop>: go mod tidy

c404a7a

Merge pull request #10 from redhat-chai-bot/06122023-bot-changes

00e0aea

WIP: Rebase v3.6.12

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 15, 2026

openshift-ci Bot requested review from dusk125 and tjungblu June 15, 2026 13:45

DOWNSTREAM: <drop>: update images

6631009

tjungblu mentioned this pull request Jun 15, 2026

[Auto-Generated] Personal Workflow Brief tjungblu/agent#1

Open

JSampsonIV changed the title ~~WIP: Bump to etcd v3.6.12 in openshift 4.22~~ [OCPBUGS-82497] Bump to etcd v3.6.12 in openshift 4.22 Jun 16, 2026

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2026

JSampsonIV changed the title ~~[OCPBUGS-82497] Bump to etcd v3.6.12 in openshift 4.22~~ OCPBUGS-82497: Bump to etcd v3.6.12 in openshift 4.22 Jun 16, 2026

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 16, 2026

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 16, 2026

openshift-ci Bot requested a review from sandeepknd June 16, 2026 19:18

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 17, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-82497: Bump to etcd v3.6.12 in openshift 4.22#387

OCPBUGS-82497: Bump to etcd v3.6.12 in openshift 4.22#387
JSampsonIV wants to merge 126 commits into
openshift:openshift-4.22from
JSampsonIV:openshift-4.22

JSampsonIV commented Jun 15, 2026

Uh oh!

coderabbitai Bot commented Jun 15, 2026 •

edited

Loading

Review skipped

Uh oh!

openshift-ci Bot commented Jun 15, 2026

Uh oh!

JSampsonIV commented Jun 16, 2026

Uh oh!

openshift-ci Bot commented Jun 16, 2026

Uh oh!

dusk125 commented Jun 16, 2026

Uh oh!

JSampsonIV commented Jun 16, 2026

Uh oh!

openshift-ci-robot commented Jun 16, 2026

Uh oh!

openshift-ci-robot commented Jun 16, 2026

Uh oh!

dusk125 commented Jun 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Conversation

JSampsonIV commented Jun 15, 2026

Uh oh!

coderabbitai Bot commented Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented Jun 15, 2026

Uh oh!

JSampsonIV commented Jun 16, 2026

Uh oh!

openshift-ci Bot commented Jun 16, 2026

Uh oh!

dusk125 commented Jun 16, 2026

Uh oh!

JSampsonIV commented Jun 16, 2026

Uh oh!

openshift-ci-robot commented Jun 16, 2026

Uh oh!

openshift-ci-robot commented Jun 16, 2026

Uh oh!

dusk125 commented Jun 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

coderabbitai Bot commented Jun 15, 2026 •

edited

Loading