Upgrade crio to 1.15.0

The repository was moved to a separate organization

strings.ReplaceAll only work in go1.12, not go1.10

Need to create conmon/config.h without tags and git

The configuration _needs_ to be updated (yet again)

deploy/iso/minikube-iso/package/crio-bin/conmon-config.h

@@ -0,0 +1,9 @@
+
+#if !defined(CONFIG_H)
+#define CONFIG_H
+
+#define BUF_SIZE 8192
+#define STDIO_BUF_SIZE 8192
+#define DEFAULT_SOCKET_PATH "/var/run/crio"
+
+#endif // CONFIG_H

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

@@ -5,3 +5,4 @@ sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.
 sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.tar.gz
 sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.tar.gz
 sha256 1f6f72b1f89d4286b2d5b54a48f4d5ed4c0c01065d484635dcb343a706feb743 v1.14.1.tar.gz
+sha256 f7041a92e2d3a4c341be8df58f1076ba57ecb5daa02b6c65e652530c5f242739 v1.15.0.tar.gz

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

@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.14.1
-CRIO_BIN_COMMIT = b7644f67e6383cc862b3e37fb74fba334b0b2721
-CRIO_BIN_SITE = https://github.com/kubernetes-sigs/cri-o/archive
+CRIO_BIN_VERSION = v1.15.0
+CRIO_BIN_COMMIT = 485227d727401fa0472a449b5df3b0537e314ebb
+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
 CRIO_BIN_GOPATH = $(@D)/_output
@@ -23,8 +23,10 @@ define CRIO_BIN_USERS
 endef
 
 define CRIO_BIN_CONFIGURE_CMDS
-	mkdir -p $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-sigs
-	ln -sf $(@D) $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-sigs/cri-o
+	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
 endef
 
 define CRIO_BIN_BUILD_CMDS
@@ -45,9 +47,6 @@ define CRIO_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/pause \
 		$(TARGET_DIR)/usr/libexec/crio/pause
-	$(INSTALL) -Dm644 \
-		$(@D)/seccomp.json \
-		$(TARGET_DIR)/etc/crio/seccomp.json
 	$(INSTALL) -Dm644 \
 		$(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/crio.conf \
 		$(TARGET_DIR)/etc/crio/crio.conf

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

@@ -0,0 +1,39 @@
+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)