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.

Sign up for GitHub

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

Jump to bottom

Kata: Release v3.2.0.azl0 for both vanilla and CC based on aligned sources #6942

Merged
merged 5 commits into from
Feb 15, 2024
Merged

Kata: Release v3.2.0.azl0 for both vanilla and CC based on aligned sources #6942

merged 5 commits into from
Feb 15, 2024

Conversation

sprt
Copy link
Contributor

@sprt sprt commented Dec 7, 2023 •
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 (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/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 upgrades both vanilla Kata and Kata-CC to v3.2.0.azl0, which is based on upstream v3.2.0 plus some Microsoft changes. The sources for both packages are now identical and they differ only in build flags and runtime components (e.g. IGVM vs initrd).

Depends on: microsoft/kata-containers#154

Minor limitation to be addressed in the next release: https://microsoft.visualstudio.com/OS/_workitems/edit/48983660

Does this affect the toolchain?

NO

Testing

Conformance: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=505034&view=results
Buddy build against PR branch (rather than our internal Kata automation): https://dev.azure.com/mariner-org/mariner/_build/results?buildId=505943&view=results

@microsoft-github-policy-service microsoft-github-policy-service bot added the main PR Destined for main label Dec 7, 2023
@sprt sprt mentioned this pull request Dec 15, 2023
Merged
@sprt sprt mentioned this pull request Jan 12, 2024
Merged
5 tasks
@sprt sprt changed the title Update kata-containers-cc spec to align with new sources kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 22, 2024
@sprt sprt changed the title kata-containers-cc: generate configuration-clh-snp-debug.toml [BLOCKED] kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 22, 2024
@sprt sprt requested a review from ms-mahuber January 22, 2024 21:37
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
@sprt
config: don't hardcode confidential_guest=true for clh
8ee6a96 
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in
microsoft/azurelinux#6942.  Already done this way
upstream.

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
@sprt
config: don't hardcode confidential_guest=true for clh
4be2127 
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.  Already
done this way upstream.

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
@sprt sprt changed the title [BLOCKED] kata-containers-cc: generate configuration-clh-snp-debug.toml kata-containers-cc: generate configuration-clh-snp-debug.toml Jan 24, 2024
sprt added a commit to microsoft/kata-containers that referenced this pull request Jan 24, 2024
@sprt
config: don't hardcode confidential_guest=true for clh
fb4c887 
Doesn't make sense for non-TEEs and was only a remnant of cc-msft-prototypes.
This will have to be taken into account in microsoft/azurelinux#6942.

[upstream-merged] Already done this way upstream.

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
@sprt sprt mentioned this pull request Jan 24, 2024
Merged
6 tasks
@sprt sprt changed the title kata-containers-cc: generate configuration-clh-snp-debug.toml Adapt Kata specs for msft-main Jan 25, 2024
@sprt sprt force-pushed the sprt/katacc-new-branch branch 2 times, most recently from 55eab9b to fef926c Compare January 25, 2024 23:58
@sprt sprt changed the title Adapt Kata specs for msft-main [Kata] Align vanilla Kata sources with Kata-CC sources Jan 30, 2024
@sprt sprt force-pushed the sprt/katacc-new-branch branch 2 times, most recently from 9e161a8 to 34e7350 Compare January 31, 2024 17:29
@sprt sprt marked this pull request as ready for review January 31, 2024 17:46
@sprt sprt requested a review from a team as a code owner January 31, 2024 17:46
@mfrw mfrw mentioned this pull request Feb 10, 2024
Closed
12 tasks
@sprt sprt requested a review from a team as a code owner February 12, 2024 22:07
@sprt
kata-containers: adapt for msft-main sources
9130f64 
* Cleans up runtime make flags:
  * Set DEFVIRTIOFSDAEMON to the Rust binary path.
  * The following were redundant as we were setting the default:
    * DEFSHAREDFS (now DEFSHAREDFS_CLH_VIRTIOFS)
    * DEFVIRTIOFSCACHESIZE
    * DEFSANDBOXCGROUPONLY
    * DEFSTATICRESOURCEMGMT_CLH
  * The following were referring to macros that do NOT expand to a value:
    * QEMUPATH
    * MACHINETYPE
  * FEATURE_SELINUX does not exist in the Kata source code.
  * DEFENABLEANNOTATIONS should not be set to ".*".

* Removes all patches. See
  microsoft/kata-containers#122 (comment)
  for a discussion. Since then, the memory patch was included in msft-main
  and patch 0004 is included in microsoft/kata-containers#154.

* Adds BuildRequires for devmapper code paths in msft-main.

* Requires the new Rust virtiosfd 1.8.0.

* Ensures sed doesn't break symlinks. For configuration.toml, sed would
  convert that file from a symlink to a regular file, so it'd become out of
  sync with configuration-clh.toml. rootfs.sh isn't a symlink but added the flag
  as well for good measure.
@sprt
kata-containers-cc: generate configuration-clh-snp-debug.toml
b939771 
Also remove the explicit DEFSHAREDFS_CLH_SNP_VIRTIOFS=none as that is
the default.
@sprt
kata-containers-cc: set DEFSNPGUEST=true make flag
54e36c1 
I just changed the default to false to align with upstream, so we have to set
this here.
@sprt sprt changed the title [Kata] Align vanilla Kata sources with Kata-CC sources Kata: Release v3.2.0.azl0 for both vanilla and CC based on aligned sources Feb 13, 2024
@sprt sprt marked this pull request as draft February 14, 2024 20:23
@sprt
Copy link
Contributor Author

sprt commented Feb 15, 2024 •
edited
Loading

Pending e2e run to validate with genpolicy 0.6.2-5: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=506172&view=results

@sprt sprt marked this pull request as ready for review February 15, 2024 02:27
@sprt sprt merged commit 8acb776 into main Feb 15, 2024
11 checks passed
@sprt sprt deleted the sprt/katacc-new-branch branch February 15, 2024 16:43
Sumynwa added a commit that referenced this pull request Feb 16, 2024
@Sumynwa
Revert "Kata: Release v3.2.0.azl0 for both vanilla and CC based on al…
6c4c5eb 
…igned sources (#6942)"

This reverts commit 8acb776.

This PR is broken for aarch64 because of dependent virtiofsd package.
jslobodzian pushed a commit that referenced this pull request Feb 16, 2024
@Sumynwa
Revert "Kata: Release v3.2.0.azl0 for both vanilla and CC based on al…
c091748 
…igned sources (#6942)" (#7920)
eiffel-fl pushed a commit to eiffel-fl/CBL-Mariner that referenced this pull request Mar 1, 2024
@Sumynwa @eiffel-fl
Revert "Kata: Release v3.2.0.azl0 for both vanilla and CC based on al…
1d12bd7 
…igned sources (microsoft#6942)" (microsoft#7920)
jslobodzian added a commit that referenced this pull request Mar 7, 2024
@jslobodzian
Revert "Revert "Kata: Release v3.2.0.azl0 for both vanilla and CC bas…
4cb4cf9 
…ed on aligned sources (#6942)" (#7920)"

This reverts commit c091748.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danmihai1 danmihai1 danmihai1 left review comments

@dallasd1 dallasd1 dallasd1 left review comments

@ms-mahuber ms-mahuber ms-mahuber approved these changes

Assignees
No one assigned
Labels
main PR Destined for main
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sprt @danmihai1 @ms-mahuber @dallasd1