Changed --name to --profile and added minikube profile command

pull/1466/head
Aaron Prindle 2017-05-08 09:22:08 -07:00
parent 7033b70b57
commit e91641c70c
4 changed files with 54 additions and 5 deletions

View File

@ -112,7 +112,7 @@ var settings = []Setting{
set: SetBool,
},
{
name: config.MachineName,
name: config.MachineProfile,
set: SetString,
},
{

View File

@ -0,0 +1,48 @@
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package config
import (
"fmt"
"os"
"github.com/spf13/cobra"
pkgConfig "k8s.io/minikube/pkg/minikube/config"
)
var ProfileCmd = &cobra.Command{
Use: "profile MINIKUBE_PROFILE_NAME. You can return the the default minikube name by running `minikube profile default`",
Short: "profile sets the current minikube profile. This is used to run and manage multiple minikube instance. You can return the the default minikube name by running `minikube profile default`",
Long: "profile sets the current minikube profile. This is used to run and manage multiple minikube instance. You can return the the default minikube name by running `minikube profile default`",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 1 {
fmt.Fprintln(os.Stderr, "usage: minikube profile MINIKUBE_PROFILE_NAME")
os.Exit(1)
}
profile := args[0]
if profile == "default" {
profile = "minikube"
}
err := Set(pkgConfig.MachineProfile, profile)
if err != nil {
fmt.Fprintln(os.Stdout, err)
} else {
fmt.Fprintln(os.Stdout, fmt.Sprintf("minikube profile was successfully set the %s", profile))
}
},
}

View File

@ -136,10 +136,11 @@ 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().String(config.MachineName, constants.DefaultMachineName, `The name of the minikube VM being used.
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)
RootCmd.AddCommand(configCmd.AddonsCmd)
RootCmd.AddCommand(configCmd.ProfileCmd)
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
viper.BindPFlags(RootCmd.PersistentFlags())

View File

@ -33,7 +33,7 @@ const (
WantReportError = "WantReportError"
WantReportErrorPrompt = "WantReportErrorPrompt"
WantKubectlDownloadMsg = "WantKubectlDownloadMsg"
MachineName = "name"
MachineProfile = "profile"
)
type MinikubeConfig map[string]interface{}
@ -79,8 +79,8 @@ func decode(r io.Reader) (MinikubeConfig, error) {
// GetMachineName gets the machine name for the VM
func GetMachineName() string {
if viper.GetString(MachineName) == "" {
if viper.GetString(MachineProfile) == "" {
return constants.DefaultMachineName
}
return viper.GetString(MachineName)
return viper.GetString(MachineProfile)
}