Cleanup as many dirs as possible in CleanupDirs

Signed-off-by: Ted Yu <yute@vmware.com>
This commit is contained in:
Ted Yu 2019-04-15 06:10:32 -07:00 committed by Ted Yu
parent 8c4651cc41
commit 185f02dd1a

View File

@ -147,22 +147,23 @@ func (spm *KubeStaticPodPathManager) BackupEtcdDir() string {
// CleanupDirs cleans up all temporary directories except those the user has requested to keep around // CleanupDirs cleans up all temporary directories except those the user has requested to keep around
func (spm *KubeStaticPodPathManager) CleanupDirs() error { func (spm *KubeStaticPodPathManager) CleanupDirs() error {
var errlist []error
if err := os.RemoveAll(spm.TempManifestDir()); err != nil { if err := os.RemoveAll(spm.TempManifestDir()); err != nil {
return err errlist = append(errlist, err)
} }
if !spm.keepManifestDir { if !spm.keepManifestDir {
if err := os.RemoveAll(spm.BackupManifestDir()); err != nil { if err := os.RemoveAll(spm.BackupManifestDir()); err != nil {
return err errlist = append(errlist, err)
} }
} }
if !spm.keepEtcdDir { if !spm.keepEtcdDir {
if err := os.RemoveAll(spm.BackupEtcdDir()); err != nil { 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 { func upgradeComponent(component string, waiter apiclient.Waiter, pathMgr StaticPodPathManager, cfg *kubeadmapi.InitConfiguration, beforePodHash string, recoverManifests map[string]string) error {