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-containers: upgrade version 3.1.0 -> 3.2.0 #6657

Closed
wants to merge 8 commits into from
Closed

kata-containers: upgrade version 3.1.0 -> 3.2.0 #6657

wants to merge 8 commits into from

Conversation

mfrw
Copy link
Member

@mfrw mfrw commented Nov 2, 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

What does the PR accomplish, why was it needed?
Fixes: #6656

Change Log
  • kata-containers: fix bogus date
  • kata-containers: upgrade version 3.1.0 -> 3.2.0
  • kata-containers: cgmanifest: update entry
  • kata-containers: drop patch setting dial_timeout=60 in favour of 45
  • kata-containers: drop patches that are already upstreamed
  • kata-containers: cosmetic fix to reorder patch numbers
Does this affect the toolchain?

NO

Associated issues
Links to CVEs
  • NA
Test Methodology
  • Local Build w/ & w/o RUN_CHECK=y
  • Pipeline build id: PR-6657

@microsoft-github-policy-service microsoft-github-policy-service bot added the main PR Destined for main label Nov 2, 2023
@mfrw mfrw marked this pull request as ready for review November 3, 2023 02:34
@mfrw mfrw requested review from a team as code owners November 3, 2023 02:34
ms-mahuber
ms-mahuber reviewed Nov 20, 2023
View reviewed changes
SPECS/kata-containers/kata-containers.spec
Patch1: 0004-Merged-PR-9806-Fix-enable_debug-for-hypervisor.clh.patch
Patch2: 0005-Merged-PR-9956-shim-avoid-memory-hotplug-timeout.patch
Patch3: runtime-reduce-uvm-high-mem-footprint.patch
Patch4: 0001-Append-systemd-kernel-cmdline-params-for-initrd.patch

BuildRequires: golang
Copy link
Contributor

Choose a reason for hiding this comment

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

Requires and Conficts sections:

  • kata-agent, kata-ksm-throttler, kata-proxy, kata-runtime, kata-shim don't make sense to me. I don't think those packages exist. @danmihai1 do you remember?
  • Requires: qemu-kvm-core: @danmihai1 should we leave this?

Copy link
Contributor

Choose a reason for hiding this comment

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

qemu-kvm-core: The dependency known to me is qemu-virtiofsd. Potentially we can refine the dependency.

ms-mahuber
ms-mahuber reviewed Nov 20, 2023
View reviewed changes
SPECS/kata-containers/kata-containers.spec
Patch6: drop-mut-for-variables-that-are-not-mutated.patch
Patch7: 0001-osbuilder-Add-support-for-CBL-Mariner.patch
Patch8: 0001-Append-systemd-kernel-cmdline-params-for-initrd.patch
Patch1: 0004-Merged-PR-9806-Fix-enable_debug-for-hypervisor.clh.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

Patches: @danmihai1 , @dallasd1 @sprt - can you confirm we will still want/need to keep the remaining patches?

Copy link
Contributor

Choose a reason for hiding this comment

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

0001-Append-systemd-kernel-cmdline-params-for-initrd.patch is still necessary. It's not in the kata-cc spec because we have this change in the source code.

Copy link
Contributor

Choose a reason for hiding this comment

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

Confirm we don't need Patch2 and Patch7 either.

ms-mahuber
ms-mahuber reviewed Nov 20, 2023
View reviewed changes
SPECS/kata-containers/runtime-reduce-uvm-high-mem-footprint.patch
@@ -17,22 +17,26 @@ current mechanism of requesting resources through pod Limit annotations:
ContainerCreating state

Testing: Manual testing, creating pods with Limits and without limits, and with two containers where each container has a limit, tested with integration in a SPEC file where the config variables were set via environment variables via the make command

Copy link
Contributor

Choose a reason for hiding this comment

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

I have manually compared the current (CBL-Mariner/main) and new patch file (this branch/PR) against 3.1 and against 3.2. The changes look good. This patch has been properly ported.

@mfrw mfrw force-pushed the mfrw/kata-containers-3.2.0 branch 2 times, most recently from f658319 to fd25c5f Compare November 22, 2023 02:11
@mfrw
kata-containers: fix bogus date
f351079 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: upgrade version 3.1.0 -> 3.2.0
d889562 
Drop already upstreamed patches. Modify and a patch to apply cleanly to
3.2.0

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: cgmanifest: update entry
c29dc25 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: drop patch setting dial_timeout=60 in favour of 45
b5a0386 
The default dial_timeout has been bumped from 30 -> 45 i upstream. Drop
the patch that sets this timeout as 60 seconds

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: drop patches that are already upstreamed
c27f167 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: cosmetic fix to reorder patch numbers
2bf6e46 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: update summary tag
a6e5a82 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw
kata-containers: use microsoft email id
400218e 
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
@mfrw mfrw force-pushed the mfrw/kata-containers-3.2.0 branch from 09a2296 to 400218e Compare February 5, 2024 03:57
@mfrw mfrw requested a review from a team as a code owner February 5, 2024 03:57
mfrw
mfrw commented Feb 10, 2024
View reviewed changes
Copy link
Member Author

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

Superseded by:

@mfrw mfrw closed this Feb 10, 2024
@mfrw mfrw deleted the mfrw/kata-containers-3.2.0 branch February 10, 2024 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sprt sprt sprt left review comments

@ms-mahuber ms-mahuber ms-mahuber left review comments

@dallasd1 dallasd1 dallasd1 left review comments

@anphel31 anphel31 anphel31 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.
5 participants
@mfrw @sprt @anphel31 @ms-mahuber @dallasd1