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

🐛 uplift golang and x/net #8126

Merged
merged 1 commit into from
Feb 17, 2023

Conversation

tuminoid
Copy link
Contributor

Uplift golang to 1.19.6 and x/net to 0.7.0 due https://osv.dev/vulnerability/GO-2023-1571

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 17, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @tuminoid. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 17, 2023
@tuminoid tuminoid force-pushed the tuomo/uplift-go-and-x-net branch from 3db5dbc to 014fdf6 Compare February 17, 2023 13:09
@tuminoid tuminoid force-pushed the tuomo/uplift-go-and-x-net branch from 014fdf6 to e2cb83d Compare February 17, 2023 13:30
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

Thanks @tuminoid

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 17, 2023
@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

/cherry-pick release-1.3

@k8s-infra-cherrypick-robot

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

In response to this:

Thx!

/lgtm
/approve

/cherry-pick release-1.3

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 17, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9c05fc0f1c27f5645beab7a36cd101968f2f186a

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 17, 2023
@k8s-ci-robot k8s-ci-robot merged commit 0537f78 into kubernetes-sigs:main Feb 17, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Feb 17, 2023
@k8s-infra-cherrypick-robot

@sbueringer: #8126 failed to apply on top of branch "release-1.3":

Applying: uplift golang and x/net
Using index info to reconstruct a base tree...
M	Makefile
M	Tiltfile
M	go.mod
M	go.sum
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging hack/tools/go.sum
CONFLICT (content): Merge conflict in hack/tools/go.sum
Auto-merging hack/tools/go.mod
CONFLICT (content): Merge conflict in hack/tools/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging Tiltfile
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 uplift golang and 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:

Thx!

/lgtm
/approve

/cherry-pick release-1.3

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/test-infra repository.

@tuminoid tuminoid deleted the tuomo/uplift-go-and-x-net branch February 17, 2023 14:20
@sbueringer
Copy link
Member

@tuminoid Do you have some time to open a manual cherry-pick for release-1.3?

@tuminoid
Copy link
Contributor Author

Sure. I’ll do it later tonight.

tuminoid added a commit to Nordix/cluster-api that referenced this pull request Feb 17, 2023
Uplift golang to 1.19.6 and x/net to 0.7.0 due
https://osv.dev/vulnerability/GO-2023-1571

This is manual cherry-pick of kubernetes-sigs#8126
abhinavmpandey08 pushed a commit to abhinavmpandey08/cluster-api that referenced this pull request Mar 8, 2023
Uplift golang to 1.19.6 and x/net to 0.7.0 due
https://osv.dev/vulnerability/GO-2023-1571

This is manual cherry-pick of kubernetes-sigs#8126
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants