github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup as many dirs as possible in CleanupDirs

Browse Source 
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
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/phases/upgrade/staticpods.go
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
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 {