Merge pull request #1685 from r2d4/dep-flags

Remove show-libmachine-logs, use-vendored-driver

cmd/minikube/cmd/config/config.go

@@ -29,8 +29,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 )
 
-const useVendoredDriver = "use-vendored-driver"
-
 type setFn func(string, string) error
 
 type Setting struct {
@@ -173,10 +171,6 @@ var settings = []Setting{
 		name: "hyperv-virtual-switch",
 		set:  SetString,
 	},
-	{
-		name: useVendoredDriver,
-		set:  SetBool,
-	},
 	{
 		name: "disable-driver-mounts",
 		set:  SetBool,

cmd/minikube/cmd/root.go

@@ -18,7 +18,6 @@ package cmd
 
 import (
 	goflag "flag"
-	"fmt"
 	"io/ioutil"
 	"os"
 	"runtime"
@@ -48,11 +47,6 @@ var dirs = [...]string{
 	constants.MakeMiniPath("logs"),
 }
 
-const (
-	showLibmachineLogs = "show-libmachine-logs"
-	useVendoredDriver  = "use-vendored-driver"
-)
-
 var (
 	enableUpdateNotification = true
 )
@@ -86,13 +80,6 @@ var RootCmd = &cobra.Command{
 			log.SetDebug(true)
 		}
 
-		if viper.GetBool(showLibmachineLogs) {
-			fmt.Println(`
---show-libmachine-logs is deprecated.
-Please use --v=3 to show libmachine logs, and --v=7 for debug level libmachine logs
-`)
-		}
-
 		logDir := pflag.Lookup("log_dir")
 		if !logDir.Changed {
 			logDir.Value.Set(constants.MakeMiniPath("logs"))
@@ -129,8 +116,6 @@ func setFlagsUsingViper() {
 }
 
 func init() {
-	RootCmd.PersistentFlags().Bool(showLibmachineLogs, false, "Deprecated: To enable libmachine logs, set --v=3 or higher")
-	RootCmd.PersistentFlags().Bool(useVendoredDriver, false, "Use the vendored in drivers instead of RPC")
 	RootCmd.PersistentFlags().StringP(config.MachineProfile, "p", constants.DefaultMachineName, `The name of the minikube VM being used.  
 	This can be modified to allow for multiple minikube instances to be run independently`)
 	RootCmd.AddCommand(configCmd.ConfigCmd)