[2.13] Backport CRI-O bugfixes (#6230)

* Enable crio 1.18 (#6197)

* fix CRI-O repos for centos distributions (#6224)

* fix CRI-O repos for centos distributions

* fix CRI-O repos for centos distributions
- revert workarounds

* fix CRI-O repos for centos distributions
- use https for centos repos

* avoid 302 redirects for centos repos

* Use OS packaging default value for apparmor_profile in crio.conf (#6125)

Co-authored-by: jeanfabrice <github@bobo-rousselin.com>
This commit is contained in:
spaced
2020-06-04 16:09:15 +02:00
committed by GitHub
parent dd539cf360
commit 051e08e31c
5 changed files with 17 additions and 12 deletions

View File

@@ -106,7 +106,7 @@ seccomp_profile = "{{crio_seccomp_profile}}"
# Used to change the name of the default AppArmor profile of CRI-O. The default
# profile name is "crio-default-" followed by the version string of CRI-O.
apparmor_profile = "crio-default"
# apparmor_profile = "crio-default"
# Cgroup management implementation used for the runtime.
cgroup_manager = "{{crio_cgroup_manager}}"