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 #85265 from SataQiu/fix-kubeadm-20191114

Browse Source 
kubeadm: reset raises warnings if it cannot delete folders
This commit is contained in:
Kubernetes Prow Robot 2019-11-22 17:30:17 -08:00 committed by GitHub
commit f01a4d0608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go
View File

@ -128,7 +128,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
fmt.Printf("[reset] Deleting contents of config directories: %v\n", dirsToClean) fmt.Printf("[reset] Deleting contents of config directories: %v\n", dirsToClean)
for _, dir := range dirsToClean { for _, dir := range dirsToClean {
if err := CleanDir(dir); err != nil { if err := CleanDir(dir); err != nil {
klog.Warningf("[reset] Failed to remove directory: %q [%v]\n", dir, err) klog.Warningf("[reset] Failed to delete contents of %q directory: %v", dir, err)
} }
} }

6
cmd/kubeadm/app/cmd/reset.go
View File

@ -215,8 +215,10 @@ func NewCmdReset(in io.Reader, out io.Writer, resetOptions *resetOptions) *cobra
func cleanDirs(data *resetData) { func cleanDirs(data *resetData) {
fmt.Printf("[reset] Deleting contents of stateful directories: %v\n", data.dirsToClean) fmt.Printf("[reset] Deleting contents of stateful directories: %v\n", data.dirsToClean)
for _, dir := range data.dirsToClean { for _, dir := range data.dirsToClean {
klog.V(1).Infof("[reset] Deleting content of %s", dir) klog.V(1).Infof("[reset] Deleting contents of %s", dir)
phases.CleanDir(dir) if err := phases.CleanDir(dir); err != nil {
klog.Warningf("[reset] Failed to delete contents of %q directory: %v", dir, err)
}
} }
} }