[release-4.7] Bug 1995810: crio: complete crio default config #2725
Conversation
Instead of relying on /etc/crio/crio.conf (shipped in the cri-o rpm) for fields, we should import all relevant fields into MCO. This will allow us to eventaully use MCO to remove /etc/crio/crio.conf (and have the rpm stop shipping it). We do this because there exists a strange interaction with rpm-ostree and old version of MCO, where all files in `/etc/ are treated as `%config(noreplace)`. In this case, from ostree's PoV the file was "manually" modified (by the MCO), then the MCO stopped modifying it. ostree doesn't know that though, so the file became "unmanaged state". However, this unmanaged state causes updates to the rpm to not translate to the disk, and there remains a stale `conmon = "/usr/libexec/crio/conmon"` line in /etc/crio/crio.conf, which causes nodes to not come up. Instead of allowing nodes to not come up, we populate the MCO template with all relevant fields in the cri-o rpm (including "conmon" option, even though it's being set to the default), which will override the stale config, and allow us to eventually remove it from the rpm and remove it from disk in MCO. Signed-off-by: Peter Hunt <pehunt@redhat.com>
openshift-ci
bot
added
bugzilla/severity-high
|
@wking: This pull request references Bugzilla bug 1995810, which is invalid:
Comment In response to this:
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/test-infra repository. |
deads2k
added
the
cherry-pick-approved
|
(patch manager) blocker bug |
openshift-ci
bot
added
the
approved
kikisdeliveryservice
changed the title
|
@wking: The following tests failed, say
Full PR test history. Your PR dashboard. 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/test-infra repository. I understand the commands that are listed here. |
|
/bugzilla cc-qa |
|
@jianzhangbjz: This pull request references Bugzilla bug 1995810, which is invalid:
Comment In response to this:
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/test-infra repository. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kikisdeliveryservice, sinnykumari, wking The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/skip |
|
/bugzilla refresh |
|
@deads2k: This pull request references Bugzilla bug 1995810, which is invalid:
Comment In response to this:
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/test-infra repository. |
|
/bugzilla refresh Recalculating validity in case the underlying Bugzilla bug has changed. |
|
@openshift-bot: This pull request references Bugzilla bug 1995810, which is invalid:
Comment In response to this:
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/test-infra repository. |
wking
added
bugzilla/valid-bug
|
@wking: All pull requests linked via external trackers have merged: Bugzilla bug 1995810 has been moved to the MODIFIED state. In response to this:
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/test-infra repository. |
|
Still not quite verified, but we're optimistic, and can keep rolling forward. I've twiddled the labels to get this landed, to make next week's QE verification easier. |
Backporting #2724 to 4.7.