[1.17] Add support for crio drop-in config files#3172
[1.17] Add support for crio drop-in config files#3172openshift-merge-robot merged 1 commit intocri-o:release-1.17from
Conversation
We now support partial drop-in configuration files which will be assembled together on CRI-O startup. A default (or user specified via the CLI) directory will be recursively iterated, whereas each file gets applied to the configuration in their processing order. This means that a configuration file named `/etc/crio/crio.conf.d/00-default` has a lower priority than a file `/etc/crio/crio.conf.d/01-my-config`. The file provided via `--config,-c` always has a higher priority than those inside the `--config-dir,-d`, whereas the command line parameters always have the highest configuration priority at all. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report
@@ Coverage Diff @@
## release-1.17 #3172 +/- ##
================================================
+ Coverage 45.41% 45.46% +0.04%
================================================
Files 90 90
Lines 7543 7553 +10
================================================
+ Hits 3426 3434 +8
- Misses 3819 3820 +1
- Partials 298 299 +1 |
|
/retest |
1 similar comment
|
/retest |
|
/lgtm |
|
/retest |
|
/retest love me some network flakes from quay |
|
/retest |
We now support partial drop-in configuration files which will be
assembled together on CRI-O startup.
A default (or user specified via the CLI) directory will be recursively
iterated, whereas each file gets applied to the configuration in their
processing order. This means that a configuration file named
/etc/crio/crio.conf.d/00-defaulthas a lower priority than a file/etc/crio/crio.conf.d/01-my-config. The file provided via--config,-calways has a higher priority than those inside the--config-dir,-d, whereas the command line parameters always have thehighest configuration priority at all.
Signed-off-by: Sascha Grunert sgrunert@suse.com
- What I did
- How I did it
- How to verify it
- Description for the changelog