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

[Vendor] Update hcsshim to 0.8.18 #5673

Merged
merged 1 commit into from
Jul 9, 2021
Merged

Conversation

dcantah
Copy link
Member

@dcantah dcantah commented Jun 30, 2021

0.8.18 contains a fix for shim delete behavior, please see:
microsoft/hcsshim#1041

There's no new vendored files as nothing from hcsshim/cmd/containerd-shim-runhcs-v1
gets imported here but for containerd releases the runhcs shim binary is built from whatever
commit is vendored into containerd.

This should resolve #5094

We'll need to additionally backport this to the 1.5 branch

Signed-off-by: Daniel Canter [email protected]

@k8s-ci-robot
Copy link

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

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 30, 2021

Build succeeded.

@theopenlab-ci
Copy link

theopenlab-ci bot commented Jun 30, 2021

Build succeeded.

0.8.18 contains a fix for shim delete behavior, please see:
microsoft/hcsshim#1041

There's no new vendored files as nothing from hcsshim/cmd/containerd-shim-runhcs-v1
gets imported here but for containerd releases the runhcs shim binary is built from whatever
commit is vendored into containerd.

Signed-off-by: Daniel Canter <[email protected]>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Jul 1, 2021

Build succeeded.

@dcantah
Copy link
Member Author

dcantah commented Jul 1, 2021

@kevpar
Copy link
Member

kevpar commented Jul 1, 2021

Good to mention that this resolves #5094. Will need a backport to 1.5.

@dcantah
Copy link
Member Author

dcantah commented Jul 1, 2021

@kevpar Good call, updated pr description

Copy link
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

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

We need to update files under vendor/ as well, like #5505.

@dcantah
Copy link
Member Author

dcantah commented Jul 2, 2021

@kzys This vendor shouldn't actually bring in any new files, the code changed was under a path that nothing in containerd actually imports. The windows shim binary is built out of this repo based on the version of hcsshim vendored so that's the reason for bumping to the new release.

@kzys
Copy link
Member

kzys commented Jul 2, 2021

@dcantah Oh I didn't know that and you've mentioned that in the PR description. Sorry!

@dcantah
Copy link
Member Author

dcantah commented Jul 2, 2021

@kzys No worries, thanks for review!

@kzys
Copy link
Member

kzys commented Jul 2, 2021

/ok-to-test

@kzys
Copy link
Member

kzys commented Jul 2, 2021

/retest

1 similar comment
@kzys
Copy link
Member

kzys commented Jul 6, 2021

/retest

@dcantah
Copy link
Member Author

dcantah commented Jul 6, 2021

@kzys Are the e2e node tests just flaky recently?

@kzys
Copy link
Member

kzys commented Jul 6, 2021

@dcantah Sadly yes. kubernetes/kubernetes#103429

@kzys
Copy link
Member

kzys commented Jul 9, 2021

/retest

@kzys
Copy link
Member

kzys commented Jul 9, 2021

@dcantah Kubernetes folks have fixed the test. We are good to go.

@containerd/committers Can someone take a look and merge?

@mxpv mxpv merged commit 0dcffc3 into containerd:main Jul 9, 2021
Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv
Copy link
Member

mxpv commented Jul 9, 2021

@estesp you're 10 seconds late :D

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.

Windows: The same container cannot be recreated in the same Pod
8 participants