refactor: align jammy agent settings to cp+assets approach#646
Open
neddp wants to merge 1 commit into
Open
Conversation
Replace heredoc-based apply.sh scripts with static assets/agent.json files (the same approach already used on ubuntu-noble). This makes the two branches structurally identical so future jammy=>noble merge forwards cannot silently resolve apply.sh conflicts in favour of the wrong version. - Delete prelude_agent.bash (PartitionerType: parted is now inlined as a static field in each assets/agent.json, as the function has unconditionally returned that string since 59a9c29 in 2019) - Replace all 8 bosh_*_agent_settings/apply.sh heredocs with a single cp $assets_dir/agent.json line - Add assets/agent.json for every stage carrying the full config (including UseMonitIptablesFirewall added in 8104abd)
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (17)
💤 Files with no reviewable changes (1)
WalkthroughAcross eight IaaS-specific stemcell builder stages (AliCloud, AWS, Azure, CloudStack, Google, OpenStack, SoftLayer, vSphere), each Suggested Reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
cf-foundation-community-automation
Bot
moved this to Inbox
in Foundational Infrastructure Working Group
github-project-automation
Bot
moved this from Inbox
to Pending Merge | Prioritized
in Foundational Infrastructure Working Group
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace heredoc-based
apply.shscripts with staticassets/agent.jsonfiles (the same approach already used on ubuntu-noble). This makes the two branches structurally identical so future jammy->noble merge forwards cannot silently resolveapply.shconflicts in favor of the wrong version.As seen here: #644
prelude_agent.bash(PartitionerType: parted is now inlined as a static field in eachassets/agent.json, as the function has unconditionally returned that string since 59a9c29 in 2019)bosh_*_agent_settings/apply.shheredocs with a singlecp $assets_dir/agent.jsonlineassets/agent.jsonfor every stage carrying the full config (includingUseMonitIptablesFirewalladded in 8104abd)