mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
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
This commit is contained in:
commit
05e2e1fd86
@ -155,8 +155,7 @@ func cleanDir(filePath string) error {
|
||||
return err
|
||||
}
|
||||
for _, name := range names {
|
||||
err = os.RemoveAll(filepath.Join(filePath, name))
|
||||
if err != nil {
|
||||
if err = os.RemoveAll(filepath.Join(filePath, name)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@ -171,8 +170,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
|
||||
}
|
||||
fmt.Printf("[reset] Deleting contents of config directories: %v\n", dirsToClean)
|
||||
for _, dir := range dirsToClean {
|
||||
err := cleanDir(dir)
|
||||
if err != nil {
|
||||
if err := cleanDir(dir); err != nil {
|
||||
fmt.Printf("[reset] Failed to remove directory: %q [%v]\n", dir, err)
|
||||
}
|
||||
}
|
||||
@ -185,8 +183,7 @@ func resetConfigDir(configPathDir, pkiPathDir string) {
|
||||
}
|
||||
fmt.Printf("[reset] Deleting files: %v\n", filesToClean)
|
||||
for _, path := range filesToClean {
|
||||
err := os.RemoveAll(path)
|
||||
if err != nil {
|
||||
if err := os.RemoveAll(path); err != nil {
|
||||
fmt.Printf("[reset] Failed to remove file: %q [%v]\n", path, err)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user