diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 27df3cdefbba..1726734ed377 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -173,6 +173,10 @@ RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config # minikube relies on /etc/hosts for control-plane discovery. This prevents nefarious DNS servers from breaking it. RUN sed -ri 's/dns files/files dns/g' /etc/nsswitch.conf +# metacopy breaks crio on certain OS and isn't necessary for minikube +# https://github.com/kubernetes/minikube/issues/10520 +RUN sed -ri 's/mountopt = "nodev,metacopy=on"/mountopt = "nodev"/g' /etc/containers/storage.conf + EXPOSE 22 # create docker user for minikube ssh. to match VM using "docker" as username RUN adduser --ingroup docker --disabled-password --gecos '' docker diff --git a/pkg/drivers/kic/types.go b/pkg/drivers/kic/types.go index 482f57aaed9b..63e194de6920 100644 --- a/pkg/drivers/kic/types.go +++ b/pkg/drivers/kic/types.go @@ -24,9 +24,9 @@ import ( const ( // Version is the current version of kic - Version = "v0.0.17-1613704090-10418" + Version = "v0.0.17-1613785984-10528" // SHA of the kic base image - baseImageSHA = "876f620cdc40b4616e4e11db64524c520e252ede006357eaa963488ae852b6ed" + baseImageSHA = "8f1122cbd394b0c7caf31014626de148b6d3d3050d255460620ea4c3b1a4a16f" // The name of the GCR kicbase repository gcrRepo = "gcr.io/k8s-minikube/kicbase-builds" // The name of the Dockerhub kicbase repository diff --git a/site/content/en/docs/commands/start.md b/site/content/en/docs/commands/start.md index 0e95fffc1a91..d7f888ed95fa 100644 --- a/site/content/en/docs/commands/start.md +++ b/site/content/en/docs/commands/start.md @@ -26,7 +26,7 @@ minikube start [flags] --apiserver-names strings A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine --apiserver-port int The apiserver listening port (default 8443) --auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true) - --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.17-1613704090-10418@sha256:876f620cdc40b4616e4e11db64524c520e252ede006357eaa963488ae852b6ed") + --base-image string The base image to use for docker/podman drivers. Intended for local development. (default "gcr.io/k8s-minikube/kicbase-builds:v0.0.17-1613785984-10528@sha256:8f1122cbd394b0c7caf31014626de148b6d3d3050d255460620ea4c3b1a4a16f") --cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true) --cni string CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto) --container-runtime string The container runtime to be used (docker, cri-o, containerd). (default "docker")