Update dmverity tool to take a directory as input to create a VHD by hgarvison · Pull Request #2274 · microsoft/hcsshim

hgarvison · 2024-09-24T18:50:18Z

Update dmverity tool to take a file directory as input, tar it, and create a VHD.

helsaawy · 2024-09-24T19:56:39Z

i am not sure the tar creation should be part of dmverity/our package, since we are basically always guaranteed that tar/tar.exe is available on whatever machine we run on
or am i missing something?

hgarvison · 2024-09-24T20:50:44Z

@helsaawy the tar creation is taking a directory of files and tarring it so that it can be run through the tooling to generate a VHD with the merkel tree. This is for the scenario where we are not creating a VHD from image layers, but rather, a directory of other files and subdirectories.

helsaawy · 2024-09-24T21:23:53Z

This is for the scenario where we are not creating a VHD from image layers, but rather, a directory of other files and subdirectories.

in that scenario, can't you just call tar -cf layer.tar -C directory . to create the tarball?

hgarvison · 2024-09-25T15:43:30Z

This is for the scenario where we are not creating a VHD from image layers, but rather, a directory of other files and subdirectories.

in that scenario, can't you just call tar -cf layer.tar -C directory . to create the tarball?

Yes, but that adds an extra step for the user.

anmaxvl · 2024-09-25T19:49:26Z

This is for the scenario where we are not creating a VHD from image layers, but rather, a directory of other files and subdirectories.

in that scenario, can't you just call tar -cf layer.tar -C directory . to create the tarball?

Yes, but that adds an extra step for the user.

I don't think that this should be dmverity-vhd's responsibility to tar though... I feel like we can add functionality to convert non-image tars to VHDs with verity, but the caller should do the tar.

…rosoft#2270) Make tar2ext4 deterministic with files without parent dir in tar Signed-off-by: Takuro Sato <takurosato@microsoft.com> Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

helsaawy

LGTM

cmd/dmverity-vhd/main.go

When creating HCS doc for SNP UVM with verity boot, the SCSI controllers are overriden to always have only a single SCSI controller. This limits the max number of container layers to 64. Signed-off-by: Maksim An <maksiman@microsoft.com> Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

Resolving comment to keep image flag available Co-authored-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

cmd/dmverity-vhd/main.go

Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

cmd/dmverity-vhd/main.go

Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

This PR updates the ADO main mirror to c65b789 in line with upstream main This includes the following changes: - Fix issue with mask length of gateway addresses microsoft#2305 - Fixing endpoint type microsoft#2289 - Update dmverity tool to take a directory as input to create a VHD microsoft#2274 - Update containerd to v1.7.23 microsoft#2293 - Update go version to 1.22 microsoft#2300 - add `longPathAware` to shim manifest microsoft#2303 ---- #### AI description (iteration 1) #### PR Classification Code cleanup and enhancement. #### PR Summary Refactored error definitions to improve error handling and mapping to grpc errors. - `vendor/github.com/containerd/errdefs/errors.go`: Replaced simple error variables with structured error types, added detailed error interfaces and helper functions for better error identification and handling. Related work items: microsoft#2274, microsoft#2279, microsoft#2287, microsoft#2293

hgarvison requested a review from a team as a code owner September 24, 2024 18:50

hgarvison force-pushed the main branch 2 times, most recently from 46bbdf9 to ea8559a Compare September 24, 2024 19:11

msscotb assigned anmaxvl and helsaawy Sep 25, 2024

hgarvison force-pushed the main branch from dd49998 to e95ca43 Compare September 27, 2024 17:41

Make tar2ext4 deterministic with files without parent dir in tar (mic…

4859270

…rosoft#2270) Make tar2ext4 deterministic with files without parent dir in tar Signed-off-by: Takuro Sato <takurosato@microsoft.com> Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

hgarvison force-pushed the main branch from e95ca43 to 4cd37d0 Compare September 27, 2024 17:41

helsaawy approved these changes Oct 3, 2024

View reviewed changes

cmd/dmverity-vhd/main.go Outdated Show resolved Hide resolved

anmaxvl and others added 3 commits October 7, 2024 12:41

update dmverity tool to take directory as input to create a VHD

b5eb610

Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

Update cmd/dmverity-vhd/main.go

6027648

Resolving comment to keep image flag available Co-authored-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com> Signed-off-by: Heather Garvison <hgarvison@microsoft.com>

hgarvison force-pushed the main branch from 97a38e5 to 6027648 Compare October 7, 2024 16:41