From 61583d62492e2be0387563f460c56b1afba264c1 Mon Sep 17 00:00:00 2001
From: Sharif Elgamal <selgamal@google.com>
Date: Thu, 30 Jul 2020 15:11:30 -0700
Subject: [PATCH] upgrade crio to 1.18.3, ubuntu to 20.04 and add terrible hack
 to fix restarts for cri-o

---
 cmd/minikube/cmd/start.go |  7 ++++++
 cmd/minikube/cmd/stop.go  | 46 ++++++++++++++++++++++-----------------
 deploy/kicbase/Dockerfile | 18 ++++++++++-----
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go
index 75b9618e997b..11bc37c298dc 100644
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@@ -202,6 +202,13 @@ func runStart(cmd *cobra.Command, args []string) {
 		}
 	}
 
+	if existing != nil && existing.KubernetesConfig.ContainerRuntime == "crio" && driver.IsKIC(existing.Driver) {
+		// Stop and start again if it's crio because crio is bad and dumb
+		out.WarningT("CRI-O currently has an issue and your cluster needs to be restarted.")
+		stopProfile(existing.Name)
+		starter, err = provisionWithDriver(cmd, ds, existing)
+	}
+
 	kubeconfig, err := startWithDriver(cmd, starter, existing)
 	if err != nil {
 		node.MaybeExitWithAdvice(err)
diff --git a/cmd/minikube/cmd/stop.go b/cmd/minikube/cmd/stop.go
index 6f5493bc80ee..d27d11247806 100644
--- a/cmd/minikube/cmd/stop.go
+++ b/cmd/minikube/cmd/stop.go
@@ -80,36 +80,42 @@ func runStop(cmd *cobra.Command, args []string) {
 	}
 
 	stoppedNodes := 0
-
 	for _, profile := range profilesToStop {
-		register.Reg.SetStep(register.Stopping)
+		stoppedNodes = stopProfile(profile)
+	}
 
-		// end new code
-		api, cc := mustload.Partial(profile)
-		defer api.Close()
+	register.Reg.SetStep(register.Done)
+	if stoppedNodes > 0 {
+		out.T(out.Stopped, `{{.count}} nodes stopped.`, out.V{"count": stoppedNodes})
+	}
+}
 
-		for _, n := range cc.Nodes {
-			machineName := driver.MachineName(*cc, n)
+func stopProfile(profile string) int {
+	stoppedNodes := 0
+	register.Reg.SetStep(register.Stopping)
 
-			nonexistent := stop(api, machineName)
-			if !nonexistent {
-				stoppedNodes++
-			}
-		}
+	// end new code
+	api, cc := mustload.Partial(profile)
+	defer api.Close()
 
-		if err := killMountProcess(); err != nil {
-			out.WarningT("Unable to kill mount process: {{.error}}", out.V{"error": err})
-		}
+	for _, n := range cc.Nodes {
+		machineName := driver.MachineName(*cc, n)
 
-		if err := kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv()); err != nil {
-			exit.WithError("update config", err)
+		nonexistent := stop(api, machineName)
+		if !nonexistent {
+			stoppedNodes++
 		}
 	}
 
-	register.Reg.SetStep(register.Done)
-	if stoppedNodes > 0 {
-		out.T(out.Stopped, `{{.count}} nodes stopped.`, out.V{"count": stoppedNodes})
+	if err := killMountProcess(); err != nil {
+		out.WarningT("Unable to kill mount process: {{.error}}", out.V{"error": err})
+	}
+
+	if err := kubeconfig.UnsetCurrentContext(profile, kubeconfig.PathFromEnv()); err != nil {
+		exit.WithError("update config", err)
 	}
+
+	return stoppedNodes
 }
 
 func stop(api libmachine.API, machineName string) bool {
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
index 1b2fb1a27094..5862441895bd 100644
--- a/deploy/kicbase/Dockerfile
+++ b/deploy/kicbase/Dockerfile
@@ -12,25 +12,31 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     docker.io \
     openssh-server \
     dnsutils \
+    runc \
     # libglib2.0-0 is required for conmon, which is required for podman
     libglib2.0-0 \
     # removing kind's crictl config
     && rm /etc/crictl.yaml
 
-# install cri-o based on https://github.com/cri-o/cri-o/commit/96b0c34b31a9fc181e46d7d8e34fb8ee6c4dc4e1#diff-04c6e90faac2675aa89e2176d2eec7d8R128
-RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
+# Install cri-o/podman dependencies:
+RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \ 
     curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_20.04/Release.key && \
     apt-key add - < Release.key && apt-get update && \
-    apt-get install -y --no-install-recommends cri-o-1.17
+    apt-get install -y --no-install-recommends containers-common catatonit conmon containernetworking-plugins podman-plugins varlink
+
+# install cri-o based on https://github.com/cri-o/cri-o/commit/96b0c34b31a9fc181e46d7d8e34fb8ee6c4dc4e1#diff-04c6e90faac2675aa89e2176d2eec7d8R128
+RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \
+    curl -LO https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.18:/1.18.3/xUbuntu_20.04/Release.key && \
+    apt-key add - < Release.key && apt-get update && \
+    apt-get install -y --no-install-recommends cri-o=1.18.3~2
 
 # install podman
 RUN sh -c "echo 'deb https://dl.bintray.com/afbjorklund/podman focal main' > /etc/apt/sources.list.d/podman.list" && \
     curl -L https://bintray.com/user/downloadSubjectPublicKey?username=afbjorklund -o afbjorklund-public.key.asc && \
     apt-key add - < afbjorklund-public.key.asc && apt-get update && \
-    apt-get install -y --no-install-recommends podman=1.8.2~2
+    apt-get install -y --no-install-recommends podman=1.9.3~1
 
-# install varlink
-RUN apt-get install -y --no-install-recommends varlink
+RUN mkdir -p /usr/lib/cri-o-runc/sbin && cp /usr/local/sbin/runc /usr/lib/cri-o-runc/sbin/runc
 
 COPY entrypoint /usr/local/bin/entrypoint
 # automount service