mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-06 03:33:26 +00:00
Remove race between kubelet startup and mounter rootfs
Change-Id: I18d5a7d1f8c475c96da3c4166802ac76e91b3b52
This commit is contained in:
@@ -3442,6 +3442,10 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
log-end 'SetupKubePodLogReadersGroupDir'
|
log-end 'SetupKubePodLogReadersGroupDir'
|
||||||
|
|
||||||
|
# Note prepare-mounter-rootfs must be called before the kubelet starts, as
|
||||||
|
# kubelet startup updates its nameserver.
|
||||||
|
log-wrap 'PrepareMounterRootfs' prepare-mounter-rootfs
|
||||||
|
|
||||||
log-wrap 'StartKubelet' start-kubelet
|
log-wrap 'StartKubelet' start-kubelet
|
||||||
|
|
||||||
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
|
if [[ "${KUBERNETES_MASTER:-}" == "true" ]]; then
|
||||||
@@ -3470,7 +3474,6 @@ function main() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
log-wrap 'ResetMotd' reset-motd
|
log-wrap 'ResetMotd' reset-motd
|
||||||
log-wrap 'PrepareMounterRootfs' prepare-mounter-rootfs
|
|
||||||
|
|
||||||
# Wait for all background jobs to finish.
|
# Wait for all background jobs to finish.
|
||||||
wait
|
wait
|
||||||
|
Reference in New Issue
Block a user