[release-4.18] OCPBUGS-103360, OCPBUGS-103371: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork by mariocr73 · Pull Request #610 · openshift/csi-operator

mariocr73 · 2026-09-01T02:44:49Z

Same rationale as OCPBUGS-102919 (release-4.16). Builder pinned to Go 1.22 (rhel-9-golang-1.22-openshift-4.18). Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3.

This branch already had a similar precedent for a different CVE (replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1), confirming this is an established downstream fork pattern.

go build/go vet clean; govulncheck confirms GO-2026-4918 no longer reported for ./cmd/azure-disk-csi-driver-operator/....

…ft-sustaining fork Same rationale/fix as OCPBUGS-102919 (release-4.16): builder is pinned to Go 1.22 (rhel-9-golang-1.22-openshift-4.18), below the go>=1.25 that golang.org/x/net@v0.53.0 requires, so uses `replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3` instead. This branch already had a similar precedent for a different CVE (`replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1`), confirming this is an established downstream fork pattern, not a one-off. go build/go vet clean; govulncheck confirms GO-2026-4918 no longer reported for ./cmd/azure-disk-csi-driver-operator/... Co-authored-by: Cursor <cursoragent@cursor.com>

coderabbitai · 2026-09-01T02:44:56Z

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: Team

Run ID: 8d159e0b-8634-4151-8a8e-bfdfb06e09ab

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

_{Comment @coderabbitai help to get the list of available commands.}

openshift-ci-robot · 2026-09-01T02:44:57Z

@mariocr73: This pull request references Jira Issue OCPBUGS-103371, which is invalid:

expected dependent Jira Issue OCPBUGS-103592 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:

Same rationale as OCPBUGS-102919 (release-4.16). Builder pinned to Go 1.22 (rhel-9-golang-1.22-openshift-4.18). Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3.

This branch already had a similar precedent for a different CVE (replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1), confirming this is an established downstream fork pattern.

go build/go vet clean; govulncheck confirms GO-2026-4918 no longer reported for ./cmd/azure-disk-csi-driver-operator/....

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 · 2026-09-01T02:45:01Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

dobsonj · 2026-09-01T17:26:37Z

/lgtm
/approve
/label backport-risk-assessed

openshift-merge-bot · 2026-09-01T17:30:33Z

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-upgrade
/test e2e-azure
/test e2e-azure-csi
/test e2e-azure-file-csi
/test e2e-azure-file-nfs-csi
/test e2e-azure-ovn-upgrade

openshift-ci · 2026-09-01T17:31:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dobsonj, mariocr73

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~~ [dobsonj]

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

mariocr73 · 2026-09-03T00:31:31Z

/test unit

openshift-ci-robot · 2026-09-10T17:32:22Z

@mariocr73: This pull request references Jira Issue OCPBUGS-103360, which is invalid:

expected dependent Jira Issue OCPBUGS-103601 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.

This pull request references Jira Issue OCPBUGS-103371, which is invalid:

expected dependent Jira Issue OCPBUGS-103592 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:

Same rationale as OCPBUGS-102919 (release-4.16). Builder pinned to Go 1.22 (rhel-9-golang-1.22-openshift-4.18). Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3.

This branch already had a similar precedent for a different CVE (replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1), confirming this is an established downstream fork pattern.

go build/go vet clean; govulncheck confirms GO-2026-4918 no longer reported for ./cmd/azure-disk-csi-driver-operator/....

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.

mariocr73 · 2026-09-10T18:04:27Z

/jira refresh

openshift-ci-robot · 2026-09-10T18:04:33Z

@mariocr73: This pull request references Jira Issue OCPBUGS-103360, which is invalid:

expected dependent Jira Issue OCPBUGS-103601 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.

This pull request references Jira Issue OCPBUGS-103371, which is invalid:

expected dependent Jira Issue OCPBUGS-103592 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.

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.

mariocr73 · 2026-09-16T16:45:56Z

/jira refresh

openshift-ci-robot · 2026-09-16T16:46:02Z

@mariocr73: This pull request references Jira Issue OCPBUGS-103360, which is invalid:

expected dependent Jira Issue OCPBUGS-103601 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.

This pull request references Jira Issue OCPBUGS-103371, which is invalid:

expected dependent Jira Issue OCPBUGS-103592 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:

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

mariocr73 · 2026-09-16T18:06:44Z

/test unit

openshift-ci · 2026-09-16T18:11:42Z

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

mariocr73 · 2026-09-16T18:25:33Z

/verified by CI

openshift-ci-robot · 2026-09-16T18:25:46Z

@mariocr73: 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-robot · 2026-09-17T07:51:08Z

/jira refresh

openshift-merge-robot · 2026-09-17T07:51:11Z

/jira refresh

openshift-ci-robot · 2026-09-17T07:51:17Z

@openshift-merge-robot: This pull request references Jira Issue OCPBUGS-103360, 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.18.z) matches configured target version for branch (4.18.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-103601 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-103601 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.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.

This pull request references Jira Issue OCPBUGS-103371, 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.18.z) matches configured target version for branch (4.18.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-103592 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-103592 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.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.

openshift-ci-robot · 2026-09-17T07:51:18Z

@openshift-merge-robot: This pull request references Jira Issue OCPBUGS-103360, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.z) matches configured target version for branch (4.18.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-103601 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-103601 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.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.

This pull request references Jira Issue OCPBUGS-103371, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.18.z) matches configured target version for branch (4.18.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-103592 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-103592 targets the "4.19.z" version, which is one of the valid target versions: 4.19.0, 4.19.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.

openshift-ci-robot · 2026-09-17T07:56:44Z

@mariocr73: Jira Issue Verification Checks: Jira Issue OCPBUGS-103360
✔️ 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-103360 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Jira Issue Verification Checks: Jira Issue OCPBUGS-103371
✔️ 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-103371 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:

Same rationale as OCPBUGS-102919 (release-4.16). Builder pinned to Go 1.22 (rhel-9-golang-1.22-openshift-4.18). Uses replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.3.

This branch already had a similar precedent for a different CVE (replace google.golang.org/grpc => github.com/openshift-sustaining/grpc-go v1.71.3-sec.1), confirming this is an established downstream fork pattern.

go build/go vet clean; govulncheck confirms GO-2026-4918 no longer reported for ./cmd/azure-disk-csi-driver-operator/....

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 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. labels Sep 1, 2026

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

openshift-ci Bot requested review from mandre and tsmetana September 1, 2026 02:46

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

openshift-ci Bot assigned radeore and dobsonj Sep 1, 2026

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

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 1, 2026

mariocr73 changed the title ~~[release-4.18] OCPBUGS-103371: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork~~ [release-4.18] OCPBUGS-103360, OCPBUGS-103371: CVE-2026-33814: replace golang.org/x/net with openshift-sustaining fork Sep 10, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 16, 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 Sep 17, 2026

openshift-merge-bot Bot merged commit 46b7804 into openshift:release-4.18 Sep 17, 2026
18 checks passed

Conversation

mariocr73 commented Sep 1, 2026

Uh oh!

coderabbitai Bot commented Sep 1, 2026

Review skipped

Uh oh!

openshift-ci-robot commented Sep 1, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

dobsonj commented Sep 1, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

openshift-ci Bot commented Sep 1, 2026

Uh oh!

mariocr73 commented Sep 3, 2026

Uh oh!

openshift-ci-robot commented Sep 10, 2026

Uh oh!

mariocr73 commented Sep 10, 2026

Uh oh!

openshift-ci-robot commented Sep 10, 2026

Uh oh!

mariocr73 commented Sep 16, 2026

Uh oh!

openshift-ci-robot commented Sep 16, 2026

Uh oh!

mariocr73 commented Sep 16, 2026

Uh oh!

openshift-ci Bot commented Sep 16, 2026

Uh oh!

mariocr73 commented Sep 16, 2026

Uh oh!

openshift-ci-robot commented Sep 16, 2026

Uh oh!

openshift-merge-robot commented Sep 17, 2026

Uh oh!

openshift-merge-robot commented Sep 17, 2026

Uh oh!

openshift-ci-robot commented Sep 17, 2026

Uh oh!

openshift-ci-robot commented Sep 17, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants