Skip to content

[release-4.12] OCPBUGS-102194: Replace golang.org/x/net with openshift-sustaining/net - #166

Open
Pacho20 wants to merge 2 commits into
openshift:release-4.12from
Pacho20:ocpbugs-102194-release-4.12-replace-x-net
Open

[release-4.12] OCPBUGS-102194: Replace golang.org/x/net with openshift-sustaining/net#166
Pacho20 wants to merge 2 commits into
openshift:release-4.12from
Pacho20:ocpbugs-102194-release-4.12-replace-x-net

Conversation

@Pacho20

@Pacho20 Pacho20 commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Replaces golang.org/x/net with the OpenShift sustaining fork, which carries the upstream security patches on a base that keeps this branch's current minimum go level.

The upstream release carrying the fix is golang.org/x/net v0.53.0, which declares go 1.25.0. This branch declares go 1.18, so taking it would raise the minimum go level. github.com/openshift-sustaining/net v0.35.0-sec.4 carries the same patches on a base that keeps the go 1.18 floor, so it is pulled in through a replace directive instead:

replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

golang.org/x/crypto, x/sys, x/term, x/text and github.com/google/go-cmp move up with it because they are declared requirements of that base. Those upgrades are a consequence of the replace, not a separate change.

The go.mod/go.sum change is in the <carry> commit and the regenerated vendor/ tree in the <drop> commit.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

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

@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 Sep 1, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@Pacho20: This pull request references Jira Issue OCPBUGS-102194, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-102403 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is New 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:

Replaces golang.org/x/net with the OpenShift sustaining fork, which carries the upstream security patches on a base that keeps this branch's current minimum go level.

The upstream release carrying the fix is golang.org/x/net v0.53.0, which declares go 1.25.0. This branch declares go 1.18, so taking it would raise the minimum go level. github.com/openshift-sustaining/net v0.35.0-sec.4 carries the same patches on a base that keeps the go 1.18 floor, so it is pulled in through a replace directive instead:

replace golang.org/x/net => github.com/openshift-sustaining/net v0.35.0-sec.4

golang.org/x/crypto, x/sys, x/term, x/text and github.com/google/go-cmp move up with it because they are declared requirements of that base. Those upgrades are a consequence of the replace, not a separate change.

The go.mod/go.sum change is in the <carry> commit and the regenerated vendor/ tree in the <drop> commit.

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

coderabbitai Bot commented Sep 1, 2026

Copy link
Copy Markdown

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: 658d9c3b-6141-4a00-8a68-075ca8eef575

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
openshift-ci Bot requested review from Karthik-K-N and elmiko September 1, 2026 10:17
…/net v0.35.0-sec.4

Use the openshift fork that includes upstream security patches.

golang.org/x/sys, x/term, x/text and github.com/google/go-cmp move up with
it because they are declared requirements of that base. Those upgrades are
a consequence of the replace, not a separate change.

golang.org/x/crypto is held at v0.23.0. The fork requires v0.33.0, whose
sha3 package uses crypto/subtle.XORBytes and bytes.Clone, both added in go
1.20. This branch builds with go 1.19, so v0.23.0 is used instead as the
newest release that still compiles there.
@Pacho20
Pacho20 force-pushed the ocpbugs-102194-release-4.12-replace-x-net branch from 6efb808 to 22b4064 Compare September 1, 2026 11:31
@TwoDCube

TwoDCube commented Sep 6, 2026

Copy link
Copy Markdown
Member

/lgtm

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

Pacho20 commented Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@Pacho20

Pacho20 commented Sep 11, 2026

Copy link
Copy Markdown
Contributor 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 Sep 11, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@Pacho20: This pull request references Jira Issue OCPBUGS-102194, 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.12.z) matches configured target version for branch (4.12.z)
  • bug is in the state New, 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-102403 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-102403 targets the "4.13.z" version, which is one of the valid target versions: 4.13.0, 4.13.z
  • bug has dependents
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.

@mkumatag mkumatag left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@openshift-ci

openshift-ci Bot commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mkumatag

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 Sep 11, 2026
@damdo

damdo commented Sep 14, 2026

Copy link
Copy Markdown
Member

/label backport-risk-assessed

/verified by ci

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

Copy link
Copy Markdown

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

Details

In response to this:

/label backport-risk-assessed

/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-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 Sep 14, 2026
@damdo

damdo commented Sep 14, 2026

Copy link
Copy Markdown
Member

/test images

@openshift-ci

openshift-ci Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 990306f and 2 for PR HEAD 22b4064 in total

@Pacho20

Pacho20 commented Sep 14, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci

openshift-ci Bot commented Sep 14, 2026

Copy link
Copy Markdown
Contributor

@Pacho20: 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/images 22b4064 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

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.

5 participants