mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #4093 from nelcy/master
Fix orphaned pod & volume cleanup order. Volumes need to be unmounted before pod cleanup.
This commit is contained in:
commit
6e897524be
@ -1274,14 +1274,14 @@ func (kl *Kubelet) SyncPods(pods []api.BoundPod) error {
|
||||
}
|
||||
}
|
||||
|
||||
// Remove any orphaned pods.
|
||||
err = kl.cleanupOrphanedPods(pods)
|
||||
// Remove any orphaned volumes.
|
||||
err = kl.cleanupOrphanedVolumes(pods)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Remove any orphaned volumes.
|
||||
err = kl.cleanupOrphanedVolumes(pods)
|
||||
// Remove any orphaned pods.
|
||||
err = kl.cleanupOrphanedPods(pods)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user