Merge pull request #8895 from sharifelgamal/kicbase-ubuntu20

update crio to 1.18.3 and kicbase to ubuntu 20.04

cmd/minikube/cmd/start.go

@@ -202,6 +202,17 @@ 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 it's broken above v1.17.3
+		out.WarningT("Due to issues with CRI-O post v1.17.3, we need to restart your cluster.")
+		out.WarningT("See details at https://github.com/kubernetes/minikube/issues/8861")
+		stopProfile(existing.Name)
+		starter, err = provisionWithDriver(cmd, ds, existing)
+		if err != nil {
+			exit.WithError("error provisioning host", err)
+		}
+	}
+
 	kubeconfig, err := startWithDriver(cmd, starter, existing)
 	if err != nil {
 		node.MaybeExitWithAdvice(err)

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 {

deploy/kicbase/Dockerfile

@@ -1,35 +1,42 @@
 ARG COMMIT_SHA
-# using base image created by kind https://github.com/kubernetes-sigs/kind/blob/master/images/base/Dockerfile
-# which is an ubuntu 19.10 with an entry-point that helps running systemd
+# using base image created by kind https://github.com/kubernetes-sigs/kind/blob/v0.8.1/images/base/Dockerfile
+# which is an ubuntu 20.04 with an entry-point that helps running systemd
 # could be changed to any debian that can run systemd
-FROM kindest/base:v20200317-92225082 as base
+FROM kindest/base:v20200430-2c0eee40 as base
 USER root
 # specify version of everything explicitly using 'apt-cache policy'
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    lz4=1.9.1-1 \
-    gnupg=2.2.12-1ubuntu3 \ 
-    sudo=1.8.27-1ubuntu4.1 \
-    docker.io=19.03.2-0ubuntu1 \
-    openssh-server=1:8.0p1-6build1 \
-    dnsutils=1:9.11.5.P4+dfsg-5.1ubuntu2.2 \
+    lz4 \
+    gnupg \ 
+    sudo \
+    docker.io \
+    openssh-server \
+    dnsutils \
+    runc \
     # libglib2.0-0 is required for conmon, which is required for podman
-    libglib2.0-0=2.62.1-1 \
+    libglib2.0-0 \
+    # removing kind's crictl config
     && rm /etc/crictl.yaml
 
+# 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 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/xUbuntu_19.10/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \    
-    curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_19.10/Release.key && \
+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.17
+    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 eoan main' > /etc/apt/sources.list.d/podman.list" && \
+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.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