kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename profile.go file as delete.go

pull/10321/head
BLasan 2021-02-12 00:09:33 +05:30
parent bb80fe355a
commit 5c5c2169bc
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/minikube/cmd/delete.go
View File

@ -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 {

4
cmd/minikube/cmd/node_delete.go
View File

@ -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})

6
pkg/minikube/profile/profile.go → pkg/minikube/delete/delete.go
View File

@ -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: