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

refactoring for delete

pull/5548/head
Pranav Jituri 2019-10-20 02:19:18 +05:30
parent cb5055ef19
commit 2ba9cb4c1a
No known key found for this signature in database
GPG Key ID: 009BB1DF4550490B
2 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,13 +17,11 @@ limitations under the License.
package cmd
import (
"bufio"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strconv"
"strings"
"github.com/docker/machine/libmachine"
"github.com/docker/machine/libmachine/mcnerror"
@ -45,7 +43,7 @@ import (
const (
purge = "purge"
noPrompt = "no-prompt"
forcedelete = "forcedelete"
)
// deleteCmd represents the delete command
@ -59,7 +57,7 @@ associated files.`,
func init() {
deleteCmd.Flags().Bool(purge, false, "Set this flag to delete the '.minikube' folder from your user directory. This will prompt for confirmation.")
deleteCmd.Flags().Bool(noPrompt, false, "Set this flag so that there are no prompts.")
deleteCmd.Flags().Bool(forcedelete, false, "Set this flag to delete all configurations and profiles")
if err := viper.BindPFlags(deleteCmd.Flags()); err != nil {
exit.WithError("unable to bind flags", err)
@ -71,7 +69,46 @@ func runDelete(cmd *cobra.Command, args []string) {
if len(args) > 0 {
exit.UsageT("Usage: minikube delete")
}
profile := viper.GetString(pkg_config.MachineProfile)
validProfiles, _, err := pkg_config.ListProfiles()
// Check if the purge flag has been set but the force flag hasn't been set in case there are multiple profiles to delete.
// If the following condition is not met, error out.
glog.Infof("%v", viper.IsSet(forcedelete))
glog.Infof("%v", viper.GetBool(forcedelete))
if err == nil && viper.GetBool(purge) && len(validProfiles) > 1 && !viper.GetBool(forcedelete) {
out.T(out.Embarrassed, "Multiple minikube profiles were found - ")
for _, p := range validProfiles {
out.T(out.Notice," - {{.profileName}}", out.V{"profileName":p.Name})
}
out.T(out.Notice, "Please use the {{.forceFlag}} to delete all of the configuration and the profiles.", out.V{"forceFlag":forcedelete})
return
}
// Perform all the procedure for each of the profiles which are available.
// For example, what if there are multiple profiles with multiple clusters running?
for _, p := range validProfiles {
deleteProfile(p.Name)
}
// If the purge flag is set, go ahead and delete the .minikube directory.
if viper.GetBool(purge) {
glog.Infof("Purging the '.minikube' directory located at %s", localpath.MiniPath())
if err := os.RemoveAll(localpath.MiniPath()); err != nil {
exit.WithError("unable to delete minikube config folder", err)
}
out.T(out.Crushed, "Successfully purged minikube directory located at - [{{.minikubeDirectory}}]", out.V{"minikubeDirectory":localpath.MiniPath()})
}
}
func deleteProfile (profile string) {
glog.Infof("Setting current profile to -- %v", profile)
err := cmdcfg.Set(pkg_config.MachineProfile, profile)
if err != nil {
exit.WithError("Setting profile failed", err)
}
glog.Infof("Successfully set profile to -- %v", profile)
api, err := machine.NewAPIClient()
if err != nil {
exit.WithError("Error getting client", err)
@ -122,30 +159,6 @@ func runDelete(cmd *cobra.Command, args []string) {
if err := cmdcfg.Unset(pkg_config.MachineProfile); err != nil {
exit.WithError("unset minikube profile", err)
}
// Delete the .minikube folder if the flags are set
if viper.GetBool(purge) {
glog.Infof("Purging the '.minikube' directory located at %s", localpath.MiniPath())
if viper.GetBool(noPrompt) {
glog.Infof("Will not prompt for deletion.")
} else {
out.T(out.Check, "Are you sure you want to delete the directory located at {{.minikubePath}}? This will delete all your configuration data related to minikube. (Y/N)", out.V{"minikubePath": localpath.MiniPath()})
userInput := bufio.NewScanner(os.Stdin)
userInput.Scan()
var choice = userInput.Text()
if strings.ToLower(choice) != "y" {
out.T(out.Meh, "Not deleting minikube directory located at {{.minikubePath}}", out.V{"minikubePath": localpath.MiniPath()})
return
}
}
if err := os.RemoveAll(localpath.MiniPath()); err != nil {
exit.WithError("unable to delete minikube config folder", err)
}
out.T(out.Crushed, "Deleted the {{.minikubePath}} folder successfully!", out.V{"minikubePath": localpath.MiniPath()})
} else {
out.T(out.Meh, "Not deleting minikube directory located at {{.minikubePath}}", out.V{"minikubePath": localpath.MiniPath()})
}
}
func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) {
@ -167,6 +180,15 @@ func deleteProfileDirectory(profile string) {
exit.WithError("Unable to remove machine directory: %v", err)
}
}
profileDir := filepath.Join(localpath.MiniPath(), "profiles", profile)
if _, err := os.Stat(profileDir); err == nil {
out.T(out.DeletingHost, `Removing {{.directory}} ...`, out.V{"directory": profileDir})
err := os.RemoveAll(profileDir)
if err != nil {
exit.WithError("Unable to remove machine directory: %v", err)
}
}
}
// killMountProcess kills the mount process, if it is running

14
pkg/minikube/cluster/cluster.go
View File

@ -270,14 +270,18 @@ func StopHost(api libmachine.API) error {
// DeleteHost deletes the host VM.
func DeleteHost(api libmachine.API) error {
host, err := api.Load(cfg.GetMachineName())
out.T(out.DeletingHost,"0 {{.err}}", out.V{"err":cfg.GetMachineName()})
host, err := api.Load(cfg.MachineProfile)
if err != nil {
out.T(out.DeletingHost,"1 {{.err}}", out.V{"err":err})
return errors.Wrap(err, "load")
}
out.T(out.DeletingHost, "Successfully powered off Hyper-V. minikube driver -- {{.driver}}", out.V{"driver": host.Driver.DriverName()})
// Get the status of the host. Ensure that it exists before proceeding ahead.
status, err := GetHostStatus(api)
if err != nil {
out.T(out.DeletingHost,"2 {{.err}}", out.V{"err":err})
exit.WithCodeT(exit.Failure, "Unable to get the status of the cluster.")
}
if status == state.None.String() {
@ -285,10 +289,14 @@ func DeleteHost(api libmachine.API) error {
}
// This is slow if SSH is not responding, but HyperV hangs otherwise, See issue #2914
if host.Driver.DriverName() == constants.DriverHyperv {
if host.DriverName == constants.DriverHyperv {
out.T(out.DeletingHost, "3 {{.driver}}", out.V{"driver": host.Driver.DriverName()})
out.T(out.DeletingHost, "4 {{.driver}}", out.V{"driver": host.DriverName})
if err := trySSHPowerOff(host); err != nil {
glog.Infof("Unable to power off minikube because the host was not found.")
out.T(out.DeletingHost,"3 {{.err}}", out.V{"err":err})
}
out.T(out.DeletingHost, "Successfully powered off Hyper-V. minikube driver -- {{.driver}}", out.V{"driver": host.Driver.DriverName()})
}
out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": cfg.GetMachineName(), "driver_name": host.DriverName})