Repository navigation
K2GO-444 refactor: ship code_addons as an overlay - #620
Merged
Merged
Conversation
Carry the role as a whole-file overlay like code_assets, not a unified-diff patch that edits two upstream files (6-generic-apps include, default_vars.yml) and can drift silently, shipping a box with no gallery. The overlay adds only new files, so nothing drifts. An overlay cannot add the include, so the main install no longer auto-runs the role; the bake runs it via runrole code_addons for Standard and Full, mirroring the code_assets step. Update the ADR.
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.
Carry the code_addons role as a whole-file overlay
(tools/upstream-patches/overlays/roles/code_addons/), like code_assets, instead
of a unified-diff patch. The patch edited two upstream-owned files (the
6-generic-apps include and vars/default_vars.yml); an upstream change to either
can make it drift and apply wrong with no crash, shipping a box with no add-ons
gallery.
Changes:
overlay; delete the patch. The two upstream edits are dropped.
runrole code_addonspost-install, gatedfor Standard and Full (Basic off), mirroring the code_assets step. An overlay
cannot add the include, so the main install no longer auto-runs the role.
Behavior: an add-ons mirror failure is now non-fatal at bake (|| warn), like
code_assets.
Verification:
bash -non the bake; apply-upstream-patches.sh --dry-runenumerates roles/code_addons/* as an overlay; mirror_addons.py reproduced
byte-identical. Device test pending on a fresh bake: confirm
http://box:8085/code-addons/ serves and the catalog loads.