Skip to content

Conversation

@Camelron
Copy link

@Camelron Camelron commented Feb 11, 2025

Merge Checklist
Summary

Introduce logic to install the new schema of UVM images/components for kata containers and kata-cc, which are as follows:

kata-containers.img
kata-containers-debug.img
kata-containers-cc.img
kata-containers-cc-debug.img

Associated igvm, igvm-debug files for CC now map to the -cc and -cc-debug images respectively. This will allow for greater flexibility in composing these UVM images, allowing us to have different package compositions for production vs. debug pod sandboxes.

Test Methodology

@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch from fc188da to 31d168a Compare February 28, 2025 22:44
@Camelron Camelron changed the title Introduce UVM_BUILD_TYPE configuration for consuming kata-packages-uvm-debug metapackage Rework kata, kata-cc images into release and debug images with different package compositions. Feb 28, 2025
@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch 2 times, most recently from acd7a0e to 0f3c52f Compare March 5, 2025 21:21
@Camelron Camelron marked this pull request as ready for review March 6, 2025 17:28
@Camelron Camelron requested review from a team as code owners March 6, 2025 17:28
@Camelron Camelron added the upstream/not-needed PRs that will not be upstreamed (e.g. internal) label Mar 6, 2025
@sprt
Copy link

sprt commented Mar 6, 2025

Can you fix the commit message check? Probably easier to squash into 1 and paste your PR description into that.

@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch 2 times, most recently from 8c35600 to fa81c2f Compare March 6, 2025 19:10
@christopherco christopherco requested a review from Copilot March 7, 2025 03:34
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

PR Overview

This PR reworks the kata and kata-cc image composition to support separate release and debug images with distinct package sets.

  • Removed the AGENT_POLICY_FILE configuration option from the README in the azure-linux builder documentation.
  • Updated documentation to align with the new UVM image/component schema.

Reviewed Changes

File Description
tools/osbuilder/node-builder/azure-linux/README.md Updated the confpods section by removing the AGENT_POLICY_FILE parameter to reflect the new image schema.

Copilot reviewed 11 out of 11 changed files in this pull request and generated no comments.

Comments suppressed due to low confidence (1)

tools/osbuilder/node-builder/azure-linux/README.md:173

  • The removal of the AGENT_POLICY_FILE parameter should be clearly documented. Ensure that any related usage references or instructions are updated to reflect that this option is no longer available.
* `AGENT_POLICY_FILE`: Specify `allow-set-policy.rego` (default) to use

@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch 2 times, most recently from 81d3c33 to 4cae2dc Compare March 7, 2025 18:36
@manuelh-dev
Copy link

Can you fix the commit message check? Probably easier to squash into 1 and paste your PR description into that.

Maybe good to factor the clean-rootfs change out in a separate commit

Introduce clean-rootfs target in osbuilder Makefile to facilitate
building multiple subsequent UVM files with different compostitions.

To this end, also pipe a new UVM_BUILD_TYPE flag for IGVM build type.

Signed-off-by: Cameron Baird <[email protected]>
Copy link

@sprt sprt left a comment

Choose a reason for hiding this comment

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

Mostly GTM. Let's also modifiy the Debug builds section of the readme so that those commands only build once (and not both release/debug).

@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch 4 times, most recently from fe95aba to 64995e8 Compare March 10, 2025 21:16
@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch from 64995e8 to 7c556eb Compare March 10, 2025 23:31
@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch from 7c556eb to 1926579 Compare March 11, 2025 17:40
Conditionally install kata-packages-uvm-debug metapackage

Install image as kata-containers-debug.img if debug image is built; update debug config image field

Make uvm_build/install build both release and debug images

Signed-off-by: Cameron Baird <[email protected]>
@Camelron Camelron force-pushed the cameronbaird/debug-metapackage branch from 1926579 to fd01f01 Compare March 11, 2025 20:54
@Camelron Camelron merged commit 5ea7cf5 into msft-main Mar 11, 2025
45 of 55 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream/not-needed PRs that will not be upstreamed (e.g. internal)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants