Commits on Aug 19, 2021

1. crio: complete crio default config …

   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>

   

   haircommander authored and wking committed Aug 19, 2021
   Copy the full SHA

   d6809a1 View commit details

   Browse the repository at this point in the history