From 5c5c2169bc6e7642e5d0d2261cf7e28cab7865fb Mon Sep 17 00:00:00 2001 From: BLasan Date: Fri, 12 Feb 2021 00:09:33 +0530 Subject: [PATCH] Rename profile.go file as delete.go --- cmd/minikube/cmd/delete.go | 8 ++++---- cmd/minikube/cmd/node_delete.go | 4 ++-- pkg/minikube/{profile/profile.go => delete/delete.go} | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) rename pkg/minikube/{profile/profile.go => delete/delete.go} (94%) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 07c792163b..c648bbbfae 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -40,6 +40,7 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/cruntime" + "k8s.io/minikube/pkg/minikube/delete" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/exit" "k8s.io/minikube/pkg/minikube/kubeconfig" @@ -47,7 +48,6 @@ import ( "k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/out" "k8s.io/minikube/pkg/minikube/out/register" - pkgProfile "k8s.io/minikube/pkg/minikube/profile" "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/minikube/style" ) @@ -186,8 +186,8 @@ func runDelete(cmd *cobra.Command, args []string) { } if orphan { - pkgProfile.DeletePossibleLeftOvers(delCtx, cname, driver.Docker) - pkgProfile.DeletePossibleLeftOvers(delCtx, cname, driver.Podman) + delete.PossibleLeftOvers(delCtx, cname, driver.Docker) + delete.PossibleLeftOvers(delCtx, cname, driver.Podman) } } @@ -242,7 +242,7 @@ func deleteProfile(ctx context.Context, profile *config.Profile) error { out.Step(style.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": profile.Name, "driver_name": profile.Config.Driver}) for _, n := range profile.Config.Nodes { machineName := config.MachineName(*profile.Config, n) - pkgProfile.DeletePossibleLeftOvers(ctx, machineName, profile.Config.Driver) + delete.PossibleLeftOvers(ctx, machineName, profile.Config.Driver) } } } else { diff --git a/cmd/minikube/cmd/node_delete.go b/cmd/minikube/cmd/node_delete.go index 28ba1fafac..686fdf6a38 100644 --- a/cmd/minikube/cmd/node_delete.go +++ b/cmd/minikube/cmd/node_delete.go @@ -22,12 +22,12 @@ import ( "github.com/spf13/cobra" "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/delete" "k8s.io/minikube/pkg/minikube/driver" "k8s.io/minikube/pkg/minikube/exit" "k8s.io/minikube/pkg/minikube/mustload" "k8s.io/minikube/pkg/minikube/node" "k8s.io/minikube/pkg/minikube/out" - pkgProfile "k8s.io/minikube/pkg/minikube/profile" "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/minikube/style" ) @@ -54,7 +54,7 @@ var nodeDeleteCmd = &cobra.Command{ machineName := config.MachineName(*co.Config, *n) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) defer cancel() - pkgProfile.DeletePossibleLeftOvers(ctx, machineName, co.Config.Driver) + delete.PossibleLeftOvers(ctx, machineName, co.Config.Driver) } out.Step(style.Deleted, "Node {{.name}} was successfully deleted.", out.V{"name": name}) diff --git a/pkg/minikube/profile/profile.go b/pkg/minikube/delete/delete.go similarity index 94% rename from pkg/minikube/profile/profile.go rename to pkg/minikube/delete/delete.go index c904ba860d..5caaf72f88 100644 --- a/pkg/minikube/profile/profile.go +++ b/pkg/minikube/delete/delete.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package profile +package delete import ( "context" @@ -28,8 +28,8 @@ import ( "k8s.io/minikube/pkg/minikube/style" ) -//DeletePossibleLeftOvers ... -func DeletePossibleLeftOvers(ctx context.Context, cname string, driverName string) { +//PossibleLeftOvers deletes KIC & non-KIC drivers left +func PossibleLeftOvers(ctx context.Context, cname string, driverName string) { bin := "" switch driverName { case driver.Docker: