Skip to content

[1.17] Add support for crio drop-in config files#3172

Merged
openshift-merge-robot merged 1 commit intocri-o:release-1.17from
haircommander:crio-conf-d-1.17
Jan 31, 2020
Merged

[1.17] Add support for crio drop-in config files#3172
openshift-merge-robot merged 1 commit intocri-o:release-1.17from
haircommander:crio-conf-d-1.17

Conversation

@haircommander
Copy link
Member

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

- What I did

- How I did it

- How to verify it

- Description for the changelog

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>
@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 30, 2020
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 30, 2020
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2020
@openshift-ci-robot
Copy link

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@codecov
Copy link

codecov bot commented Jan 30, 2020

Codecov Report

Merging #3172 into release-1.17 will increase coverage by 0.04%.
The diff coverage is 80%.

@@               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

@saschagrunert
Copy link
Member

/retest

1 similar comment
@saschagrunert
Copy link
Member

/retest

@mrunalp
Copy link
Member

mrunalp commented Jan 31, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2020
@haircommander
Copy link
Member Author

/retest

@haircommander
Copy link
Member Author

/retest

love me some network flakes from quay

@haircommander
Copy link
Member Author

/retest

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants