Upgrade crio to 1.15.1

Drop patch that has now been integrated upstream.

Give up on running crio-config, use pre-generated.

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

@@ -6,3 +6,4 @@ sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.
 sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.tar.gz
 sha256 1f6f72b1f89d4286b2d5b54a48f4d5ed4c0c01065d484635dcb343a706feb743 v1.14.1.tar.gz
 sha256 f7041a92e2d3a4c341be8df58f1076ba57ecb5daa02b6c65e652530c5f242739 v1.15.0.tar.gz
+sha256 6218a99877da9b9895e0088944731f5384803c15628d4b3c6b40ba1ddd39e052 v1.15.1.tar.gz

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

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.15.0
-CRIO_BIN_COMMIT = 485227d727401fa0472a449b5df3b0537e314ebb
+CRIO_BIN_VERSION = v1.15.1
+CRIO_BIN_COMMIT = f0827bb332854ffcff2f4d9f64d68b8139970b3d
 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
@@ -25,8 +25,8 @@ endef
 define CRIO_BIN_CONFIGURE_CMDS
 	mkdir -p $(CRIO_BIN_GOPATH)/src/github.com/cri-o
 	ln -sf $(@D) $(CRIO_BIN_GOPATH)/src/github.com/cri-o/cri-o
-	# Generate conmon/config.h with a simplified bin/crio-config
-	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="containers_image_ostree_stub exclude_graphdriver_btrfs exclude_graphdriver_devicemapper containers_image_openpgp" conmon/config.h
+	# Copy pre-generated conmon/config.h - see <https://github.com/cri-o/cri-o/issues/2575>
+	cp $(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/conmon-config.h $(@D)/conmon/config.h
 endef
 
 define CRIO_BIN_BUILD_CMDS

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

-diff --git a/Makefile b/Makefile
-index de79f63..a9ea13b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -136,7 +136,7 @@ crio.conf: bin/crio
- release-note: ${RELEASE_TOOL}
- 	${RELEASE_TOOL} -n $(release)
- 
--conmon/config.h: git-vars cmd/crio-config/config.go oci/oci.go
-+conmon/config.h: cmd/crio-config/config.go oci/oci.go
- 	$(GO) build $(LDFLAGS) -tags "$(BUILDTAGS)" -o bin/crio-config $(PROJECT)/cmd/crio-config
- 	( cd conmon && $(CURDIR)/bin/crio-config )
- 
-diff --git a/cmd/crio/main.go b/cmd/crio/main.go
-index 0bc347a..ab9969f 100644
---- a/cmd/crio/main.go
-+++ b/cmd/crio/main.go
-@@ -207,7 +207,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) (string, error) {
- }
- 
- func writeCrioGoroutineStacks() {
--	path := filepath.Join("/tmp", fmt.Sprintf("crio-goroutine-stacks-%s.log", strings.ReplaceAll(time.Now().Format(time.RFC3339), ":", "")))
-+	path := filepath.Join("/tmp", fmt.Sprintf("crio-goroutine-stacks-%s.log", strings.Replace(time.Now().Format(time.RFC3339), ":", "", -1)))
- 	if err := utils.WriteGoroutineStacksToFile(path); err != nil {
- 		logrus.Warnf("Failed to write goroutine stacks: %s", err)
- 	}
-diff --git a/oci/runtime_vm.go b/oci/runtime_vm.go
-index 57a1fde..64f853f 100644
---- a/oci/runtime_vm.go
-+++ b/oci/runtime_vm.go
-@@ -172,7 +172,7 @@ func (r *runtimeVM) startRuntimeDaemon(c *Container) error {
- 	args = append(args, "start")
- 
- 	// Modify the runtime path so that it complies with v2 shim API
--	newRuntimePath := strings.ReplaceAll(r.path, "-", ".")
-+	newRuntimePath := strings.Replace(r.path, "-", ".", -1)
- 
- 	// Setup default namespace
- 	r.ctx = namespaces.WithNamespace(r.ctx, namespaces.Default)

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

@@ -116,7 +116,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"
+apparmor_profile = "crio-default-1.15.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"

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

@@ -25,7 +25,7 @@
 
 # Storage driver used to manage the storage of images and containers. Please
 # refer to containers-storage.conf(5) to see all available storage drivers.
-#storage_driver = ""
+#storage_driver = "overlay"
 
 # List to pass options to the storage driver. Please refer to
 # containers-storage.conf(5) to see all available storage options.
@@ -116,7 +116,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"
+apparmor_profile = "crio-default-1.15.1"
 
 # Cgroup management implementation used for the runtime.
 cgroup_manager = "cgroupfs"