From 2a7f0dca858cbe7dfc8ff77914b0a5738e4408e5 Mon Sep 17 00:00:00 2001 From: Ilya Zuyev Date: Wed, 26 May 2021 13:41:10 -0700 Subject: [PATCH] simplify the code --- cmd/minikube/cmd/delete.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 98a8c560ff..7d6ac52ab3 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -304,9 +304,8 @@ func deleteProfile(ctx context.Context, profile *config.Profile) error { } func unpauseIfNeeded(profile *config.Profile) error { - // there is a known issue with removing paused containerd kicbase container + // there is a known issue with removing kicbase container with paused containerd containers inside // unpause it before we delete it - if profile.Config.KubernetesConfig.ContainerRuntime != "containerd" { return nil } @@ -321,27 +320,29 @@ func unpauseIfNeeded(profile *config.Profile) error { if err != nil { return err } + r, err := machine.CommandRunner(host) if err != nil { exit.Error(reason.InternalCommandRunner, "Failed to get command runner", err) } + cr, err := cruntime.New(cruntime.Config{Type: profile.Config.KubernetesConfig.ContainerRuntime, Runner: r}) if err != nil { exit.Error(reason.InternalNewRuntime, "Failed runtime", err) } + paused, err := cluster.CheckIfPaused(cr, nil) if err != nil { return err } - if paused { - klog.Infof(`Unpause cluster %q.`, profile.Name) - ids, err := cluster.Unpause(cr, r, nil) - if err != nil { - return err - } - klog.Infof("Unpaused %v", ids) + + if !paused { + return nil } - return nil + + klog.Infof(`Unpause cluster %q.`, profile.Name) + _, err = cluster.Unpause(cr, r, nil) + return err } func deleteHosts(api libmachine.API, cc *config.ClusterConfig) {