From cac9a375c6fb38669b9705152edcf7aacbdc0ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 13 Apr 2018 07:58:43 +0200 Subject: [PATCH] Add the CRI preflight ignore, lost in refactoring Also move the corresponding comments to the code --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 6 ------ pkg/minikube/constants/constants.go | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index a2947fc2c564..4a9eea6cdd42 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -106,12 +106,6 @@ func (k *KubeadmBootstrapper) GetClusterLogsTo(follow bool, out io.Writer) error } func (k *KubeadmBootstrapper) StartCluster(k8s config.KubernetesConfig) error { - // We use --ignore-preflight-errors=DirAvailable since we have our own custom addons - // that we also stick in /etc/kubernetes/manifests - // We use --ignore-preflight-errors=Swap since minikube.iso allocates a swap partition. - // (it should probably stop doing this, though...) - // We use --ignore-preflight-errors=CRI since /var/run/dockershim.sock is not present. - // (because we start kubelet with an invalid config) version, err := ParseKubernetesVersion(k8s.KubernetesVersion) if err != nil { return errors.Wrap(err, "parsing kubernetes version") diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 4353784f806f..430069c830df 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -151,13 +151,20 @@ const ( ) var Preflights = []string{ + // We use --ignore-preflight-errors=DirAvailable since we have our own custom addons + // that we also stick in /etc/kubernetes/manifests "DirAvailable--etc-kubernetes-manifests", "DirAvailable--data", "FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml", "FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml", "FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml", "FileAvailable--etc-kubernetes-manifests-etcd.yaml", + // We use --ignore-preflight-errors=Swap since minikube.iso allocates a swap partition. + // (it should probably stop doing this, though...) "Swap", + // We use --ignore-preflight-errors=CRI since /var/run/dockershim.sock is not present. + // (because we start kubelet with an invalid config) + "CRI", } const (