[release-4.12] OCPBUGS-86876: Bump google.golang.org/grpc#325
Conversation
|
@rhdmalone: No Jira issue with key OCPBUGS-86876 exists in the tracker at https://redhat.atlassian.net. DetailsIn 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. |
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository: openshift/coderabbit/.coderabbit.yaml Review profile: CHILL Plan: Enterprise Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
|
@rhdmalone: No Jira issue with key OCPBUGS-86876 exists in the tracker at https://redhat.atlassian.net. DetailsIn 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. |
|
/label backport-risk-assessed |
|
/jira refresh |
|
@simonpasquier: This pull request references Jira Issue OCPBUGS-86876, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn 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. |
|
/jira refresh |
|
@simonpasquier: This pull request references Jira Issue OCPBUGS-86876, which is invalid:
Comment DetailsIn 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. |
|
/jira refresh |
|
@simonpasquier: This pull request references Jira Issue OCPBUGS-86876, which is invalid:
Comment DetailsIn 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. |
|
/test e2e-agnostic-cmo |
|
/test e2e-aws-ovn-upgrade |
|
/lgtm |
|
@simonpasquier: This PR has been marked as verified by DetailsIn 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhdmalone, simonpasquier The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test e2e-agnostic-cmo |
|
@rhdmalone: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Background
google.golang.org/grpc versions before v1.64.1 are vulnerable to CVE-2026-33186 (authorization bypass). For older OpenShift release branches where a direct version bump is not possible, the fix uses a patched sustaining fork: github.com/openshift-sustaining/grpc-go v1.64.1-sec.1.
Changes
Replace google.golang.org/grpc with github.com/openshift-sustaining/grpc-go v1.64.1-sec.1 via a replace directive in go.mod
Bump go.opentelemetry.io/otel/exporters/otlp/otlptrace* to v1.24.0 and go.opentelemetry.io/otel/sdk to v1.24.0 to resolve a module restructuring incompatibility
Remove the obsolete go.opentelemetry.io/otel/exporters/otlp/internal/retry module entry (merged into the exporter at v1.24.0)
Update tracing/tracing.go semconv import to v1.24.0 to avoid OTel schema URL conflicts at runtime
Pin go.uber.org/goleak to v1.2.0 — v1.3.0 uses errors.Join/strings.CutPrefix (Go 1.20+) but this branch builds with Go 1.19
Steps to reproduce
Add the grpc replace directive:
go mod edit -replace google.golang.org/grpc=github.com/openshift-sustaining/grpc-go@v1.64.1-sec.1
Pre-fetch the sustaining fork: go mod download github.com/openshift-sustaining/grpc-go@v1.64.1-sec.1
Run go mod tidy -e (the -e flag tolerates OTel internal package restructuring warnings)
Manually update go.mod:
Bump otlptrace, otlptracegrpc, otlptracehttp from v1.11.2 → v1.24.0
Bump go.opentelemetry.io/otel/sdk from v1.22.0 → v1.24.0
Remove go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2
Add replace go.uber.org/goleak => go.uber.org/goleak v1.2.0
Update tracing/tracing.go: change semconv import from v1.12.0 to v1.24.0
Finalize: go mod download go.uber.org/goleak@v1.2.0 && go mod tidy -e && go mod vendor
Commit: git add go.mod go.sum vendor/ tracing/tracing.go && git commit
Verification
grep "Version" vendor/google.golang.org/grpc/version.go
Expected: const Version = "1.64.1"
grep "go.uber.org/goleak" vendor/modules.txt
Expected: # go.uber.org/goleak v1.3.0 => go.uber.org/goleak v1.2.0