Skip to content

K
k3s
Commit 05e2e1fd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45708 from jianglingxia/jlx51215

Automatic merge from submit-queue (batch tested with PRs 46686, 45049, 46323, 45708, 46487) add some full stop and change some format
parents 3e1d6862 85d22f0a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
cmd/kubeadm/app/cmd/reset.go
View file @ 05e2e1fd
...@@ -155,8 +155,7 @@ func cleanDir(filePath string) error { ...@@ -155,8 +155,7 @@ func cleanDir(filePath string) error {
return err return err
} }
for _, name := range names { for _, name := range names {
err = os.RemoveAll(filepath.Join(filePath, name)) if err = os.RemoveAll(filepath.Join(filePath, name)); err != nil {
if err != nil {
return err return err
} }
} }
...@@ -171,8 +170,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) { ...@@ -171,8 +170,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 {
err := cleanDir(dir) if err := cleanDir(dir); err != nil {
if err != nil {
fmt.Printf("[reset] Failed to remove directory: %q [%v]\n", dir, err) fmt.Printf("[reset] Failed to remove directory: %q [%v]\n", dir, err)
} }
} }
...@@ -185,8 +183,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) { ...@@ -185,8 +183,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
} }
fmt.Printf("[reset] Deleting files: %v\n", filesToClean) fmt.Printf("[reset] Deleting files: %v\n", filesToClean)
for _, path := range filesToClean { for _, path := range filesToClean {
err := os.RemoveAll(path) if err := os.RemoveAll(path); err != nil {
if err != nil {
fmt.Printf("[reset] Failed to remove file: %q [%v]\n", path, err) fmt.Printf("[reset] Failed to remove file: %q [%v]\n", path, err)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment