Skip to content

OCPBUGS-86832: Bump to etcd v3.5.31 in openshift 4.19#381

Open
JSampsonIV wants to merge 72 commits into
openshift:openshift-4.19from
JSampsonIV:4.19-merge
Open

OCPBUGS-86832: Bump to etcd v3.5.31 in openshift 4.19#381
JSampsonIV wants to merge 72 commits into
openshift:openshift-4.19from
JSampsonIV:4.19-merge

Conversation

@JSampsonIV
Copy link
Copy Markdown

Bump from etcd v3.5.26 to v3.5.31

ahrtr and others added 30 commits January 30, 2026 10:15
Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.5] Bump go version to 1.24.12
We also revoke the deprecation of the Metadata field, Users
can store whatever information related to each endpoint. We
just don't need to pass the value to grpc-go's Metadata.

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
Signed-off-by: Nont <nont@duck.com>
[release-3.5] Bump go version to 1.24.13
Signed-off-by: Ivan Valdes <iv@a.ki>
Reference:
- etcd-io#21337

Signed-off-by: Chun-Hung Tseng <henrytseng@google.com>
…-3.5/go.opentelemetry.io/otel/sdk

[Release-3.5] Bump go.opentelemetry.io/otel/sdk to v1.40.0 to resolve https://pkg.go.dev/vuln/GO-2026-4394
Move server metrics unary/stream interceptors ahead of request interceptors so
metrics are collected before handler-specific interception logic runs.

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.5] server/etcdserver/api/v3rpc: run metrics interceptors before handlers
This differs slightly from the original patch.

* In cluster_proxy runs, use the embedded etcd member endpoint (Config().Acurl)
  instead of proxy endpoints for grpc-proxy --endpoints.
* Keep TLS version coverage and health-check flow unchanged.
* Use SpawnCmd because SpawnWithExpectsContext is not available
* Use --max-time for curl to avoid stuck
* `started gRPC proxy` is the signal that the server is ready

(cherry picked from commit 5037a98)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
[release-3.5] server/etcdmain: fix deadlock issue in grpcproxy
…erceptor

Signed-off-by: Benjamin Wang <benjamin.ahrtr@gmail.com>
[release-3.5] Print the endpoint the grpc request was actually sent to in unary int…
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…e-3.5-2

[release-3.5] Fix race berween read index and leader change causing a stale read
Signed-off-by: A.D <1695316070@qq.com>
Signed-off-by: A.D <1695316070@qq.com>
Signed-off-by: A.D <1695316070@qq.com>
In release-3.5, argify is defined as an unexported (lowercase) function. Therefore, the unit test should call argify instead of Argify.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: A.D <1695316070@qq.com>
Signed-off-by: Mark Tsai <111229657+shuan1026@users.noreply.github.com>
…t-21307-to-release-3.5

[release-3.5] etcdctl: fix slice bounds trimming single-quoted args
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
…se-3.5

[release-3.5] Don't reuse same ReadIndex
This commit will bump golang.org/x/net to v0.51.0 to resolve GO-2026-4559

Signed-off-by: ArkaSaha30 <arkasaha30@gmail.com>
…-3.5

[3.5] Bump golang.org/x/net@ v0.51.0 fixes GO-2026-4559
Signed-off-by: Ivan Valdes <ivan@vald.es>
ahrtr and others added 22 commits April 27, 2026 20:26
[release-3.5] 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>
[release-3.5] Get all Put related auth check into a separate function 'checkPutAuth'
…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.5] 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>
….25.10

[release-3.5] Bump Go to 1.25.10 and fix govulncheck
Signed-off-by: shenmu.wy <shenmu.wy@antfin.com>
…mberupdate-learner

[release-3.5] 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.5] 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.5

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

govulncheck on release-3.5 is currently failing with 17 vulnerabilities
in golang.org/x/crypto@v0.50.0 (GO-2026-5013..5033 plus older), all
listed as fixed in v0.52.0:

  https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/etcd-io_etcd/21815/pull-etcd-govulncheck/2059609075888427008

Bumping x/crypto to v0.52.0 transitively pulls x/net v0.55.0, which in
turn resolves GO-2026-5026 (idna.ToASCII Punycode-handling) reachable
from server/proxy/httpproxy. Both fixes are required for a clean
govulncheck pass.

Changes:
  - golang.org/x/crypto v0.50.0 -> v0.52.0
  - golang.org/x/net    v0.53.0 -> v0.55.0
  - golang.org/x/sys    v0.43.0 -> v0.45.0 (transitive)
  - golang.org/x/text   v0.36.0 -> v0.37.0 (transitive)

Plus minor tools/mod transitive bumps (x/mod, x/tools) picked up by
go mod tidy.

Followed the documented dependency_management.md workflow:
  - ./scripts/update_dep.sh golang.org/x/crypto v0.52.0
  - ./scripts/update_dep.sh golang.org/x/net    v0.55.0
  - go get on indirect-only modules (api, client/v3, pkg, client/pkg,
    tools/mod) to keep versions consistent across all modules
  - make fix
  - PASSES="dep" ./test.sh -> "SUCCESS: dependencies are consistent
    across modules"

Verified locally:
  - go build ./... clean in all 9 modules touched
  - govulncheck -mode source ./... reports "No vulnerabilities found"
    in all 5 modules that had the affected deps
  - go test ./auth/... (server) passes

Signed-off-by: Ian Chechin <ian00chechin@gmail.com>
[release-3.5] bump golang.org/x/crypto and golang.org/x/net to fix govulncheck
Signed-off-by: Ivan Valdes <iv@a.ki>
@openshift-ci-robot 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 Jun 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@JSampsonIV: This pull request references Jira Issue OCPBUGS-86832, which is invalid:

  • expected Jira Issue OCPBUGS-86832 to depend on a bug targeting a version in 4.20.0, 4.20.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), 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:

Bump from etcd v3.5.26 to v3.5.31

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 2, 2026

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: ad862ae3-5310-4837-9e8c-50e8dc04cca4

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 openshift-ci Bot requested review from deads2k and hexfusion June 2, 2026 19:49
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 2, 2026

[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 hasbro17 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
Copy link
Copy Markdown

openshift-ci Bot commented Jun 2, 2026

@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/e2e-aws-ovn-serial e28508e link true /test e2e-aws-ovn-serial
ci/prow/e2e-aws-ovn e28508e link true /test e2e-aws-ovn
ci/prow/configmap-scale e28508e link true /test configmap-scale
ci/prow/e2e-aws-ovn-upgrade e28508e link true /test e2e-aws-ovn-upgrade
ci/prow/unit e28508e link true /test unit
ci/prow/images e28508e link true /test images

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.

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

Labels

jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.