Skip to content

[Release-4.17] OCPBUGS-80129: Update grpc-go to v1.71.3-sec.1 to fix CVE-2026-33186#736

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.17from
MrSanketkumar:grpc-patch-cve-fix-4.17
May 28, 2026
Merged

[Release-4.17] OCPBUGS-80129: Update grpc-go to v1.71.3-sec.1 to fix CVE-2026-33186#736
openshift-merge-bot[bot] merged 2 commits into
openshift:release-4.17from
MrSanketkumar:grpc-patch-cve-fix-4.17

Conversation

@MrSanketkumar

@MrSanketkumar MrSanketkumar commented May 25, 2026

Copy link
Copy Markdown

Summary

Fixes CVE-2026-33186 by updating grpc to patched version v1.71.3-sec.1 from openshift-sustaining fork.

Changes

  • Main module: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • openshift/default-catalog-consistency: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • Updated vendor directories

CI Unit Test Fix

 - Updated setup-envtest from v0.0.0-20230606045100 (June 2023) to v0.0.0-20240820183333 (August 2024)
 - Fixes "fork/exec /usr/local/kubebuilder/bin/etcd: no such file or directory" error
 - The old setup-envtest version didn't support downloading Kubernetes 1.30.x control plane binaries required for envtest
 - Updated files: `.bingo/setup-envtest.mod`, `.bingo/setup-envtest.sum`, `.bingo/Variables.mk`, `.bingo/variables.env`

Summary by CodeRabbit

Chores

  • Updated Go module dependencies throughout the project to current versions, including testify (v1.9.0 → v1.10.0), Google Cloud compute metadata (v0.3.0 → v0.6.0), OpenTelemetry instrumentation and exporter packages, golang system libraries, and protocol buffer modules.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 May 25, 2026
@coderabbitai

coderabbitai Bot commented May 25, 2026

Copy link
Copy Markdown

Walkthrough

Go module dependencies are upgraded across the main module and sub-module, including testify, Google Cloud metadata, OpenTelemetry ecosystem, and multiple golang.org/x and google.golang.org packages. A replace directive is added to both go.mod files to redirect google.golang.org/grpc to the OpenShift-sustaining fork (v1.71.3-sec.1) instead of the upstream version.

Changes

Dependency Updates and gRPC Fork Replacement

Layer / File(s) Summary
Main module dependency upgrades
go.mod
Testify is bumped to v1.10.0, compute/metadata to v0.6.0, and a bulk upgrade applies to OpenTelemetry modules (otel, SDK, instrumentation, exporters) plus golang.org/x libraries (crypto, net, oauth2, sync, sys, term, text) and Google ecosystem packages (genproto, grpc, protobuf).
gRPC fork replacement across modules
go.mod, openshift/default-catalog-consistency/go.mod
A replace directive is added to both the main and sub-module to redirect google.golang.org/grpc to the OpenShift-sustaining fork at v1.71.3-sec.1, ensuring consistent use of the patched version across the module tree.
Sub-module dependency synchronization
openshift/default-catalog-consistency/go.mod
Indirect dependency versions are bumped to align with the main module, including golang.org/x/oauth2 and coordinated updates to google.golang.org packages (genproto/googleapis/rpc, grpc, protobuf).

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Suggested labels

lgtm, backport-risk-assessed

🚥 Pre-merge checks | ✅ 5 | ❌ 7

❌ Failed checks (7 inconclusive)

Check name Status Explanation Resolution
Stable And Deterministic Test Names ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Test Structure And Quality ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Microshift Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Single Node Openshift (Sno) Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Topology-Aware Scheduling Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ote Binary Stdout Contract ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
Ipv6 And Disconnected Network Test Compatibility ❓ Inconclusive Repository clone failed, so this custom check could not run with code access. Retry the review run. If this persists, inspect pre-merge custom-check logs for infrastructure or agent runtime failures.
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: updating grpc-go to address CVE-2026-33186, which matches the primary objective and modifications in go.mod files.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

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

@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: This pull request references Jira Issue OCPBUGS-80129, which is invalid:

  • expected dependent Jira Issue OCPBUGS-80304 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ASSIGNED instead

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:

Summary

Fixes CVE-2026-33186 by updating grpc to patched version v1.71.3-sec.1 from openshift-sustaining fork.

Changes

  • Main module: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • openshift/default-catalog-consistency: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • Updated vendor directories

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 openshift-ci Bot requested review from anik120 and oceanc80 May 25, 2026 10:11
@MrSanketkumar

Copy link
Copy Markdown
Author

@coderabbitai review

@coderabbitai

coderabbitai Bot commented May 25, 2026

Copy link
Copy Markdown
✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@MrSanketkumar

Copy link
Copy Markdown
Author

/test unit

1 similar comment
@MrSanketkumar

Copy link
Copy Markdown
Author

/test unit

@MrSanketkumar

Copy link
Copy Markdown
Author

/retest-required

@perdasilva

Copy link
Copy Markdown
Contributor

it seems updating setup-envtest in bingo makes the unit tests pass - but it also seems to bump the go version =/

@MrSanketkumar

Copy link
Copy Markdown
Author

it seems updating setup-envtest in bingo makes the unit tests pass - but it also seems to bump the go version =/

Yes, but the setup-envtest bump is from 1.20 to 1.22, which I don’t think should break anything because our go.mod already uses Go 1.22, and we also build with the same version. So there ideally should not be any issue.

Should I raise a fix PR with this change and verify whether all CI jobs pass, or is there any other approach I should follow? I’m not very familiar with this area.

@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: This pull request references Jira Issue OCPBUGS-80129, which is invalid:

  • expected dependent Jira Issue OCPBUGS-80304 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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:

Summary

Fixes CVE-2026-33186 by updating grpc to patched version v1.71.3-sec.1 from openshift-sustaining fork.

Changes

  • Main module: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • openshift/default-catalog-consistency: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • Updated vendor directories

CI Unit Test Fix
- Updated setup-envtest from v0.0.0-20230606045100 (June 2023) to v0.0.0-20240820183333 (August 2024)
- Fixes "fork/exec /usr/local/kubebuilder/bin/etcd: no such file or directory" error
- The old setup-envtest version didn't support downloading Kubernetes 1.30.x control plane binaries required for envtest
- Updated files: .bingo/setup-envtest.mod, .bingo/setup-envtest.sum, .bingo/Variables.mk, .bingo/variables.env

Summary by CodeRabbit

Chores

  • Updated Go module dependencies throughout the project to current versions, including testify (v1.9.0 → v1.10.0), Google Cloud compute metadata (v0.3.0 → v0.6.0), OpenTelemetry instrumentation and exporter packages, golang system libraries, and protocol buffer modules.

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.

@perdasilva

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrSanketkumar, perdasilva

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:

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 26, 2026
@perdasilva

Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot

Copy link
Copy Markdown

@perdasilva: This pull request references Jira Issue OCPBUGS-80129, which is invalid:

  • expected dependent Jira Issue OCPBUGS-80304 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is ON_QA instead

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.

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown
Contributor

@MrSanketkumar: all tests passed!

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.

@MrSanketkumar

Copy link
Copy Markdown
Author

/jira refresh

@openshift-ci-robot 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 May 28, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: This pull request references Jira Issue OCPBUGS-80129, 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.17.z) matches configured target version for branch (4.17.z)
  • 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-80304 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-80304 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (ocp-sustaining-admins@redhat.com), skipping review request.

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.

@prabhapa

Copy link
Copy Markdown

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 28, 2026
@openshift-ci openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label May 28, 2026
@UdayYendva

Copy link
Copy Markdown

/verified by ci

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 28, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@UdayYendva: 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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 795b313 into openshift:release-4.17 May 28, 2026
11 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@MrSanketkumar: Jira Issue Verification Checks: Jira Issue OCPBUGS-80129
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-80129 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Summary

Fixes CVE-2026-33186 by updating grpc to patched version v1.71.3-sec.1 from openshift-sustaining fork.

Changes

  • Main module: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • openshift/default-catalog-consistency: google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1
  • Updated vendor directories

CI Unit Test Fix

- Updated setup-envtest from v0.0.0-20230606045100 (June 2023) to v0.0.0-20240820183333 (August 2024)
- Fixes "fork/exec /usr/local/kubebuilder/bin/etcd: no such file or directory" error
- The old setup-envtest version didn't support downloading Kubernetes 1.30.x control plane binaries required for envtest
- Updated files: `.bingo/setup-envtest.mod`, `.bingo/setup-envtest.sum`, `.bingo/Variables.mk`, `.bingo/variables.env`

Summary by CodeRabbit

Chores

  • Updated Go module dependencies throughout the project to current versions, including testify (v1.9.0 → v1.10.0), Google Cloud compute metadata (v0.3.0 → v0.6.0), OpenTelemetry instrumentation and exporter packages, golang system libraries, and protocol buffer modules.

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-merge-robot

Copy link
Copy Markdown
Contributor

Fix included in release 4.17.0-0.nightly-2026-06-02-075326

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants