Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 12, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions cmd/minikube/cmd/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -173,10 +171,6 @@ var settings = []Setting{
name: "hyperv-virtual-switch",
set: SetString,
},
{
name: useVendoredDriver,
set: SetBool,
},
{
name: "disable-driver-mounts",
set: SetBool,
Expand Down
15 changes: 0 additions & 15 deletions cmd/minikube/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package cmd

import (
goflag "flag"
"fmt"
"io/ioutil"
"os"
"runtime"
Expand Down Expand Up @@ -48,11 +47,6 @@ var dirs = [...]string{
constants.MakeMiniPath("logs"),
}

const (
showLibmachineLogs = "show-libmachine-logs"
useVendoredDriver = "use-vendored-driver"
)

var (
enableUpdateNotification = true
)
Expand Down Expand Up @@ -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"))
Expand Down Expand Up @@ -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)
Expand Down