From 185f02dd1a4dd0334a019e758a76a31a631231fe Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Mon, 15 Apr 2019 06:10:32 -0700 Subject: [PATCH] Cleanup as many dirs as possible in CleanupDirs Signed-off-by: Ted Yu --- cmd/kubeadm/app/phases/upgrade/staticpods.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index ba64fddaad9..5759f239803 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go @@ -147,22 +147,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 {