OCPBUGS-82497: 4.22 rebase 4.6.10 by dusk125 · Pull Request #370 · openshift/etcd

dusk125 · 2026-04-09T18:53:08Z

Go 1.25 reverts and conflict resolution handled by Claude

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

openshift-ci-robot · 2026-04-09T18:59:20Z

@dusk125: This pull request references Jira Issue OCPBUGS-82497, which is invalid:

expected Jira Issue OCPBUGS-82497 to depend on a bug targeting a version in 4.23.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

In response to this:

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.

…/20260327_dep" This reverts commit e841e10, made with merge commit strategy.

…c/release-3.6-go-1.25.8" This reverts commit a402fbe, made with merge commit strategy.

…aha30/fix-cve-GO-2026-4559-3.6" This reverts commit 3dd99be, made with merge commit strategy.

…1026/bump-3.6-to-gov1.25.7" This reverts commit 7116d86, made with merge commit strategy.

tjungblu · 2026-04-10T10:44:26Z

/lgtm
/label backport-risk-assessed

/retest-required

dusk125 · 2026-04-13T13:41:05Z

/retest-required

dusk125 · 2026-04-14T01:19:42Z

/retest-required

openshift-ci · 2026-04-14T01:33:36Z

@dusk125: The following test 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/unit	`1223d2e`	link	true	`/test unit`

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.

tjungblu · 2026-04-23T08:24:36Z

/lgtm

tjungblu · 2026-04-23T08:24:48Z

/label backport-risk-assessed

openshift-ci · 2026-04-23T08:26:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, tjungblu

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [dusk125,tjungblu]

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

tjungblu · 2026-04-23T08:27:33Z

/jira refresh

openshift-ci-robot · 2026-04-23T08:27:36Z

@tjungblu: This pull request references Jira Issue OCPBUGS-82497, which is invalid:

expected Jira Issue OCPBUGS-82497 to depend on a bug targeting a version in 5.0.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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.

dusk125 · 2026-04-23T13:11:00Z

/jira refresh

openshift-ci-robot · 2026-04-23T13:11:08Z

@dusk125: This pull request references Jira Issue OCPBUGS-82497, which is valid. The bug has been moved to the POST state.

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 ASSIGNED, 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-82495 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-82495 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

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.

dusk125 · 2026-04-23T13:21:58Z

/verified by ci

openshift-ci-robot · 2026-04-23T13:22:12Z

@dusk125: This PR has been marked as verified by ci.

Details

In response to this:

/verified by ci

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.

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>

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 9, 2026

dusk125 added 4 commits April 9, 2026 15:55

UPSTREAM: <drop>: Revert "Merge pull request etcd-io#21531 from ahrtr…

9e332de

…/20260327_dep" This reverts commit e841e10, made with merge commit strategy.

UPSTREAM: <drop>: Revert "Merge pull request etcd-io#21463 from ivanv…

224e9a8

…c/release-3.6-go-1.25.8" This reverts commit a402fbe, made with merge commit strategy.

UPSTREAM: <drop>: Revert "Merge pull request etcd-io#21440 from ArkaS…

a598662

…aha30/fix-cve-GO-2026-4559-3.6" This reverts commit 3dd99be, made with merge commit strategy.

UPSTREAM: <drop>: Revert "Merge pull request etcd-io#21393 from shuan…

e966f22

…1026/bump-3.6-to-gov1.25.7" This reverts commit 7116d86, made with merge commit strategy.

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 10, 2026

openshift-ci Bot assigned tjungblu Apr 10, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 10, 2026

DOWNSTREAM: <carry>: Increase snapshot test new member wait timeout

1223d2e

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 23, 2026

openshift-ci Bot requested a review from sandeepknd April 23, 2026 13:11

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 23, 2026

Conversation

dusk125 commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 9, 2026

Uh oh!

tjungblu commented Apr 10, 2026

Uh oh!

dusk125 commented Apr 13, 2026

Uh oh!

dusk125 commented Apr 14, 2026

Uh oh!

openshift-ci Bot commented Apr 14, 2026

Uh oh!

tjungblu commented Apr 23, 2026

Uh oh!

tjungblu commented Apr 23, 2026

Uh oh!

openshift-ci Bot commented Apr 23, 2026

Uh oh!

tjungblu commented Apr 23, 2026

Uh oh!

openshift-ci-robot commented Apr 23, 2026

Uh oh!

dusk125 commented Apr 23, 2026

Uh oh!

openshift-ci-robot commented Apr 23, 2026

Uh oh!

dusk125 commented Apr 23, 2026

Uh oh!

openshift-ci-robot commented Apr 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

dusk125 commented Apr 9, 2026 •

edited

Loading