Skip to content

Update golang.org/x/net to v0.38.0 #1852

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

SaschaSchwarze0
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 commented Mar 28, 2025

Changes

Fixes CVE-2025-22872

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

Release Notes

NONE

Signed-off-by: Sascha Schwarze <[email protected]>
@openshift-ci openshift-ci bot added the release-note Label for when a PR has specified a release note label Mar 28, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 28, 2025
@openshift-ci openshift-ci bot requested review from adambkaplan and karanibm6 March 28, 2025 08:50
@openshift-ci openshift-ci bot added release-note-none Label for when a PR does not need a release note and removed release-note Label for when a PR has specified a release note labels Mar 28, 2025
@SaschaSchwarze0 SaschaSchwarze0 added kind/dependency-change Categorizes issue or PR as related to changing dependencies release-note Label for when a PR has specified a release note and removed release-note-none Label for when a PR does not need a release note labels Mar 28, 2025
@openshift-ci openshift-ci bot added release-note-none Label for when a PR does not need a release note and removed release-note Label for when a PR has specified a release note labels Mar 28, 2025
@SaschaSchwarze0 SaschaSchwarze0 added this to the release-v0.16.0 milestone Mar 28, 2025
Copy link
Contributor

@karanibm6 karanibm6 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2025
@SaschaSchwarze0
Copy link
Member Author

/approve

Copy link
Contributor

openshift-ci bot commented Mar 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SaschaSchwarze0

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 Mar 28, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 075fe84 into shipwright-io:main Mar 28, 2025
20 checks passed
@SaschaSchwarze0 SaschaSchwarze0 deleted the sascha-net-38 branch March 28, 2025 10:30
@SaschaSchwarze0
Copy link
Member Author

/cherry-pick release-v0.15

@openshift-cherrypick-robot

@SaschaSchwarze0: #1852 failed to apply on top of branch "release-v0.15":

Applying: Update golang.org/x/net to v0.38.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Update golang.org/x/net to v0.38.0

In response to this:

/cherry-pick release-v0.15

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. kind/dependency-change Categorizes issue or PR as related to changing dependencies lgtm Indicates that a PR is ready to be merged. release-note-none Label for when a PR does not need a release note size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants