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

Update golang.org/x/net #198

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Update golang.org/x/net #198

merged 1 commit into from
Jun 6, 2024

Conversation

jlpadilla
Copy link
Contributor

@jlpadilla jlpadilla commented Jun 5, 2024

Related Issue

CVE GHSA-4v7x-pqxf-cx7m

Description of changes

  • Update golang.org/x/net to v0.26.0

Signed-off-by: Jorge Padilla <jpadilla@redhat.com>
Copy link

openshift-ci bot commented Jun 5, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@jlpadilla
Copy link
Contributor Author

/cherry-pick release-2.10
/cherry-pick release-2.9
/cherry-pick release-2.8

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-2.10
/cherry-pick release-2.9
/cherry-pick release-2.8

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

sonarcloud bot commented Jun 5, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Copy link
Contributor

@SherinV SherinV 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 label Jun 6, 2024
@SherinV SherinV self-requested a review June 6, 2024 11:48
Copy link

openshift-ci bot commented Jun 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jlpadilla, SherinV

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

@SherinV
Copy link
Contributor

SherinV commented Jun 6, 2024

/cherry-pick release-2.10

@openshift-cherrypick-robot

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

In response to this:

/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-merge-bot openshift-merge-bot bot merged commit 6f94646 into main Jun 6, 2024
8 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the jorge/update-x/net branch June 6, 2024 11:52
@openshift-cherrypick-robot

@jlpadilla: new pull request created: #199

In response to this:

/cherry-pick release-2.10
/cherry-pick release-2.9
/cherry-pick release-2.8

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

@jlpadilla: #198 failed to apply on top of branch "release-2.9":

Applying: Update golang.org/x/net
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
Patch failed at 0001 Update golang.org/x/net
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-2.10
/cherry-pick release-2.9
/cherry-pick release-2.8

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

@jlpadilla: #198 failed to apply on top of branch "release-2.8":

Applying: Update golang.org/x/net
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
Patch failed at 0001 Update golang.org/x/net
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-2.10
/cherry-pick release-2.9
/cherry-pick release-2.8

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