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

chore: use the Engine API from containerd-shim-wasm crate #148

Merged
merged 14 commits into from
Sep 21, 2023

Conversation

Mossaka
Copy link
Member

@Mossaka Mossaka commented Sep 11, 2023

This commits updates to use the latest API from the containerd-shim-wasm crate. It follows the PR containerd/runwasi#293

FYI: @jprendes

Copy link
Contributor

@jprendes jprendes left a comment

Choose a reason for hiding this comment

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

Most of the comments are just suggestion. The main thing that needs fixing is that the default can_handle is not suitable for most of the shims (it might be ok for lunatic).

Could you rename the executor.rs files to engine.rs?

I think many of the crates dependencies can be dropped now, just to take some examples from lunatic's Cargo.toml:

  • libcontainer
  • nix
  • serde
  • serde_json
  • thiserror
  • libc
  • chrono
  • oci-spec
  • utils
  • clap (needs removing the derive(Args) in common.rs)

But all shims could use a little clean up.

Also I believe the utils crate be removed.

containerd-shim-lunatic-v1/src/executor.rs Outdated Show resolved Hide resolved
containerd-shim-lunatic-v1/src/executor.rs Outdated Show resolved Hide resolved
containerd-shim-lunatic-v1/src/executor.rs Outdated Show resolved Hide resolved
containerd-shim-lunatic-v1/src/executor.rs Show resolved Hide resolved
containerd-shim-lunatic-v1/src/main.rs Outdated Show resolved Hide resolved
containerd-shim-slight-v1/src/executor.rs Outdated Show resolved Hide resolved
containerd-shim-spin-v1/src/executor.rs Show resolved Hide resolved
containerd-shim-wws-v1/src/executor.rs Outdated Show resolved Hide resolved
containerd-shim-wws-v1/src/executor.rs Show resolved Hide resolved
containerd-shim-wws-v1/src/executor.rs Outdated Show resolved Hide resolved
@Mossaka
Copy link
Member Author

Mossaka commented Sep 19, 2023

Thanks for your careful review of this PR! @jprendes

I have resolved all your comments. Could you PTAL?

Copy link
Contributor

@jprendes jprendes left a comment

Choose a reason for hiding this comment

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

LGTM!

Mossaka and others added 14 commits September 21, 2023 10:06
This commits updates to use the latest API from the `containerd-shim-wasm` crate.
It follows the PR containerd/runwasi#293

Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Co-authored-by: Jorge Prendes <jorge.prendes@gmail.com>
Co-authored-by: Jorge Prendes <jorge.prendes@gmail.com>
Co-authored-by: Jorge Prendes <jorge.prendes@gmail.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
Signed-off-by: jiaxiao zhou <jiazho@microsoft.com>
@Mossaka Mossaka merged commit ec90462 into deislabs:main Sep 21, 2023
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants