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

Merge pull request #63865 from bart0sh/PR0013-kubeadm-minor-fixes

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 63865, 57849, 63932, 63930, 63936). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Minor fixes for kubeadm reset

This set of fixes was proposed by @neolit123 in [PR 63849](https://github.com/kubernetes/kubernetes/pull/63849) review
comments:

- Capitalized output after [reset]
- Used %v format for Go errors
- Fixed spelling: Trying using -> Trying to use

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-17 00:28:13 -07:00 committed by GitHub
commit 0519170e26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ func reset(execer utilsexec.Interface, dockerCheck preflight.Checker, criSocketP
func resetWithDocker(execer utilsexec.Interface, dockerCheck preflight.Checker) { func resetWithDocker(execer utilsexec.Interface, dockerCheck preflight.Checker) {
if _, errors := dockerCheck.Check(); len(errors) == 0 { if _, errors := dockerCheck.Check(); len(errors) == 0 {
if err := execer.Command("sh", "-c", "docker ps -a --filter name=k8s_ -q | xargs -r docker rm --force --volumes").Run(); err != nil { if err := execer.Command("sh", "-c", "docker ps -a --filter name=k8s_ -q | xargs -r docker rm --force --volumes").Run(); err != nil {
glog.Errorln("[reset] Failed to stop the running containers") glog.Errorln("[reset] failed to stop the running containers")
} }
} else { } else {
glog.Infoln("[reset] docker doesn't seem to be running. Skipping the removal of running Kubernetes containers") glog.Infoln("[reset] docker doesn't seem to be running. Skipping the removal of running Kubernetes containers")
@ -208,36 +208,36 @@ func resetWithCrictl(execer utilsexec.Interface, dockerCheck preflight.Checker,
glog.V(1).Infoln("[reset] listing running pods using crictl") glog.V(1).Infoln("[reset] listing running pods using crictl")
params := []string{"-r", criSocketPath, "pods", "--quiet"} params := []string{"-r", criSocketPath, "pods", "--quiet"}
glog.V(1).Infof("[reset] executing command %s %s", crictlPath, strings.Join(params, " ")) glog.V(1).Infof("[reset] Executing command %s %s", crictlPath, strings.Join(params, " "))
output, err := execer.Command(crictlPath, params...).CombinedOutput() output, err := execer.Command(crictlPath, params...).CombinedOutput()
if err != nil { if err != nil {
glog.Infof("[reset] failed to list running pods using crictl: %s. Trying using docker instead", err) glog.Infof("[reset] failed to list running pods using crictl: %v. Trying to use docker instead", err)
resetWithDocker(execer, dockerCheck) resetWithDocker(execer, dockerCheck)
return return
} }
sandboxes := strings.Split(string(output), " ") sandboxes := strings.Split(string(output), " ")
glog.V(1).Infoln("[reset] stopping and removing running containers using crictl") glog.V(1).Infoln("[reset] Stopping and removing running containers using crictl")
for _, s := range sandboxes { for _, s := range sandboxes {
if strings.TrimSpace(s) == "" { if strings.TrimSpace(s) == "" {
continue continue
} }
params = []string{"-r", criSocketPath, "stop", s} params = []string{"-r", criSocketPath, "stop", s}
glog.V(1).Infof("[reset] executing command %s %s", crictlPath, strings.Join(params, " ")) glog.V(1).Infof("[reset] Executing command %s %s", crictlPath, strings.Join(params, " "))
if err := execer.Command(crictlPath, params...).Run(); err != nil { if err := execer.Command(crictlPath, params...).Run(); err != nil {
glog.Infof("[reset] failed to stop the running containers using crictl: %s. Trying using docker instead", err) glog.Infof("[reset] failed to stop the running containers using crictl: %v. Trying to use docker instead", err)
resetWithDocker(execer, dockerCheck) resetWithDocker(execer, dockerCheck)
return return
} }
params = []string{"-r", criSocketPath, "rm", s} params = []string{"-r", criSocketPath, "rm", s}
glog.V(1).Infof("[reset] executing command %s %s", crictlPath, strings.Join(params, " ")) glog.V(1).Infof("[reset] Executing command %s %s", crictlPath, strings.Join(params, " "))
if err := execer.Command(crictlPath, params...).Run(); err != nil { if err := execer.Command(crictlPath, params...).Run(); err != nil {
glog.Infof("[reset] failed to remove the running containers using crictl: %s. Trying using docker instead", err) glog.Infof("[reset] failed to remove the running containers using crictl: %v. Trying to use docker instead", err)
resetWithDocker(execer, dockerCheck) resetWithDocker(execer, dockerCheck)
return return
} }
} }
} else { } else {
glog.Infoln("[reset] CRI socket path not provided for crictl. Trying docker instead") glog.Infoln("[reset] CRI socket path not provided for crictl. Trying to use docker instead")
resetWithDocker(execer, dockerCheck) resetWithDocker(execer, dockerCheck)
} }
} }