Skip to content

Commit 5c6c20f

Browse files
authored
Merge pull request #10528 from sharifelgamal/crio-storage
fix crio by hardcoding mountopt
2 parents 6e53584 + 9c27829 commit 5c6c20f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

deploy/kicbase/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
173173
# minikube relies on /etc/hosts for control-plane discovery. This prevents nefarious DNS servers from breaking it.
174174
RUN sed -ri 's/dns files/files dns/g' /etc/nsswitch.conf
175175

176+
# metacopy breaks crio on certain OS and isn't necessary for minikube
177+
# https://github.com/kubernetes/minikube/issues/10520
178+
RUN sed -ri 's/mountopt = "nodev,metacopy=on"/mountopt = "nodev"/g' /etc/containers/storage.conf
179+
176180
EXPOSE 22
177181
# create docker user for minikube ssh. to match VM using "docker" as username
178182
RUN adduser --ingroup docker --disabled-password --gecos '' docker

pkg/drivers/kic/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
const (
2626
// Version is the current version of kic
27-
Version = "v0.0.17-1613704090-10418"
27+
Version = "v0.0.17-1613785984-10528"
2828
// SHA of the kic base image
29-
baseImageSHA = "876f620cdc40b4616e4e11db64524c520e252ede006357eaa963488ae852b6ed"
29+
baseImageSHA = "8f1122cbd394b0c7caf31014626de148b6d3d3050d255460620ea4c3b1a4a16f"
3030
// The name of the GCR kicbase repository
3131
gcrRepo = "gcr.io/k8s-minikube/kicbase-builds"
3232
// The name of the Dockerhub kicbase repository

site/content/en/docs/commands/start.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ minikube start [flags]
2626
--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
2727
--apiserver-port int The apiserver listening port (default 8443)
2828
--auto-update-drivers If set, automatically updates drivers to the latest version. Defaults to true. (default true)
29-
--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")
29+
--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")
3030
--cache-images If true, cache docker images for the current bootstrapper and load them into the machine. Always false with --driver=none. (default true)
3131
--cni string CNI plug-in to use. Valid options: auto, bridge, calico, cilium, flannel, kindnet, or path to a CNI manifest (default: auto)
3232
--container-runtime string The container runtime to be used (docker, cri-o, containerd). (default "docker")

0 commit comments

Comments
 (0)