github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112195 from mattcary/upstream-mounter

Browse Source 
Remove race between kubelet startup and mounter rootfs
This commit is contained in:
Kubernetes Prow Robot 2022-09-01 19:04:16 -07:00 committed by GitHub
commit a304fdd867
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gce/gci/configure-helper.sh
View File

@ -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