From 5fcb230fe787b42e0b0c1ba3cde4c9747ae6c528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Wed, 3 Jul 2019 16:13:14 +0200 Subject: [PATCH] Use systemd cgroups driver on CoreOS and enable kubelet by default (#541) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- pkg/installer/installation/prerequisites.go | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkg/installer/installation/prerequisites.go b/pkg/installer/installation/prerequisites.go index d74302ff7..c99d66ea1 100644 --- a/pkg/installer/installation/prerequisites.go +++ b/pkg/installer/installation/prerequisites.go @@ -80,7 +80,7 @@ sudo sed -i '/.*swap.*/d' /etc/fstab source /etc/os-release source /etc/kubeone/proxy-env -# Short-Circuit the installation if it was arleady executed +# Short-Circuit the installation if it was already executed if type docker &>/dev/null && type kubelet &>/dev/null; then exit 0; fi sudo mkdir -p /etc/docker @@ -131,6 +131,7 @@ sudo apt-get install -y --no-install-recommends \ kubernetes-cni=${cni_ver} sudo apt-mark hold docker-ce kubelet kubeadm kubectl kubernetes-cni sudo systemctl enable --now docker +sudo systemctl enable --now kubelet ` kubeadmCentOSScript = ` @@ -141,7 +142,7 @@ sudo sed -i s/SELINUX=enforcing/SELINUX=permissive/g /etc/sysconfig/selinux source /etc/kubeone/proxy-env -# Short-Circuit the installation if it was arleady executed +# Short-Circuit the installation if it was already executed if type docker &>/dev/null && type kubelet &>/dev/null; then exit 0; fi cat </dev/null && type kubelet &>/dev/null; then exit 0; fi + +sudo mkdir -p /etc/docker +cat <