mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #76564 from tedyu/adm-clean-all
Cleanup as many dirs as possible in CleanupDirs
This commit is contained in:
commit
a73730147c
@ -148,22 +148,23 @@ func (spm *KubeStaticPodPathManager) BackupEtcdDir() string {
|
||||
|
||||
// CleanupDirs cleans up all temporary directories except those the user has requested to keep around
|
||||
func (spm *KubeStaticPodPathManager) CleanupDirs() error {
|
||||
var errlist []error
|
||||
if err := os.RemoveAll(spm.TempManifestDir()); err != nil {
|
||||
return err
|
||||
errlist = append(errlist, err)
|
||||
}
|
||||
if !spm.keepManifestDir {
|
||||
if err := os.RemoveAll(spm.BackupManifestDir()); err != nil {
|
||||
return err
|
||||
errlist = append(errlist, err)
|
||||
}
|
||||
}
|
||||
|
||||
if !spm.keepEtcdDir {
|
||||
if err := os.RemoveAll(spm.BackupEtcdDir()); err != nil {
|
||||
return err
|
||||
errlist = append(errlist, err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
return utilerrors.NewAggregate(errlist)
|
||||
}
|
||||
|
||||
func upgradeComponent(component string, waiter apiclient.Waiter, pathMgr StaticPodPathManager, cfg *kubeadmapi.InitConfiguration, beforePodHash string, recoverManifests map[string]string) error {
|
||||
|
Loading…
Reference in New Issue
Block a user