Skip to content

Bump x/net to 0.13 #9184

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.

Sign up for GitHub

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

Jump to bottom
Merged
estesp merged 1 commit into from
Oct 3, 2023
Merged

Bump x/net to 0.13 #9184

estesp merged 1 commit into from
Oct 3, 2023

Conversation

@Kern--
Copy link
Contributor

@Kern-- Kern-- commented Oct 3, 2023

This silences govulncheck detecting
https://pkg.go.dev/vuln/GO-2023-1988.

containerd does not directly use x/net

This moves main to x/net 0.13.0 so that it is not behind release/1.7 or release/1.6 after #9134 and #9130

@k8s-ci-robot
Copy link

k8s-ci-robot commented Oct 3, 2023

Hi @Kern--. Thanks for your PR.

I'm waiting for a containerd 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.

Details

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.

@Kern-- Kern-- mentioned this pull request Oct 3, 2023
Merged
@thaJeztah
Copy link
Member

thaJeztah commented Oct 3, 2023

looks like there's a diff in the go.sum; can you try rubbing "make vendor" and amending the commit?

These files were modified:
  
   M go.sum

@Kern--
Bump x/net to 0.13
42dc8fa 
This silences govulncheck detecting
https://pkg.go.dev/vuln/GO-2023-1988.

containerd does not directly use x/net

Signed-off-by: Kern Walster <walster@amazon.com>
@Kern--
Copy link
Contributor Author

Kern-- commented Oct 3, 2023

Whoops. I missed the go mod tidy. I think it should be good this time (at least make verify-vendor passes locally 😅).

@thaJeztah
Copy link
Member

thaJeztah commented Oct 3, 2023

/ok-to-test

thaJeztah
thaJeztah approved these changes Oct 3, 2023
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan
Copy link
Member

dmcgowan commented Oct 3, 2023

/retest

@estesp estesp merged commit cffe399 into containerd:main Oct 3, 2023
@fuweid fuweid added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch labels Oct 14, 2023
kiashok added a commit to kiashok/containerd that referenced this pull request Oct 23, 2024
@kiashok
Merged PR 8946463: [fork-external/main] Update fork-external/main wit…
ebe5b9b 
…h upstream containerd/main

update fork-external/main branch to upstream containerd/main at commit f90f80d

Related work items: containerd#8736, containerd#8861, containerd#8924, containerd#8934, containerd#9027, containerd#9076, containerd#9104, containerd#9118, containerd#9141, containerd#9155, containerd#9177, containerd#9183, containerd#9184, containerd#9186, containerd#9187, containerd#9191, containerd#9200, containerd#9205, containerd#9211, containerd#9214, containerd#9215, containerd#9221, containerd#9223, containerd#9228, containerd#9231, containerd#9234, containerd#9242, containerd#9246, containerd#9247, containerd#9251, containerd#9253, containerd#9254, containerd#9255, containerd#9268
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@estesp estesp estesp approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@Kern-- @k8s-ci-robot @thaJeztah @dmcgowan @samuelkarp @estesp @fuweid