Skip to content

Conversation

@dcantah
Copy link
Member

@dcantah dcantah commented Dec 17, 2020

  • Update hcsshim to v0.8.14
  • Update go-winio to v0.4.16

This brings in some vhd package changes from winio, and the compute storage api bindings for
the shim. This is to facilitate some coming functionality for the windows snapshotter
as well as possibly for future work down the line for the windows differ.

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.

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.

@dcantah
Copy link
Member Author

dcantah commented Dec 17, 2020

Copy link
Member

@kevpar kevpar left a comment

Choose a reason for hiding this comment

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

LGTM (not a maintainer)

@kevpar
Copy link
Member

kevpar commented Dec 17, 2020

Nevermind. From CI failure, looks like go.mod may not be fully up to date. Can you double check that?

@dcantah dcantah force-pushed the update-hcsshim-winio branch from 6ac6dc6 to b3e05d1 Compare December 17, 2020 19:16
@dcantah
Copy link
Member Author

dcantah commented Dec 17, 2020

@kevpar Done!

@kevpar
Copy link
Member

kevpar commented Dec 17, 2020

Looks like we have some more failures. Not sure about the Linux ones, but the Windows one is probably that we nil-dereference when no shim options are passed here: https://github.com/microsoft/hcsshim/blob/master/cmd/containerd-shim-runhcs-v1/task_hcs.go#L153

@dcantah
Copy link
Member Author

dcantah commented Dec 17, 2020

Linux ones seem to be the same old devmapper and loop device ones that keep failing, but yep that seems to be the culprit. I'll push a fix

@dcantah dcantah force-pushed the update-hcsshim-winio branch 3 times, most recently from e61248a to f0a99d5 Compare December 17, 2020 22:12
@dcantah
Copy link
Member Author

dcantah commented Dec 18, 2020

Line ending issue because one of the checked in files in our repo is crlf. Fixing shortly

Edit: Fixed 😄

@dcantah dcantah force-pushed the update-hcsshim-winio branch from f0a99d5 to 8f0d3ee Compare December 19, 2020 00:12
@theopenlab-ci
Copy link

theopenlab-ci bot commented Dec 19, 2020

Build succeeded.

* Update hcsshim to v0.8.14
* Update go-winio to v0.4.16

This brings in some vhd package changes from winio, and the compute storage api bindings for
the shim. This is to facilitate some coming functionality for the windows snapshotter
as well as possibly for future work down the line for the windows differ.

Signed-off-by: Daniel Canter <[email protected]>
@dcantah dcantah force-pushed the update-hcsshim-winio branch from 8f0d3ee to a551492 Compare December 19, 2020 00:56
@theopenlab-ci
Copy link

theopenlab-ci bot commented Dec 19, 2020

Build succeeded.

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

@AkihiroSuda AkihiroSuda merged commit 9d98f88 into containerd:master Dec 28, 2020
dcantah added a commit to dcantah/containerd that referenced this pull request Jan 18, 2021
* Currently we rely on making the UVMs sandbox.vhdx in the shim itself instead of this being
made by the snapshotter itself. This change adds a label that affects whether to create the UVMs
scratch layer in the snapshotter itself.

* Adds container scratch size customization. Before adding the computestorage calls
(vendored in with containerd#4859) there was no way to make a containers
or UVMs scratch size less than the default (20 for containers and 10 for the UVM).

Signed-off-by: Daniel Canter <[email protected]>
dcantah added a commit to dcantah/containerd that referenced this pull request Feb 22, 2021
* Currently we rely on making the UVMs sandbox.vhdx in the shim itself instead of this being
made by the snapshotter itself. This change adds a label that affects whether to create the UVMs
scratch layer in the snapshotter itself.

* Adds container scratch size customization. Before adding the computestorage calls
(vendored in with containerd#4859) there was no way to make a containers
or UVMs scratch size less than the default (20 for containers and 10 for the UVM).

Signed-off-by: Daniel Canter <[email protected]>
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