Skip to content

treefile: merge 'repo-metadata' config#5471

Merged
cgwalters merged 1 commit intocoreos:mainfrom
champtar:repo_metadata
Aug 26, 2025
Merged

treefile: merge 'repo-metadata' config#5471
cgwalters merged 1 commit intocoreos:mainfrom
champtar:repo_metadata

Conversation

@champtar
Copy link
Contributor

This change allow to set the 'repo-metadata' option into the base manifest file instead of being forced to set it into the leaf manifest file (the one with the last include).

We now serialize 'repo-metadata: inline', causing an input hash change for people explicitely setting the default.

@openshift-ci
Copy link

openshift-ci bot commented Aug 25, 2025

Hi @champtar. Thanks for your PR.

I'm waiting for a coreos member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request refactors the repo-metadata configuration option to allow it to be merged from included treefiles. This is achieved by changing its type from a raw enum to an Option<enum>, which correctly models its optional nature and allows the existing merge logic to apply. The changes are well-implemented, including necessary updates to accessor functions and cleanups of related code. The documentation has also been updated to reflect the correct kebab-casing for the option name. A side effect of this change is that explicitly setting the default value for repo-metadata will now affect the input hash, which is a reasonable and more correct behavior. Overall, the changes are solid and improve the configuration flexibility.

This change allow to set the 'repo-metadata' option into
the base manifest file instead of being forced to set it
into the leaf manifest file (the one with the last include).

We now serialize 'repo-metadata: inline', causing an input
hash change for people explicitely setting the default.
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

Guessing here: Are you disabling the repo metadata (for reproducibility reasons?)

@cgwalters cgwalters merged commit da01681 into coreos:main Aug 26, 2025
17 checks passed
@champtar champtar deleted the repo_metadata branch August 26, 2025 20:38
@champtar
Copy link
Contributor Author

Guessing here: Are you disabling the repo metadata (for reproducibility reasons?)

Yes, I'm aiming for 100% reproducible ostree commits and containers

@cgwalters
Copy link
Member

Yes, I'm aiming for 100% reproducible ostree commits and containers

Makes sense. That's the kind of thing that I find really useful in commit messages. I wasn't going to block on it but basically just a single sentence like:

This way it's easy for me to disable the repo metadata so I can more easily get reproducible builds.

Is so useful for people in the future.

@champtar
Copy link
Contributor Author

I wasn't going to block on it

I don't mind, don't hesitate next time

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants