8000 [release/1.7] Updating hcsshim vendoring to 0.11.7 to include an important backported fix by yyatmsft · Pull Request #10396 · containerd/containerd · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[release/1.7] Updating hcsshim vendoring to 0.11.7 to include an important backported fix #10396

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
merged 1 commit into from
Jun 28, 2024
Merged

[release/1.7] Updating hcsshim vendoring to 0.11.7 to include an important backported fix #10396

merged 1 commit into from
Jun 28, 2024

Conversation

yyatmsft
Copy link
@yyatmsft yyatmsft commented Jun 27, 2024 •
edited by thaJeztah
Loading

The backport PR:

Since hcsshim vendoring was on 11.5 before, this included changes from 11.6-11.7 as well.

microsoft/hcsshim@v0.11.5...v0.11.7

@k8s-ci-robot
Copy link

Hi @yyatmsft. 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.

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.

@yyatmsft yyatmsft changed the title Backported an important fix to Hcsshim 0.11.7, updating hcsshim vendoring to 0.11.7 Updating hcsshim vendoring to 0.11.7 to include an important backported fix Jun 27, 2024
@yyatmsft yyatmsft changed the title Updating hcsshim vendoring to 0.11.7 to include an important backported fix [release/1.7] Updating hcsshim vendoring to 0.11.7 to include an important backported fix Jun 27, 2024
@yyatmsft yyatmsft force-pushed the updatehcsshim-release17 branch from 3231c27 to bac8c52 Compare June 27, 2024 20:14
@thaJeztah
Copy link
Member

@yyatmsft looks like you need to run make vendor to make sure the integration/client module's go.mod/go.sum are aligned with the main module;

verify-vendor
go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
go: downloading github.com/prometheus/procfs v0.6.0
go: downloading github.com/golang/protobuf v1.5.3
go: downloading github.com/stretchr/testify v1.8.2
go: downloading gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
go: downloading github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1
Files /home/runner/work/containerd/containerd/src/github.com/containerd/containerd/integration/client/go.sum and /tmp/tmp.WVixQ9VjvW/containerd/integration/client/go.sum differ
make: *** [Makefile:494: verify-vendor] Error 1

@thaJeztah thaJeztah requested a review from kiashok June 27, 2024 20:26
@thaJeztah
Copy link
Member

Oh! can you squash the commits? (sorry I should've mentioned) 🫶

@kiashok
Copy link
Contributor
kiashok commented Jun 28, 2024

@yyatmsft could you please squash the commit and push changes? Thanks!

@yyatmsft
updating hcsshim to 0.11.7
415dd74 
Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>

go mod tidy for intergration/client

Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>

go mod tidy for intergration/client

Signed-off-by: Yuanyuan Lei <yuanlei@microsoft.com>
@yyatmsft yyatmsft force-pushed the updatehcsshim-release17 branch from a767e14 to 415dd74 Compare June 28, 2024 17:45
thaJeztah
thaJeztah approved these changes Jun 28, 2024
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.

thanks for squashing!

LGTM (assuming CI is happy)

@kiashok
Copy link
Contributor
kiashok commented Jun 28, 2024

@dmcgowan could we check in this PR so that it makes it as part of the new containerd/1.7 release you are trying to get out please? Thanks!

@dmcgowan dmcgowan merged commit bb84d90 into containerd:release/1.7 Jun 28, 2024
55 checks passed
@kiashok kiashok mentioned this pull request Jul 1, 2024
Merged
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

@thaJeztah thaJeztah thaJeztah approved these changes

@kiashok kiashok kiashok approved these changes

Assignees
No one assigned
Labels
needs-ok-to-test size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yyatmsft @k8s-ci-robot @thaJeztah @kiashok @dmcgowan
0