Upgrade crio to 1.17.0 (#6624)

* Upgrade crio to 1.17.0

* Upgrade crio.conf to version v1.17.0

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

@@ -10,3 +10,4 @@ sha256 6218a99877da9b9895e0088944731f5384803c15628d4b3c6b40ba1ddd39e052 v1.15.1.
 sha256 70d4c746fe207422c78420dc4239768f485eea639a38c993c02872ec6305dd1d v1.15.2.tar.gz
 sha256 05f9614c4d5970b4662499b84c270b0ab953596ee863dcd09c9dc7a2d2f09789 v1.16.0.tar.gz
 sha256 57e1ee990ef2d5af8b32c33a21b4998682608e3556dcf1d3349666f55e7d95b9 v1.16.1.tar.gz
+sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.16.1
-CRIO_BIN_COMMIT = bf8fcf34c942ba973a4f694094b46f914c779c0a
+CRIO_BIN_VERSION = v1.17.0
+CRIO_BIN_COMMIT = 6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3
 CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme

deploy/iso/minikube-iso/package/crio-bin/crio.conf

@@ -1,4 +1,3 @@
-
 # The CRI-O configuration file specifies all of the available configuration
 # options and command-line flags for the crio(8) OCI Kubernetes Container Runtime
 # daemon, but in a TOML format that can be more easily modified and versioned.
@@ -100,7 +99,7 @@ no_pivot = false
 conmon = "/usr/libexec/crio/conmon"
 
 # Cgroup setting for conmon
-conmon_cgroup = "pod"
+conmon_cgroup = "system.slice"
 
 # Environment variable list for the conmon process, used for passing necessary
 # environment variables to conmon or the runtime.
@@ -118,7 +117,7 @@ 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-1.16.0"
+apparmor_profile = "crio-default-1.16.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"

deploy/iso/minikube-iso/package/crio-bin/crio.conf.default

@@ -99,7 +99,7 @@ no_pivot = false
 conmon = ""
 
 # Cgroup setting for conmon
-conmon_cgroup = "pod"
+conmon_cgroup = "system.slice"
 
 # Environment variable list for the conmon process, used for passing necessary
 # environment variables to conmon or the runtime.
@@ -117,7 +117,7 @@ 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-1.16.0"
+apparmor_profile = "crio-default-1.16.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"