Skip to content

[release/1.5 backport] Update hcsshim to 0.8.18#5715

Merged
dmcgowan merged 1 commit intocontainerd:release/1.5from
dcantah:backport-hcsshim-0.8.18
Jul 13, 2021
Merged

[release/1.5 backport] Update hcsshim to 0.8.18#5715
dmcgowan merged 1 commit intocontainerd:release/1.5from
dcantah:backport-hcsshim-0.8.18

Conversation

@dcantah
Copy link
Copy Markdown
Member

@dcantah dcantah commented Jul 12, 2021

Cherry-pick of #5673

Fixes #5094

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

This time it brings in quite a few new files as 1.5 was on 0.8.16 of hcsshim
and 0.8.17 brought in a few new things. 0.8.18 doesn't actually bring in any new
vendored files but the version of the runhcs-shim built is based off of the commit
that's vendored into Containerd, so we need to vendor the version that has the fix.

Signed-off-by: Daniel Canter [email protected]
(cherry picked from commit a81f05f)
Signed-off-by: Daniel Canter [email protected]

@k8s-ci-robot
Copy link
Copy Markdown

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.

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.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 12, 2021

Build succeeded.

@dcantah dcantah force-pushed the backport-hcsshim-0.8.18 branch from a635da2 to 711edc2 Compare July 12, 2021 14:55
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 12, 2021

Build succeeded.

@dcantah dcantah force-pushed the backport-hcsshim-0.8.18 branch from 711edc2 to f80851c Compare July 12, 2021 15:42
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 12, 2021

Build succeeded.

@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Jul 12, 2021

What's goin on here..

@estesp
Copy link
Copy Markdown
Member

estesp commented Jul 12, 2021

do you have the same version of Golang that's being used in release/1.5 where you are running the go mod commands for the commit(s)? That's usually been what has hit me before

@dmcgowan dmcgowan added this to the 1.5.3 milestone Jul 12, 2021
0.8.18 contains a fix for shim delete behavior, please see:
microsoft/hcsshim#1041

This time it brings in quite a few new files as 1.5 was on 0.8.16 of hcsshim
and 0.8.17 brought in a few new things. 0.8.18 doesn't actually bring in any new
vendored files but the version of the runhcs-shim built is based off of the commit
that's vendored into Containerd, so we need to vendor the version that has the fix.

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit a81f05f)
Signed-off-by: Daniel Canter <[email protected]>
@dcantah dcantah force-pushed the backport-hcsshim-0.8.18 branch from f80851c to a695a07 Compare July 12, 2021 21:15
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 12, 2021

Build succeeded.

@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Jul 12, 2021

@estesp Nope I was on 1.15 😮 That seemed to have done it, thanks! Weird though, I was on 1.15 when I made the initial PR also.

Copy link
Copy Markdown
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

@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Jul 12, 2021

fyi @jsturtevant

Copy link
Copy Markdown
Member

@mikebrow mikebrow 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 dmcgowan closed this Jul 12, 2021
@dmcgowan dmcgowan reopened this Jul 12, 2021
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jul 12, 2021

Build succeeded.

@dmcgowan dmcgowan merged commit 911cd57 into containerd:release/1.5 Jul 13, 2021
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.

5 participants