Skip to content

fix: upgrade cloud-init to v23.4.1#7065

Merged
christopherco merged 3 commits intomicrosoft:mainfrom
christopherco:chrco/cloud-init-23.4
Dec 23, 2023
Merged

fix: upgrade cloud-init to v23.4.1#7065
christopherco merged 3 commits intomicrosoft:mainfrom
christopherco:chrco/cloud-init-23.4

Conversation

@christopherco
Copy link
Copy Markdown
Collaborator

@christopherco christopherco commented Dec 20, 2023

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 change upgrades cloud-init to v23.4.1. This version contains fixes for an issue where some Azure Stack implementations do not support IMDS. Also this cloud-init version has the override data source patch integrated so we can drop the patch from our packaging.

Signed-off-by: Chris Co chrco@microsoft.com

Does this affect the toolchain?

NO

Associated issues
Links to CVEs
Test Methodology

Fixes issue where some Azure Stack implementations do not support IMDS. Also
this cloud-init version has the override data source patch integrated so we
can drop the patch from our packaging.

Signed-off-by: Chris Co <chrco@microsoft.com>
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Dec 20, 2023
Signed-off-by: Chris Co <chrco@microsoft.com>
Between 23.3 and 23.4, cloud-init upstream renamed tools/render-cloudcfg to
tools/render-template

Signed-off-by: Chris Co <chrco@microsoft.com>
@christopherco christopherco marked this pull request as ready for review December 20, 2023 06:01
@christopherco christopherco requested review from a team as code owners December 20, 2023 06:01
Copy link
Copy Markdown
Contributor

@rmhsawyer rmhsawyer left a comment

Choose a reason for hiding this comment

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

Can you please add a test to make sure Azure deployment is Ok.

@christopherco
Copy link
Copy Markdown
Collaborator Author

Marketplace smoke test passed and able to deploy on Azure VM

azureuser@cbl-mariner [ ~ ]$ rpm -qa | grep cloud-init
cloud-init-23.4.1-1.cm2.noarch
cloud-init-azure-kvp-23.4.1-1.cm2.noarch

Penguinator LISAv3 tests on Marketplace image with this cloud-init update also succeeded - https://penguinatorstarter.powerappsportals.com/mytests/myjobs/results/?id=0031226a-54a1-ee11-92bd-000d3a7e5c4a

@christopherco christopherco merged commit fc07dc5 into microsoft:main Dec 23, 2023
jslobodzian added a commit that referenced this pull request Jan 5, 2024
henryli001 pushed a commit that referenced this pull request Jan 10, 2024
This change upgrades cloud-init to v23.4.1. This version contains fixes for an issue where some Azure Stack implementations do not support IMDS. Also this cloud-init version has the override data source patch integrated so we can drop the patch from our packaging.

Signed-off-by: Chris Co <chrco@microsoft.com>
jslobodzian added a commit that referenced this pull request Jan 11, 2024
christopherco added a commit to christopherco/CBL-Mariner that referenced this pull request Jan 11, 2024
christopherco added a commit to christopherco/CBL-Mariner that referenced this pull request Jan 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants