mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #85265 from SataQiu/fix-kubeadm-20191114
kubeadm: reset raises warnings if it cannot delete folders
This commit is contained in:
commit
f01a4d0608
@ -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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user