From 0fec56c946b2001420423f329a7d2dc8abd5f72d Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 15 May 2018 15:19:30 +0200 Subject: [PATCH] kubeadm: crictl reset commands fixes Signed-off-by: Antonio Murdaca --- cmd/kubeadm/app/cmd/reset.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 22d7a44126b..81d2cc83cc0 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -221,14 +221,14 @@ func resetWithCrictl(execer utilsexec.Interface, dockerCheck preflight.Checker, if strings.TrimSpace(s) == "" { continue } - params = []string{"-r", criSocketPath, "stop", s} + params = []string{"-r", criSocketPath, "stopp", s} glog.V(1).Infof("[reset] Executing command %s %s", crictlPath, strings.Join(params, " ")) if err := execer.Command(crictlPath, params...).Run(); err != nil { glog.Infof("[reset] failed to stop the running containers using crictl: %v. Trying to use docker instead", err) resetWithDocker(execer, dockerCheck) return } - params = []string{"-r", criSocketPath, "rm", s} + params = []string{"-r", criSocketPath, "rmp", s} glog.V(1).Infof("[reset] Executing command %s %s", crictlPath, strings.Join(params, " ")) if err := execer.Command(crictlPath, params...).Run(); err != nil { glog.Infof("[reset] failed to remove the running containers using crictl: %v. Trying to use docker instead", err)