From b625d0a57c68a042c250d7723b443ddfbba94d06 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 3 Dec 2018 13:04:29 +0100 Subject: [PATCH] test: don't try to start kubelet before kubeadm Starting kubelet before kubeadm isn't necessary and while it worked in the past, it no longer does with Clear Linux 26630 / Kubernetes 1.12 (/var/lib/kubelet/config.yaml not found, https://github.com/clearlinux/distribution/issues/310). --- test/setup-clear-kvm.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/setup-clear-kvm.sh b/test/setup-clear-kvm.sh index 73cc0daa..410d550f 100755 --- a/test/setup-clear-kvm.sh +++ b/test/setup-clear-kvm.sh @@ -228,8 +228,9 @@ EOF # We don't use Kata Containers, so that particular change is not made to /etc/crio/crio.conf # at this time. - # Reconfiguration done, start daemons. - _work/ssh-clear-kvm.$imagenum "systemctl daemon-reload && systemctl restart $cri_daemon kubelet && systemctl enable $cri_daemon kubelet" + # Reconfiguration done, start daemons. Starting kubelet must wait until kubeadm has created + # the necessary config files. + _work/ssh-clear-kvm.$imagenum "systemctl daemon-reload && systemctl restart $cri_daemon && systemctl enable $cri_daemon kubelet" # Run additional code specified by config. ${TEST_CLEAR_LINUX_POST_INSTALL:-true} $imagenum