github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #76564 from tedyu/adm-clean-all

Browse Source 
Cleanup as many dirs as possible in CleanupDirs
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 08:14:05 -07:00 committed by GitHub
commit a73730147c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -148,22 +148,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 {