[master] Fix 64433: Add dynamic loading of file_roots, pillar_roots, and thorium_roots - #64434
bluesliverx wants to merge 11 commits into
Conversation
d98a6c9 to
01f7eb3
Compare
Ch3LL
left a comment
Ch3LL
left a comment
There was a problem hiding this comment.
Can we get some additional test coverage that actually tests the full functionality. For example, adding a new directory path to file roots and being able to call that SLS file and same for pillar.
I'd like to also get some additional reviews on this.
53f0ce3 to
6f71681
Compare
|
@Ch3LL I have added tests and updated the documentation as requested. Let me know if you see anything else. |
|
@twangboy, this is ready now I believe. |
|
How does one go about getting this merged? :) |
|
I'm thinking we'll get things fixed on 3006.x and 3007.x, then merge those forward into master. Then we can rebase and get this in. |
|
@twangboy sorry to be annoying, any update on getting this merged in? Just curious. |
|
@twangboy I am getting really annoying, I'm sure. But any help getting this merged in time for 3008 would be much appreciated so we can stop maintaining our own patch :) |
|
When we get closer to release we will start merging pending PRs into master branch that are passing tests. |
|
Please rebase this PR and fix conflicts |
|
@twangboy done |
|
@bluesliverx needs rebase |
|
@dwoz rebased |
|
Please address the merge conflicts |
|
@twangboy done |
… cache Fixes 3 issues from PR review: items() wasn't overridden so callers (e.g. salt/client/ssh) iterating file_roots.items() got raw unglobbed paths; __deepcopy__ had a redundant overwrite that becomes a real double-evaluation bug once items() is fixed; and glob expansion ran unbounded on every access. Adds a per-entry TTL cache (default 5s), exposed as the dynamic_roots_ttl config option for file_roots, pillar_roots, and thorium_roots.
|
@twangboy this should be ready I believe, any chance of getting this merged in finally? Hopefully soon... |
This branch was successfully deployed
6 participants
What does this PR do?
Adds dynamic expansion of file/pillar/thorium roots config.
What issues does this PR fix or reference?
Fixes: #64433
Previous Behavior
The roots were expanded only once at startup.
New Behavior
The roots are expanded on every access of the environments within the
file_roots,pillar_roots, andthorium_rootsoptions.Merge requirements satisfied?
Commits signed with GPG?
No