Skip to content
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

Bump golang.org/x/net to 0.33.0 #1746

Merged
merged 1 commit into from
Jan 3, 2025

Conversation

jacobbaungard
Copy link
Contributor

Fixes CVE: CVE-2024-45338

Fixes CVE: CVE-2024-45338

Signed-off-by: Jacob Baungard Hansen <[email protected]>
@jacobbaungard
Copy link
Contributor Author

/cherry-pick release-2.12
/cherry-pick release-2.11
/cherry-pick release-2.10

@openshift-cherrypick-robot
Copy link
Collaborator

@jacobbaungard: once the present PR merges, I will cherry-pick it on top of release-2.10, release-2.11, release-2.12 in new PRs and assign them to you.

In response to this:

/cherry-pick release-2.12
/cherry-pick release-2.11
/cherry-pick release-2.10

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.

Copy link

sonarqubecloud bot commented Jan 3, 2025

Copy link
Contributor

@thibaultmg thibaultmg left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

openshift-ci bot commented Jan 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacobbaungard, thibaultmg

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:
  • OWNERS [jacobbaungard,thibaultmg]

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

@openshift-merge-bot openshift-merge-bot bot merged commit 4ad9e72 into stolostron:main Jan 3, 2025
18 checks passed
@openshift-cherrypick-robot
Copy link
Collaborator

@jacobbaungard: new pull request created: #1747

In response to this:

/cherry-pick release-2.12
/cherry-pick release-2.11
/cherry-pick release-2.10

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-cherrypick-robot
Copy link
Collaborator

@jacobbaungard: #1746 failed to apply on top of branch "release-2.11":

Applying: Bump golang.org/x/net to 0.33.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
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 Bump golang.org/x/net to 0.33.0

In response to this:

/cherry-pick release-2.12
/cherry-pick release-2.11
/cherry-pick release-2.10

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-cherrypick-robot
Copy link
Collaborator

@jacobbaungard: #1746 failed to apply on top of branch "release-2.10":

Applying: Bump golang.org/x/net to 0.33.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
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 Bump golang.org/x/net to 0.33.0

In response to this:

/cherry-pick release-2.12
/cherry-pick release-2.11
/cherry-pick release-2.10

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants