Skip to content

[release-4.15] OCPBUGS-31939,OCPBUGS-31940: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288 #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

kevinrizza
Copy link
Member

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

@openshift-ci openshift-ci bot requested review from anik120 and tmshort May 20, 2024 20:48
Copy link
Contributor

openshift-ci bot commented May 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevinrizza

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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 20, 2024
@kevinrizza
Copy link
Member Author

/hold

looks like we haven't actually gotten /x/net to 0.23.0 in the registry downstream yet?

https://github.com/openshift/operator-framework-olm/blob/master/staging/operator-registry/go.mod#L36

that needs to get in to master, then 4.16 first

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 20, 2024
@kevinrizza kevinrizza changed the title update golang.org/x/net for CVE-2023-45288 [release-4.15] OCPBUGS-31939,OCPBUGS-31940: update golang.org/x/net for CVE-2023-45288 Jun 5, 2024
@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. labels Jun 5, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31939, 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"
  • expected Jira Issue OCPBUGS-31939 to depend on a bug targeting a version in 4.16.0 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.

This pull request references Jira Issue OCPBUGS-31940, 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"

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.

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 5, 2024
@kevinrizza kevinrizza changed the title [release-4.15] OCPBUGS-31939,OCPBUGS-31940: update golang.org/x/net for CVE-2023-45288 [release-4.15] OCPBUGS-31939,OCPBUGS-31940: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288 Jun 5, 2024
@kevinrizza
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31939, 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"

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-31940, 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"

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.

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.

@kevinrizza
Copy link
Member 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 Jun 5, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31939, 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.15.z) matches configured target version for branch (4.15.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-31891 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31891 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

This pull request references Jira Issue OCPBUGS-31940, 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.15.z) matches configured target version for branch (4.15.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-31892 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31892 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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.

@kevinrizza
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 5, 2024
@kevinrizza
Copy link
Member Author

/cherry-pick release-4.14, release-4.13, release-4.12

@openshift-cherrypick-robot

@kevinrizza: once the present PR merges, I will cherry-pick it on top of release-4.14, in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.14, release-4.13, release-4.12

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.

@joelanford
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2024
@kevinrizza
Copy link
Member Author

/retest
/label backport-risk-assessed

@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 Jun 6, 2024
@kevinrizza
Copy link
Member Author

/retest

@jianzhangbjz
Copy link
Contributor

Test fail, details: https://issues.redhat.com/browse/OCPBUGS-31939
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2024
@kevinrizza
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 12, 2024
@jianzhangbjz
Copy link
Contributor

LGTM, details: https://issues.redhat.com/browse/OCPBUGS-31939
/lgtm
/label qe-approved
/label cherry-pick-approved

@openshift-ci openshift-ci bot added qe-approved Signifies that QE has signed off on this PR cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Jun 13, 2024
@openshift-ci-robot
Copy link

@kevinrizza: This pull request references Jira Issue OCPBUGS-31939, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, 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-31891 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-31891 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.z) matches configured target version for branch (4.15.z)
  • bug is in the state POST, 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-31892 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-31892 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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.

Copy link
Contributor

openshift-ci bot commented Jun 14, 2024

@kevinrizza: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit c760189 into openshift:release-4.15 Jun 14, 2024
13 checks passed
@openshift-ci-robot
Copy link

@kevinrizza: Jira Issue OCPBUGS-31939: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31939 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-31940: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-31940 has been moved to the MODIFIED state.

In response to this:

https://nvd.nist.gov/vuln/detail/CVE-2023-45288

Bumps golang.org/x/net to 0.23.0

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

@kevinrizza: cannot checkout release-4.14,: error checking out "release-4.14,": exit status 1 error: pathspec 'release-4.14,' did not match any file(s) known to git

In response to this:

/cherry-pick release-4.14, release-4.13, release-4.12

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202406132106.p0.gc760189.assembly.stream.el9 for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@kevinrizza
Copy link
Member Author

/cherry-pick release-4.14

@openshift-cherrypick-robot

@kevinrizza: #747 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/api/go.mod
M	staging/api/go.sum
M	staging/operator-lifecycle-manager/go.mod
M	staging/operator-lifecycle-manager/go.sum
M	staging/operator-registry/go.mod
M	staging/operator-registry/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging staging/operator-registry/go.sum
Auto-merging staging/operator-registry/go.mod
Auto-merging staging/operator-lifecycle-manager/go.sum
Auto-merging staging/operator-lifecycle-manager/go.mod
CONFLICT (content): Merge conflict in staging/operator-lifecycle-manager/go.mod
Auto-merging staging/api/go.sum
Auto-merging staging/api/go.mod
CONFLICT (content): Merge conflict in staging/api/go.mod
Auto-merging go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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.

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.