Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

Commit

Permalink
test: don't try to start kubelet before kubeadm
Browse files Browse the repository at this point in the history
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,
clearlinux/distribution#310).
  • Loading branch information
pohly committed Dec 21, 2018
1 parent 1a43cf1 commit b625d0a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions test/setup-clear-kvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b625d0a

Please sign in to comment.