Skip to content

kata-containers: add support for virtio-blk based kata pod sandboxing#12713

Open
miz060 wants to merge 1 commit into3.0-devfrom
mitchzhu/tardev-sandbox
Open

kata-containers: add support for virtio-blk based kata pod sandboxing#12713
miz060 wants to merge 1 commit into3.0-devfrom
mitchzhu/tardev-sandbox

Conversation

@miz060
Copy link
Member

@miz060 miz060 commented Mar 1, 2025 •
edited
Loading

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge
Summary

This PR adds changes to support virtio-blk based kata pod sandboxing solution.
Matching kata-containers change: microsoft/kata-containers#324

Change Log
  • Extract the tardev package from kata-containers-cc and set it up as a proper dependency in kata-containers
  • Add necessary virtio-blk dependencies to the vanilla Kata Containers UVM
Does this affect the toolchain?

NO

Test Methodology

@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Mar 1, 2025
@miz060 miz060 force-pushed the mitchzhu/tardev-sandbox branch from 4645bfc to a0adfef Compare March 5, 2025 02:40
@miz060 miz060 changed the title kata-containers: elimiate virtio-fs storage kata-containers: separating out tardev package from kata-containers-cc Mar 5, 2025
@miz060 miz060 changed the title kata-containers: separating out tardev package from kata-containers-cc kata-containers: extract tardev-snapshotter from kata-containers-cc, and virtio-blk dependencies to vanilla kata UVM Mar 19, 2025
@miz060 miz060 changed the title kata-containers: extract tardev-snapshotter from kata-containers-cc, and virtio-blk dependencies to vanilla kata UVM kata-containers: extract tardev-snapshotter from kata-containers-cc; add virtio-blk dependencies to vanilla kata UVM Mar 19, 2025
@miz060 miz060 changed the title kata-containers: extract tardev-snapshotter from kata-containers-cc; add virtio-blk dependencies to vanilla kata UVM kata-containers: add support for virtio-blk based kata pod sandboxing Mar 19, 2025
@miz060 miz060 force-pushed the mitchzhu/tardev-sandbox branch from c0b16c3 to cab5668 Compare March 19, 2025 01:20
@miz060 miz060 marked this pull request as ready for review March 19, 2025 07:20
@miz060 miz060 requested a review from a team as a code owner March 19, 2025 07:20
miz060
miz060 commented Mar 19, 2025
View reviewed changes
SPECS/kata-packages-uvm/kata-packages-uvm.spec

%changelog
* Tue Feb 11 2025 Cameron Baird <cameronbaird@microsoft.com> - 1.0.0-9
- Introduce debug metapackage
Copy link
Member Author

@miz060 miz060 Mar 19, 2025

Choose a reason for hiding this comment

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

FYI cherry-picked from #12298.
Current plan is to merge after this one.

Copy link
Contributor

@manuelh-dev manuelh-dev Mar 21, 2025

Choose a reason for hiding this comment

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

Best to remove things from your commit/branch that you do not add. Let's get to a baseline diff of the changes you want to introduce invidually.

@miz060 miz060 force-pushed the mitchzhu/tardev-sandbox branch from c086e07 to fa4c20f Compare March 19, 2025 18:08
manuelh-dev
manuelh-dev reviewed Mar 21, 2025
View reviewed changes
SPECS/kata-containers-cc/kata-containers-cc.signatures.json
@@ -1,6 +1,6 @@
{
"Signatures": {
"kata-containers-3.2.0.azl4-cargo.tar.gz": "2a242deedddbd01b50b56d9f6d02ffd3f40cb2e91221fda4f4b4791d98404f96",
Copy link
Contributor

@manuelh-dev manuelh-dev Mar 21, 2025

Choose a reason for hiding this comment

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

please remove these changes for a pull request. please prepare or contribute to a branch that can be used as the base branch for the Kata CI pipeline which ingests the new release sources. The PR title should then be 'update kata-containers package to azl3.2.0.5 or similar'

manuelh-dev
manuelh-dev reviewed Mar 21, 2025
View reviewed changes
SPECS/kata-containers-cc/kata-containers-cc.spec
This package contains the scripts and files required to build the UVM

%package tardev
Summary: tardev-snapshotter for Kata Containers
Copy link
Contributor

@manuelh-dev manuelh-dev Mar 21, 2025

Choose a reason for hiding this comment

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

tardev-snapshotter is not necessarily tied to kata containers. we should rephrase to express its more generic purpose

manuelh-dev
manuelh-dev reviewed Mar 21, 2025
View reviewed changes
SPECS/kata-containers-cc/kata-containers-cc.spec
%files tardev
%{_bindir}/tardev-snapshotter
%{_unitdir}/tardev-snapshotter.service
%{_sbindir}/mount.tar
Copy link
Contributor

@manuelh-dev manuelh-dev Mar 21, 2025

Choose a reason for hiding this comment

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

We will also need to remove mount.tar and kata-overlay from above files!?

manuelh-dev
manuelh-dev reviewed Mar 21, 2025
View reviewed changes
SPECS/kata-containers/kata-containers.spec
%{kata_bin}/kata-runtime

%{defaults_kata}/configuration.toml
%{defaults_kata}/configuration-clh-debug.toml
Copy link
Contributor

@manuelh-dev manuelh-dev Mar 21, 2025

Choose a reason for hiding this comment

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

Why is this line relevant for this PR?

manuelh-dev
manuelh-dev suggested changes Mar 21, 2025
View reviewed changes
Copy link
Contributor

@manuelh-dev manuelh-dev left a comment

Choose a reason for hiding this comment

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

See comments, let's rather make this a base branch for a future PR which upgrades to a new fork release

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@manuelh-dev manuelh-dev manuelh-dev requested changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Packaging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@miz060 @manuelh-dev