From db6b0a50cd5747db9c4f90b8c98646e152bef242 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Fri, 12 Jul 2019 18:00:11 +0200 Subject: [PATCH 001/106] Added --delete-all flag --- cmd/minikube/cmd/delete.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 8b4f396726..3be8449e06 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -35,6 +35,8 @@ import ( pkgutil "k8s.io/minikube/pkg/util" ) +var deleteAll bool + // deleteCmd represents the delete command var deleteCmd = &cobra.Command{ Use: "delete", @@ -105,5 +107,6 @@ func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsN } func init() { + deleteCmd.Flags().BoolVar(&deleteAll, "delete-all", false, "Set flag to delete all profiles") RootCmd.AddCommand(deleteCmd) } From 08b6edc781df4f9cb26909167b58387f0e8a91c5 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 13 Jul 2019 12:37:55 +0200 Subject: [PATCH 002/106] Added function to get all profiles --- cmd/minikube/cmd/config/profile.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 770e5f6bf2..d350b2f9f6 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -17,7 +17,9 @@ limitations under the License. package config import ( + "io/ioutil" "os" + "path/filepath" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -71,3 +73,20 @@ var ProfileCmd = &cobra.Command{ console.Success("minikube profile was successfully set to %s", profile) }, } + +func GetAll() []string { + miniPath := constants.GetMinipath() + profilesPath := filepath.Join(miniPath, "profiles") + fileInfos, err := ioutil.ReadDir(profilesPath) + if err != nil { + console.ErrLn("Unable to list in dir: %s \n Error: %v", profilesPath, err) + } + + var profiles []string + for _, fileInfo := range fileInfos { + if fileInfo.IsDir() { + profiles = append(profiles, fileInfo.Name()) + } + } + return profiles +} From 6f2390b8f6f30cb0473484a47d819b6ed4846dd1 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 13 Jul 2019 23:36:00 +0200 Subject: [PATCH 003/106] Added function to check if profile-config is valid --- cmd/minikube/cmd/config/profile.go | 56 ++++++++++++++++++++++++++---- cmd/minikube/cmd/delete.go | 8 ++--- 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index d350b2f9f6..826e2ef304 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -17,17 +17,19 @@ limitations under the License. package config import ( - "io/ioutil" - "os" - "path/filepath" - + "encoding/json" + "fmt" "github.com/spf13/cobra" "github.com/spf13/viper" + "io/ioutil" + "k8s.io/kubernetes/cmd/kube-scheduler/app/config" pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/console" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" pkgutil "k8s.io/minikube/pkg/util" + "os" + "path/filepath" ) // ProfileCmd represents the profile command @@ -74,7 +76,7 @@ var ProfileCmd = &cobra.Command{ }, } -func GetAll() []string { +func GetAllProfiles() []string { miniPath := constants.GetMinipath() profilesPath := filepath.Join(miniPath, "profiles") fileInfos, err := ioutil.ReadDir(profilesPath) @@ -85,8 +87,50 @@ func GetAll() []string { var profiles []string for _, fileInfo := range fileInfos { if fileInfo.IsDir() { - profiles = append(profiles, fileInfo.Name()) + profilePath := filepath.Join(profilesPath, fileInfo.Name()) + if isValidProfile(profilePath) { + profiles = append(profiles, fileInfo.Name()) + } } } return profiles } + +func isValidProfile(profilePath string) bool { + fileInfos, err := ioutil.ReadDir(profilePath) + if err != nil { + console.ErrLn("Unable to list in dir: %s \n Error: %v", profilePath, err) + } + + hasConfigJson := false + for _, fileInfo := range fileInfos { + if fileInfo.Name() == "config.json" { + hasConfigJson = true + } + } + + if !hasConfigJson { + return false + } + + // TODO: Use constants? + profileConfigPath := filepath.Join(profilePath, "config.json") + fmt.Println(profileConfigPath) + bytes, err := ioutil.ReadFile(profileConfigPath) + if err != nil { + console.ErrLn("Unable to read file: %s \n Error: %v", profileConfigPath, err) + } + + fileContent := string(bytes) + fmt.Println(fileContent) + + var configObject config.Config + + errUnmarshal := json.Unmarshal(bytes, &configObject) + + if errUnmarshal != nil { + console.ErrLn("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) + } + + return &configObject != nil +} diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 3be8449e06..3a6dce80cd 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -51,7 +51,7 @@ func runDelete(cmd *cobra.Command, args []string) { if len(args) > 0 { exit.Usage("usage: minikube delete") } - profile := viper.GetString(pkg_config.MachineProfile) + profileName := viper.GetString(pkg_config.MachineProfile) api, err := machine.NewAPIClient() if err != nil { exit.WithError("Error getting client", err) @@ -71,7 +71,7 @@ func runDelete(cmd *cobra.Command, args []string) { if err = cluster.DeleteHost(api); err != nil { switch err := errors.Cause(err).(type) { case mcnerror.ErrHostDoesNotExist: - console.OutStyle(console.Meh, "%q cluster does not exist", profile) + console.OutStyle(console.Meh, "%q cluster does not exist", profileName) default: exit.WithError("Failed to delete cluster", err) } @@ -83,12 +83,12 @@ func runDelete(cmd *cobra.Command, args []string) { if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { if os.IsNotExist(err) { - console.OutStyle(console.Meh, "%q profile does not exist", profile) + console.OutStyle(console.Meh, "%q profile does not exist", profileName) os.Exit(0) } exit.WithError("Failed to remove profile", err) } - console.OutStyle(console.Crushed, "The %q cluster has been deleted.", profile) + console.OutStyle(console.Crushed, "The %q cluster has been deleted.", profileName) machineName := pkg_config.GetMachineName() if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { From 6c4749b33c604576ca89cb58b398f973010b3e1a Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 13 Jul 2019 23:57:27 +0200 Subject: [PATCH 004/106] Bugfix: Imported wrong configname --- cmd/minikube/cmd/config/profile.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 826e2ef304..ce09da4d22 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "io/ioutil" - "k8s.io/kubernetes/cmd/kube-scheduler/app/config" + minikubeConfig "k8s.io/minikube/pkg/minikube/config" pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/console" "k8s.io/minikube/pkg/minikube/constants" @@ -124,7 +124,7 @@ func isValidProfile(profilePath string) bool { fileContent := string(bytes) fmt.Println(fileContent) - var configObject config.Config + var configObject minikubeConfig.Config errUnmarshal := json.Unmarshal(bytes, &configObject) From f9e849066bceed81a4bf49d81b8585dae6300f14 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sun, 14 Jul 2019 00:14:12 +0200 Subject: [PATCH 005/106] Removed debug code Added skeleton for IsProfileConfigValid --- cmd/minikube/cmd/config/profile.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index ce09da4d22..f7295813d3 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -115,22 +115,20 @@ func isValidProfile(profilePath string) bool { // TODO: Use constants? profileConfigPath := filepath.Join(profilePath, "config.json") - fmt.Println(profileConfigPath) bytes, err := ioutil.ReadFile(profileConfigPath) if err != nil { console.ErrLn("Unable to read file: %s \n Error: %v", profileConfigPath, err) } - fileContent := string(bytes) - fmt.Println(fileContent) - var configObject minikubeConfig.Config - errUnmarshal := json.Unmarshal(bytes, &configObject) if errUnmarshal != nil { console.ErrLn("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) } - return &configObject != nil } + +func IsProfileConfigValid(configObject minikubeConfig.Config) bool { + return true +} From 13f40f4bf271eff96b0e2617697ae4652ce31c2a Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sun, 14 Jul 2019 14:33:13 +0200 Subject: [PATCH 006/106] Check if machineConfig and kubernetesConfig is not empty --- cmd/minikube/cmd/config/profile.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index f7295813d3..63f3db460a 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -18,7 +18,6 @@ package config import ( "encoding/json" - "fmt" "github.com/spf13/cobra" "github.com/spf13/viper" "io/ioutil" @@ -30,6 +29,7 @@ import ( pkgutil "k8s.io/minikube/pkg/util" "os" "path/filepath" + "reflect" ) // ProfileCmd represents the profile command @@ -126,9 +126,17 @@ func isValidProfile(profilePath string) bool { if errUnmarshal != nil { console.ErrLn("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) } - return &configObject != nil + return IsProfileConfigValid(configObject) } func IsProfileConfigValid(configObject minikubeConfig.Config) bool { + machineConfig := configObject.MachineConfig + kubernetesConfig := configObject.KubernetesConfig + if reflect.DeepEqual(machineConfig, minikubeConfig.MachineConfig{}) || reflect.DeepEqual(kubernetesConfig, minikubeConfig.KubernetesConfig{}) { + return false + } + + //TODO: Validate MachineConfig and KubernetesConfig? + return true } From dd9afd1783a3dadddbb73b69dae639432cbe1ed7 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sun, 14 Jul 2019 22:02:33 +0200 Subject: [PATCH 007/106] Ensure usage of --delete-all without -p flag Added skeleton for deleteAllProfiles function --- cmd/minikube/cmd/delete.go | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 3a6dce80cd..ea80cd6d68 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -17,6 +17,7 @@ limitations under the License. package cmd import ( + "fmt" "os" "github.com/docker/machine/libmachine" @@ -51,6 +52,19 @@ func runDelete(cmd *cobra.Command, args []string) { if len(args) > 0 { exit.Usage("usage: minikube delete") } + + profileFlag, _ := cmd.Flags().GetString("profile") + deleteAllFlag, _ := cmd.Flags().GetBool("delete-all") + + if profileFlag != constants.DefaultMachineName && deleteAllFlag { + exit.Usage("usage: minikube delete --delete-all") + } + + if deleteAllFlag { + profiles := cmdcfg.GetAllProfiles() + deleteAllProfiles(profiles) + } + profileName := viper.GetString(pkg_config.MachineProfile) api, err := machine.NewAPIClient() if err != nil { @@ -96,6 +110,13 @@ func runDelete(cmd *cobra.Command, args []string) { } } +func deleteAllProfiles(profiles []string) { + for _, profile := range profiles { + fmt.Println(profile) + } + os.Exit(0) +} + func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) { console.OutStyle(console.Resetting, "Uninstalling Kubernetes %s using %s ...", kc.KubernetesVersion, bsName) clusterBootstrapper, err := GetClusterBootstrapper(api, bsName) From 72a9493dfbd8e1078537204d3c003c2e53333f52 Mon Sep 17 00:00:00 2001 From: Marek Schwarz <20537480+marekschwarz@users.noreply.github.com> Date: Mon, 15 Jul 2019 12:30:39 +0200 Subject: [PATCH 008/106] Renamed delte-all flag to all --- cmd/minikube/cmd/delete.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index ea80cd6d68..3ea7ae12c5 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -54,10 +54,10 @@ func runDelete(cmd *cobra.Command, args []string) { } profileFlag, _ := cmd.Flags().GetString("profile") - deleteAllFlag, _ := cmd.Flags().GetBool("delete-all") + deleteAllFlag, _ := cmd.Flags().GetBool("all") if profileFlag != constants.DefaultMachineName && deleteAllFlag { - exit.Usage("usage: minikube delete --delete-all") + exit.Usage("usage: minikube delete --all") } if deleteAllFlag { @@ -128,6 +128,6 @@ func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsN } func init() { - deleteCmd.Flags().BoolVar(&deleteAll, "delete-all", false, "Set flag to delete all profiles") + deleteCmd.Flags().BoolVar(&deleteAll, "all", false, "Set flag to delete all profiles") RootCmd.AddCommand(deleteCmd) } From 925e803e85bf755df54b2279d895ce95cd11b318 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 16 Jul 2019 21:20:20 +0200 Subject: [PATCH 009/106] Added deleteProfile function --- cmd/minikube/cmd/delete.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index ea80cd6d68..a52852453f 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -49,10 +49,6 @@ associated files.`, // runDelete handles the executes the flow of "minikube delete" func runDelete(cmd *cobra.Command, args []string) { - if len(args) > 0 { - exit.Usage("usage: minikube delete") - } - profileFlag, _ := cmd.Flags().GetString("profile") deleteAllFlag, _ := cmd.Flags().GetBool("delete-all") @@ -63,9 +59,17 @@ func runDelete(cmd *cobra.Command, args []string) { if deleteAllFlag { profiles := cmdcfg.GetAllProfiles() deleteAllProfiles(profiles) - } + } else { + if len(args) > 0 { + exit.Usage("usage: minikube delete") + } - profileName := viper.GetString(pkg_config.MachineProfile) + profileName := viper.GetString(pkg_config.MachineProfile) + deleteProfile(profileName) + } +} + +func deleteProfile(profileName string) { api, err := machine.NewAPIClient() if err != nil { exit.WithError("Error getting client", err) From 3c4b1b1656e5312a41e5aecf9287239583b469a3 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 16 Jul 2019 21:20:59 +0200 Subject: [PATCH 010/106] Renamed minikubeConfig to mkConfig Renamed hasConfigJson to hasConfigJSON --- cmd/minikube/cmd/config/profile.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 63f3db460a..0bde7f6149 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "io/ioutil" - minikubeConfig "k8s.io/minikube/pkg/minikube/config" + mkConfig "k8s.io/minikube/pkg/minikube/config" pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/console" "k8s.io/minikube/pkg/minikube/constants" @@ -102,14 +102,14 @@ func isValidProfile(profilePath string) bool { console.ErrLn("Unable to list in dir: %s \n Error: %v", profilePath, err) } - hasConfigJson := false + hasConfigJSON := false for _, fileInfo := range fileInfos { if fileInfo.Name() == "config.json" { - hasConfigJson = true + hasConfigJSON = true } } - if !hasConfigJson { + if !hasConfigJSON { return false } @@ -120,7 +120,7 @@ func isValidProfile(profilePath string) bool { console.ErrLn("Unable to read file: %s \n Error: %v", profileConfigPath, err) } - var configObject minikubeConfig.Config + var configObject mkConfig.Config errUnmarshal := json.Unmarshal(bytes, &configObject) if errUnmarshal != nil { @@ -129,10 +129,10 @@ func isValidProfile(profilePath string) bool { return IsProfileConfigValid(configObject) } -func IsProfileConfigValid(configObject minikubeConfig.Config) bool { +func IsProfileConfigValid(configObject mkConfig.Config) bool { machineConfig := configObject.MachineConfig kubernetesConfig := configObject.KubernetesConfig - if reflect.DeepEqual(machineConfig, minikubeConfig.MachineConfig{}) || reflect.DeepEqual(kubernetesConfig, minikubeConfig.KubernetesConfig{}) { + if reflect.DeepEqual(machineConfig, mkConfig.MachineConfig{}) || reflect.DeepEqual(kubernetesConfig, mkConfig.KubernetesConfig{}) { return false } From d0e749b3a00e1470f6ffb9aa20add8254f648c2d Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 16 Jul 2019 22:08:47 +0200 Subject: [PATCH 011/106] Implemented deleteAllProfiles --- cmd/minikube/cmd/delete.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index eb712e45d2..7b686ec13e 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -17,7 +17,6 @@ limitations under the License. package cmd import ( - "fmt" "os" "github.com/docker/machine/libmachine" @@ -116,7 +115,9 @@ func deleteProfile(profileName string) { func deleteAllProfiles(profiles []string) { for _, profile := range profiles { - fmt.Println(profile) + // TODO: Refactor: viper.Set seems to be in the wrong place + viper.Set(pkg_config.MachineProfile, profile) + deleteProfile(profile) } os.Exit(0) } From 9e73f6e4aa562834e2aaa4dda5d4f6c446430508 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 18 Jul 2019 08:47:05 +0200 Subject: [PATCH 012/106] Refactor review findings Removed IsProfileConfigValid Added TODOs --- cmd/minikube/cmd/config/profile.go | 39 ++++++++++++------------------ cmd/minikube/cmd/delete.go | 27 +++++++++++++-------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 0bde7f6149..c8d438eece 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -18,6 +18,7 @@ package config import ( "encoding/json" + "fmt" "github.com/spf13/cobra" "github.com/spf13/viper" "io/ioutil" @@ -29,7 +30,6 @@ import ( pkgutil "k8s.io/minikube/pkg/util" "os" "path/filepath" - "reflect" ) // ProfileCmd represents the profile command @@ -76,30 +76,34 @@ var ProfileCmd = &cobra.Command{ }, } -func GetAllProfiles() []string { +func GetAllProfiles() ([]string, error) { miniPath := constants.GetMinipath() profilesPath := filepath.Join(miniPath, "profiles") fileInfos, err := ioutil.ReadDir(profilesPath) if err != nil { - console.ErrLn("Unable to list in dir: %s \n Error: %v", profilesPath, err) + return nil, fmt.Errorf("Unable to list in dir: %s \n Error: %v", profilesPath, err) } var profiles []string for _, fileInfo := range fileInfos { if fileInfo.IsDir() { profilePath := filepath.Join(profilesPath, fileInfo.Name()) - if isValidProfile(profilePath) { + isValidProfile, err := isValidProfile(profilePath) + if err != nil { + return nil, err + } + if isValidProfile { profiles = append(profiles, fileInfo.Name()) } } } - return profiles + return profiles, nil } -func isValidProfile(profilePath string) bool { +func isValidProfile(profilePath string) (bool, error) { fileInfos, err := ioutil.ReadDir(profilePath) if err != nil { - console.ErrLn("Unable to list in dir: %s \n Error: %v", profilePath, err) + return false, fmt.Errorf("Unable to list in dir: %s \n Error: %v", profilePath, err) } hasConfigJSON := false @@ -110,33 +114,22 @@ func isValidProfile(profilePath string) bool { } if !hasConfigJSON { - return false + return false, nil } // TODO: Use constants? profileConfigPath := filepath.Join(profilePath, "config.json") bytes, err := ioutil.ReadFile(profileConfigPath) if err != nil { - console.ErrLn("Unable to read file: %s \n Error: %v", profileConfigPath, err) + return false, fmt.Errorf("Unable to read file: %s \n Error: %v", profileConfigPath, err) } var configObject mkConfig.Config errUnmarshal := json.Unmarshal(bytes, &configObject) if errUnmarshal != nil { - console.ErrLn("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) + return false, fmt.Errorf("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) + } else { + return true, nil } - return IsProfileConfigValid(configObject) -} - -func IsProfileConfigValid(configObject mkConfig.Config) bool { - machineConfig := configObject.MachineConfig - kubernetesConfig := configObject.KubernetesConfig - if reflect.DeepEqual(machineConfig, mkConfig.MachineConfig{}) || reflect.DeepEqual(kubernetesConfig, mkConfig.KubernetesConfig{}) { - return false - } - - //TODO: Validate MachineConfig and KubernetesConfig? - - return true } diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 9149427db9..790b4c2965 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -48,15 +48,21 @@ associated files.`, // runDelete handles the executes the flow of "minikube delete" func runDelete(cmd *cobra.Command, args []string) { - profileFlag, _ := cmd.Flags().GetString("profile") - deleteAllFlag, _ := cmd.Flags().GetBool("all") - - if profileFlag != constants.DefaultMachineName && deleteAllFlag { - exit.Usage("usage: minikube delete --all") + profileFlag, err := cmd.Flags().GetString("profile") + if err != nil { + exit.WithError("Could not get profile flag", err) } - if deleteAllFlag { - profiles := cmdcfg.GetAllProfiles() + if deleteAll { + if profileFlag != constants.DefaultMachineName { + exit.Usage("usage: minikube delete --all") + } + + profiles, err := cmdcfg.GetAllProfiles() + if err != nil { + exit.WithError("Error getting profiles to delete", err) + } + deleteAllProfiles(profiles) } else { if len(args) > 0 { @@ -68,7 +74,10 @@ func runDelete(cmd *cobra.Command, args []string) { } } +//TODO Refactor: Return errors? func deleteProfile(profileName string) { + viper.Set(pkg_config.MachineProfile, profileName) + api, err := machine.NewAPIClient() if err != nil { exit.WithError("Error getting client", err) @@ -115,13 +124,11 @@ func deleteProfile(profileName string) { func deleteAllProfiles(profiles []string) { for _, profile := range profiles { - // TODO: Refactor: viper.Set seems to be in the wrong place - viper.Set(pkg_config.MachineProfile, profile) deleteProfile(profile) } - os.Exit(0) } +// TODO: Return errors? func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) { console.OutStyle(console.Resetting, "Uninstalling Kubernetes %s using %s ...", kc.KubernetesVersion, bsName) clusterBootstrapper, err := getClusterBootstrapper(api, bsName) From 42a58500f6a25a1d6353e16344eecec10c092e66 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 18 Jul 2019 11:40:52 +0200 Subject: [PATCH 013/106] Fixed lint errors --- cmd/minikube/cmd/config/profile.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index c8d438eece..46de4d02ed 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -81,7 +81,7 @@ func GetAllProfiles() ([]string, error) { profilesPath := filepath.Join(miniPath, "profiles") fileInfos, err := ioutil.ReadDir(profilesPath) if err != nil { - return nil, fmt.Errorf("Unable to list in dir: %s \n Error: %v", profilesPath, err) + return nil, fmt.Errorf("unable to list in dir: %s \n error: %v", profilesPath, err) } var profiles []string @@ -103,7 +103,7 @@ func GetAllProfiles() ([]string, error) { func isValidProfile(profilePath string) (bool, error) { fileInfos, err := ioutil.ReadDir(profilePath) if err != nil { - return false, fmt.Errorf("Unable to list in dir: %s \n Error: %v", profilePath, err) + return false, fmt.Errorf("unable to list in dir: %s \n error: %v", profilePath, err) } hasConfigJSON := false @@ -121,15 +121,14 @@ func isValidProfile(profilePath string) (bool, error) { profileConfigPath := filepath.Join(profilePath, "config.json") bytes, err := ioutil.ReadFile(profileConfigPath) if err != nil { - return false, fmt.Errorf("Unable to read file: %s \n Error: %v", profileConfigPath, err) + return false, fmt.Errorf("unable to read file: %s \n Error: %v", profileConfigPath, err) } var configObject mkConfig.Config errUnmarshal := json.Unmarshal(bytes, &configObject) if errUnmarshal != nil { - return false, fmt.Errorf("Could not unmarshal config json to config object: %s \n Error: %v", profileConfigPath, err) - } else { - return true, nil + return false, fmt.Errorf("could not unmarshal config json to config object: %s \n error: %v", profileConfigPath, err) } + return true, nil } From af571430a94f704fb82fa54769634712e9814df2 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 18 Jul 2019 11:51:45 +0200 Subject: [PATCH 014/106] Fixed translation errors --- translations/fr-FR.json | 3 +++ translations/zh-CN.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/translations/fr-FR.json b/translations/fr-FR.json index dbb1c26255..9c8225909a 100644 --- a/translations/fr-FR.json +++ b/translations/fr-FR.json @@ -22,6 +22,7 @@ "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", "Configuring environment for Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}}": "Configurant l'environment pour Kubernetes {{.k8sVersion}} sur {{.runtime}} {{.runtimeVersion}}", "Configuring local host environment ...": "", + "Could not get profile flag": "", "Creating %s VM (CPUs=%d, Memory=%dMB, Disk=%dMB) ...": "Créant un VM %s (CPUs=%d, Mémoire=%dMB, Disque=%dMB)", "Creating mount {{.name}} ...": "", "Deleting %q from %s ...": "", @@ -59,6 +60,7 @@ "Error getting host status": "", "Error getting machine logs": "", "Error getting machine status": "", + "Error getting profiles to delete": "", "Error getting service status": "", "Error getting service with namespace: %s and labels %s:%s: %v": "", "Error getting the host IP address to use from within the VM": "", @@ -277,6 +279,7 @@ "usage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "", "usage: minikube config unset PROPERTY_NAME": "", "usage: minikube delete": "", + "usage: minikube delete --all": "", "usage: minikube profile [MINIKUBE_PROFILE_NAME]": "", "zsh completion failed": "", "{{.addonName}} was successfully enabled": "", diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 294f672ec0..e176e24b77 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -22,6 +22,7 @@ "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", "Configuring environment for Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}}": "开始为Kubernetes {{.k8sVersion}}，{{.runtime}} {{.runtimeVersion}} 配置环境变量", "Configuring local host environment ...": "", + "Could not get profile flag": "", "Creating %s VM (CPUs=%d, Memory=%dMB, Disk=%dMB) ...": "正在创建%s虚拟机（CPU=%d，内存=%dMB，磁盘=%dMB）...", "Creating mount {{.name}} ...": "", "Deleting %q from %s ...": "", @@ -59,6 +60,7 @@ "Error getting host status": "", "Error getting machine logs": "", "Error getting machine status": "", + "Error getting profiles to delete": "", "Error getting service status": "", "Error getting service with namespace: %s and labels %s:%s: %v": "", "Error getting the host IP address to use from within the VM": "", @@ -277,6 +279,7 @@ "usage: minikube config set PROPERTY_NAME PROPERTY_VALUE": "", "usage: minikube config unset PROPERTY_NAME": "", "usage: minikube delete": "", + "usage: minikube delete --all": "", "usage: minikube profile [MINIKUBE_PROFILE_NAME]": "", "zsh completion failed": "", "{{.addonName}} was successfully enabled": "", From 4c6af0281a70bb5051a08a88068125bd3ad614b5 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 18 Jul 2019 13:21:53 +0200 Subject: [PATCH 015/106] Fixed goimports lint error --- cmd/minikube/cmd/config/profile.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 46de4d02ed..3426df4bb7 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -19,17 +19,18 @@ package config import ( "encoding/json" "fmt" + "io/ioutil" + "os" + "path/filepath" + "github.com/spf13/cobra" "github.com/spf13/viper" - "io/ioutil" mkConfig "k8s.io/minikube/pkg/minikube/config" pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/console" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" pkgutil "k8s.io/minikube/pkg/util" - "os" - "path/filepath" ) // ProfileCmd represents the profile command From 48bd69c895e15d9f61ef4a0f31b04016f67a7379 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 20 Jul 2019 18:57:27 +0200 Subject: [PATCH 016/106] Integrated ListProfiles() Removed GetAllProfiles() Made LoadProfile public --- cmd/minikube/cmd/config/profile.go | 62 ------------------------------ cmd/minikube/cmd/delete.go | 31 +++++++++------ pkg/minikube/config/profile.go | 4 +- 3 files changed, 21 insertions(+), 76 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index 55ef796269..c15be55847 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -17,15 +17,10 @@ limitations under the License. package config import ( - "encoding/json" - "fmt" - "io/ioutil" "os" - "path/filepath" "github.com/spf13/cobra" "github.com/spf13/viper" - mkConfig "k8s.io/minikube/pkg/minikube/config" pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" @@ -76,60 +71,3 @@ var ProfileCmd = &cobra.Command{ out.SuccessT("minikube profile was successfully set to {{.profile_name}}", out.V{"profile_name": profile}) }, } - -func GetAllProfiles() ([]string, error) { - miniPath := constants.GetMinipath() - profilesPath := filepath.Join(miniPath, "profiles") - fileInfos, err := ioutil.ReadDir(profilesPath) - if err != nil { - return nil, fmt.Errorf("unable to list in dir: %s \n error: %v", profilesPath, err) - } - - var profiles []string - for _, fileInfo := range fileInfos { - if fileInfo.IsDir() { - profilePath := filepath.Join(profilesPath, fileInfo.Name()) - isValidProfile, err := isValidProfile(profilePath) - if err != nil { - return nil, err - } - if isValidProfile { - profiles = append(profiles, fileInfo.Name()) - } - } - } - return profiles, nil -} - -func isValidProfile(profilePath string) (bool, error) { - fileInfos, err := ioutil.ReadDir(profilePath) - if err != nil { - return false, fmt.Errorf("unable to list in dir: %s \n error: %v", profilePath, err) - } - - hasConfigJSON := false - for _, fileInfo := range fileInfos { - if fileInfo.Name() == "config.json" { - hasConfigJSON = true - } - } - - if !hasConfigJSON { - return false, nil - } - - // TODO: Use constants? - profileConfigPath := filepath.Join(profilePath, "config.json") - bytes, err := ioutil.ReadFile(profileConfigPath) - if err != nil { - return false, fmt.Errorf("unable to read file: %s \n Error: %v", profileConfigPath, err) - } - - var configObject mkConfig.Config - errUnmarshal := json.Unmarshal(bytes, &configObject) - - if errUnmarshal != nil { - return false, fmt.Errorf("could not unmarshal config json to config object: %s \n error: %v", profileConfigPath, err) - } - return true, nil -} diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 3ac9f1f339..9ad3f7eb07 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -60,26 +60,33 @@ func runDelete(cmd *cobra.Command, args []string) { exit.UsageT("usage: minikube delete --all") } - profiles, err := cmdcfg.GetAllProfiles() + validProfiles, invalidProfiles, err := pkg_config.ListProfiles() + profilesToDelete := append(validProfiles, invalidProfiles...) + if err != nil { exit.WithError("Error getting profiles to delete", err) } - deleteAllProfiles(profiles) + deleteAllProfiles(profilesToDelete) } else { if len(args) > 0 { exit.UsageT("usage: minikube delete") } profileName := viper.GetString(pkg_config.MachineProfile) - deleteProfile(profileName) + profile, err := pkg_config.LoadProfile(profileName) + + if err != nil { + exit.WithError("Could not load profile", err) + } + deleteProfile(profile) } } } -//TODO Refactor: Return errors? -func deleteProfile(profileName string) { - viper.Set(pkg_config.MachineProfile, profileName) +//TODO Return errors and handle in runDelete? +func deleteProfile(profile *pkg_config.Profile) { + viper.Set(pkg_config.MachineProfile, profile.Name) api, err := machine.NewAPIClient() if err != nil { @@ -89,7 +96,7 @@ func deleteProfile(profileName string) { cc, err := pkg_config.Load() if err != nil && !os.IsNotExist(err) { - out.ErrT(out.Sad, "Error loading profile config: {{.error}}", out.V{"name": profileName}) + out.ErrT(out.Sad, "Error loading profile config: {{.error}}", out.V{"name": profile.Name}) } // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete @@ -100,7 +107,7 @@ func deleteProfile(profileName string) { if err = cluster.DeleteHost(api); err != nil { switch err := errors.Cause(err).(type) { case mcnerror.ErrHostDoesNotExist: - out.T(out.Meh, `"{{.name}}" cluster does not exist`, out.V{"name": profileName}) + out.T(out.Meh, `"{{.name}}" cluster does not exist`, out.V{"name": profile.Name}) default: exit.WithError("Failed to delete cluster", err) } @@ -112,12 +119,12 @@ func deleteProfile(profileName string) { if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { if os.IsNotExist(err) { - out.T(out.Meh, `"{{.profile_name}}" profile does not exist`, out.V{"profile_name": profileName}) + out.T(out.Meh, `"{{.profile_name}}" profile does not exist`, out.V{"profile_name": profile.Name}) os.Exit(0) } exit.WithError("Failed to remove profile", err) } - out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profileName}) + out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profile.Name}) machineName := pkg_config.GetMachineName() if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { @@ -125,13 +132,13 @@ func deleteProfile(profileName string) { } } -func deleteAllProfiles(profiles []string) { +func deleteAllProfiles(profiles []*pkg_config.Profile) { for _, profile := range profiles { deleteProfile(profile) } } -// TODO: Return errors? +//TODO Return errors and handle in deleteProfile? func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) { out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName}) clusterBootstrapper, err := getClusterBootstrapper(api, bsName) diff --git a/pkg/minikube/config/profile.go b/pkg/minikube/config/profile.go index bd56d070bd..f95990b463 100644 --- a/pkg/minikube/config/profile.go +++ b/pkg/minikube/config/profile.go @@ -43,7 +43,7 @@ func ListProfiles(miniHome ...string) (validPs []*Profile, inValidPs []*Profile, return nil, nil, err } for _, n := range pDirs { - p, err := loadProfile(n, miniHome...) + p, err := LoadProfile(n, miniHome...) if err != nil { inValidPs = append(inValidPs, p) continue @@ -58,7 +58,7 @@ func ListProfiles(miniHome ...string) (validPs []*Profile, inValidPs []*Profile, } // loadProfile loads type Profile based on its name -func loadProfile(name string, miniHome ...string) (*Profile, error) { +func LoadProfile(name string, miniHome ...string) (*Profile, error) { cfg, err := DefaultLoader.LoadConfigFromFile(name, miniHome...) p := &Profile{ Name: name, From e237a1314dfe7d3a20ac7cd4b908cb447b27c1b5 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 20 Jul 2019 20:02:40 +0200 Subject: [PATCH 017/106] Fixed merge error --- cmd/minikube/cmd/delete.go | 55 ++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 9ad3f7eb07..b8a26d2b26 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -48,39 +48,36 @@ associated files.`, // runDelete handles the executes the flow of "minikube delete" func runDelete(cmd *cobra.Command, args []string) { - if len(args) > 0 { - exit.UsageT("usage: minikube delete") - profileFlag, err := cmd.Flags().GetString("profile") + profileFlag, err := cmd.Flags().GetString("profile") + if err != nil { + exit.WithError("Could not get profile flag", err) + } + + if deleteAll { + if profileFlag != constants.DefaultMachineName { + exit.UsageT("usage: minikube delete --all") + } + + validProfiles, invalidProfiles, err := pkg_config.ListProfiles() + profilesToDelete := append(validProfiles, invalidProfiles...) + if err != nil { - exit.WithError("Could not get profile flag", err) + exit.WithError("Error getting profiles to delete", err) } - if deleteAll { - if profileFlag != constants.DefaultMachineName { - exit.UsageT("usage: minikube delete --all") - } - - validProfiles, invalidProfiles, err := pkg_config.ListProfiles() - profilesToDelete := append(validProfiles, invalidProfiles...) - - if err != nil { - exit.WithError("Error getting profiles to delete", err) - } - - deleteAllProfiles(profilesToDelete) - } else { - if len(args) > 0 { - exit.UsageT("usage: minikube delete") - } - - profileName := viper.GetString(pkg_config.MachineProfile) - profile, err := pkg_config.LoadProfile(profileName) - - if err != nil { - exit.WithError("Could not load profile", err) - } - deleteProfile(profile) + deleteAllProfiles(profilesToDelete) + } else { + if len(args) > 0 { + exit.UsageT("usage: minikube delete") } + + profileName := viper.GetString(pkg_config.MachineProfile) + profile, err := pkg_config.LoadProfile(profileName) + + if err != nil { + exit.WithError("Could not load profile", err) + } + deleteProfile(profile) } } From 45161fabc4d7bee91827d761669e988f7a393c3a Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 23 Jul 2019 00:58:02 +0200 Subject: [PATCH 018/106] Keep deleting when profiles when the deletion of one profile fails Added deletionError struct Added function to handle deletion errors for logging --- cmd/minikube/cmd/delete.go | 103 ++++++++++++++++++++++++++++--------- 1 file changed, 79 insertions(+), 24 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index b8a26d2b26..ac1fb67569 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -17,6 +17,7 @@ limitations under the License. package cmd import ( + "fmt" "os" "github.com/docker/machine/libmachine" @@ -46,6 +47,24 @@ associated files.`, Run: runDelete, } +type typeOfError int + +const ( + Fatal typeOfError = 0 + MissingProfile typeOfError = 1 + MissingCluster typeOfError = 2 + Usage typeOfError = 3 +) + +type deletionError struct { + err error + errtype typeOfError +} + +func (error deletionError) Error() string { + return error.err.Error() +} + // runDelete handles the executes the flow of "minikube delete" func runDelete(cmd *cobra.Command, args []string) { profileFlag, err := cmd.Flags().GetString("profile") @@ -65,7 +84,10 @@ func runDelete(cmd *cobra.Command, args []string) { exit.WithError("Error getting profiles to delete", err) } - deleteAllProfiles(profilesToDelete) + errs := deleteAllProfiles(profilesToDelete) + if len(errs) > 0 { + handleDeletionErrors(errs) + } } else { if len(args) > 0 { exit.UsageT("usage: minikube delete") @@ -77,73 +99,106 @@ func runDelete(cmd *cobra.Command, args []string) { if err != nil { exit.WithError("Could not load profile", err) } - deleteProfile(profile) + + err = deleteProfile(profile) + if err != nil { + handleDeletionErrors([]error{err}) + } } } -//TODO Return errors and handle in runDelete? -func deleteProfile(profile *pkg_config.Profile) { +func handleDeletionErrors(errors []error) { + for _, err := range errors { + deletionError, ok := err.(deletionError) + if ok { + switch deletionError.errtype { + case Fatal: + out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) + case MissingProfile: + out.ErrT(out.Sad, "Error deleting profile: {{.error}}", out.V{"error": deletionError}) + case MissingCluster: + out.T(out.Meh, `Error deleting profile: {{.error}}`, out.V{"error": deletionError}) + case Usage: + out.ErrT(out.Usage, "usage: minikube delete or minikube delete -p foo or minikube delete --all") + default: + out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) + } + } else { + exit.WithError("Could not process errors from failed deletion", nil) + } + } + os.Exit(0) +} + +func deleteAllProfiles(profiles []*pkg_config.Profile) []error { + var errs []error + for _, profile := range profiles { + err := deleteProfile(profile) + if err != nil { + errs = append(errs, err) + } + } + return errs +} + +func deleteProfile(profile *pkg_config.Profile) error { viper.Set(pkg_config.MachineProfile, profile.Name) api, err := machine.NewAPIClient() if err != nil { - exit.WithError("Error getting client", err) + return deletionError{fmt.Errorf("error getting client %v", err), Fatal} } defer api.Close() cc, err := pkg_config.Load() if err != nil && !os.IsNotExist(err) { - out.ErrT(out.Sad, "Error loading profile config: {{.error}}", out.V{"name": profile.Name}) + return deletionError{fmt.Errorf("error loading profile config: %s", profile.Name), Usage} } // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete if err == nil && cc.MachineConfig.VMDriver == constants.DriverNone { - uninstallKubernetes(api, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)) + if err := uninstallKubernetes(api, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil { + return err + } } if err = cluster.DeleteHost(api); err != nil { switch err := errors.Cause(err).(type) { case mcnerror.ErrHostDoesNotExist: - out.T(out.Meh, `"{{.name}}" cluster does not exist`, out.V{"name": profile.Name}) + return deletionError{fmt.Errorf("%s cluster does not exist", profile.Name), MissingCluster} default: - exit.WithError("Failed to delete cluster", err) + return deletionError{fmt.Errorf("failed to delete cluster %v", err), Fatal} } } if err := cmdUtil.KillMountProcess(); err != nil { - out.FatalT("Failed to kill mount process: {{.error}}", out.V{"error": err}) + return deletionError{fmt.Errorf("failed to kill mount process: %v", err), Fatal} } if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { if os.IsNotExist(err) { - out.T(out.Meh, `"{{.profile_name}}" profile does not exist`, out.V{"profile_name": profile.Name}) - os.Exit(0) + return deletionError{fmt.Errorf("%s profile does not exist", profile.Name), MissingProfile} } - exit.WithError("Failed to remove profile", err) + return deletionError{fmt.Errorf("failed to remove profile %v", err), Fatal} } out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profile.Name}) machineName := pkg_config.GetMachineName() if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { - exit.WithError("update config", err) + return deletionError{fmt.Errorf("update config %v", err), Fatal} } + return nil } -func deleteAllProfiles(profiles []*pkg_config.Profile) { - for _, profile := range profiles { - deleteProfile(profile) - } -} - -//TODO Return errors and handle in deleteProfile? -func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) { +func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) error { out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName}) clusterBootstrapper, err := getClusterBootstrapper(api, bsName) if err != nil { - out.ErrT(out.Empty, "Unable to get bootstrapper: {{.error}}", out.V{"error": err}) + return deletionError{fmt.Errorf("unable to get bootstrapper: %v", err), Fatal} } else if err = clusterBootstrapper.DeleteCluster(kc); err != nil { - out.ErrT(out.Empty, "Failed to delete cluster: {{.error}}", out.V{"error": err}) + return deletionError{fmt.Errorf("failed to delete cluster: %v", err), Fatal} } + return nil } func init() { From cb589740c3f1b630ccdae3de7f066640c0dc9665 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 23 Jul 2019 09:08:16 +0200 Subject: [PATCH 019/106] Added testdata for unit tests Reorganized testdata file structure --- pkg/minikube/config/profile_test.go | 2 +- .../.minikube/profiles/p1/config.json | 0 .../.minikube/profiles/p2/config.json | 0 .../.minikube/profiles/p3_empty/config.json | 0 .../profiles/p4_invalid_file/config.json | 0 .../profiles/p5_partial_config/config.json | 0 .../profile/.minikube/profiles/p1/config.json | 50 +++++++++++++++++++ .../profile/.minikube/profiles/p2/config.json | 49 ++++++++++++++++++ .../.minikube/profiles/p3_empty/config.json | 0 .../profiles/p4_invalid_file/config.json | 1 + .../profiles/p5_partial_config/config.json | 47 +++++++++++++++++ 11 files changed, 148 insertions(+), 1 deletion(-) rename pkg/minikube/config/testdata/{ => delete}/.minikube/profiles/p1/config.json (100%) rename pkg/minikube/config/testdata/{ => delete}/.minikube/profiles/p2/config.json (100%) rename pkg/minikube/config/testdata/{ => delete}/.minikube/profiles/p3_empty/config.json (100%) rename pkg/minikube/config/testdata/{ => delete}/.minikube/profiles/p4_invalid_file/config.json (100%) rename pkg/minikube/config/testdata/{ => delete}/.minikube/profiles/p5_partial_config/config.json (100%) create mode 100644 pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json create mode 100644 pkg/minikube/config/testdata/profile/.minikube/profiles/p2/config.json create mode 100644 pkg/minikube/config/testdata/profile/.minikube/profiles/p3_empty/config.json create mode 100644 pkg/minikube/config/testdata/profile/.minikube/profiles/p4_invalid_file/config.json create mode 100644 pkg/minikube/config/testdata/profile/.minikube/profiles/p5_partial_config/config.json diff --git a/pkg/minikube/config/profile_test.go b/pkg/minikube/config/profile_test.go index ac96602ee6..68447ea57a 100644 --- a/pkg/minikube/config/profile_test.go +++ b/pkg/minikube/config/profile_test.go @@ -22,7 +22,7 @@ import ( ) func TestListProfiles(t *testing.T) { - miniDir, err := filepath.Abs("./testdata/.minikube") + miniDir, err := filepath.Abs("./testdata/profile/.minikube") if err != nil { t.Errorf("error getting dir path for ./testdata/.minikube : %v", err) } diff --git a/pkg/minikube/config/testdata/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json similarity index 100% rename from pkg/minikube/config/testdata/.minikube/profiles/p1/config.json rename to pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json diff --git a/pkg/minikube/config/testdata/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json similarity index 100% rename from pkg/minikube/config/testdata/.minikube/profiles/p2/config.json rename to pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json diff --git a/pkg/minikube/config/testdata/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p3_empty/config.json similarity index 100% rename from pkg/minikube/config/testdata/.minikube/profiles/p3_empty/config.json rename to pkg/minikube/config/testdata/delete/.minikube/profiles/p3_empty/config.json diff --git a/pkg/minikube/config/testdata/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p4_invalid_file/config.json similarity index 100% rename from pkg/minikube/config/testdata/.minikube/profiles/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete/.minikube/profiles/p4_invalid_file/config.json diff --git a/pkg/minikube/config/testdata/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p5_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/.minikube/profiles/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete/.minikube/profiles/p5_partial_config/config.json diff --git a/pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json new file mode 100644 index 0000000000..86699a29bb --- /dev/null +++ b/pkg/minikube/config/testdata/profile/.minikube/profiles/p1/config.json @@ -0,0 +1,50 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "XhyveDiskDriver": "ahci-hd", + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.75", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/profile/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/profile/.minikube/profiles/p2/config.json new file mode 100644 index 0000000000..d77e0221d2 --- /dev/null +++ b/pkg/minikube/config/testdata/profile/.minikube/profiles/p2/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "virtualbox", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.99.136", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/profile/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/profile/.minikube/profiles/p3_empty/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/profile/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/profile/.minikube/profiles/p4_invalid_file/config.json new file mode 100644 index 0000000000..9e2e347718 --- /dev/null +++ b/pkg/minikube/config/testdata/profile/.minikube/profiles/p4_invalid_file/config.json @@ -0,0 +1 @@ +invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/profile/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/profile/.minikube/profiles/p5_partial_config/config.json new file mode 100644 index 0000000000..29f62c0149 --- /dev/null +++ b/pkg/minikube/config/testdata/profile/.minikube/profiles/p5_partial_config/config.json @@ -0,0 +1,47 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "XhyveDiskDriver": "ahci-hd", + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file From 6d9ae13990395b03fadbbdbc76d4f6c7a070b4be Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 23 Jul 2019 13:50:36 +0200 Subject: [PATCH 020/106] Fixed Test --- cmd/minikube/cmd/delete.go | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index ac1fb67569..062d836e61 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -52,8 +52,7 @@ type typeOfError int const ( Fatal typeOfError = 0 MissingProfile typeOfError = 1 - MissingCluster typeOfError = 2 - Usage typeOfError = 3 + Usage typeOfError = 2 ) type deletionError struct { @@ -95,14 +94,13 @@ func runDelete(cmd *cobra.Command, args []string) { profileName := viper.GetString(pkg_config.MachineProfile) profile, err := pkg_config.LoadProfile(profileName) - - if err != nil { - exit.WithError("Could not load profile", err) - } - - err = deleteProfile(profile) - if err != nil { - handleDeletionErrors([]error{err}) + if err == nil { + err = deleteProfile(profile) + if err != nil { + handleDeletionErrors([]error{err}) + } + } else { + out.ErrT(out.Sad, "Error loading profile: {{.name}} {{.error}}", out.V{"name": profileName, "error": err}) } } } @@ -116,18 +114,15 @@ func handleDeletionErrors(errors []error) { out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) case MissingProfile: out.ErrT(out.Sad, "Error deleting profile: {{.error}}", out.V{"error": deletionError}) - case MissingCluster: - out.T(out.Meh, `Error deleting profile: {{.error}}`, out.V{"error": deletionError}) case Usage: out.ErrT(out.Usage, "usage: minikube delete or minikube delete -p foo or minikube delete --all") default: out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) } } else { - exit.WithError("Could not process errors from failed deletion", nil) + exit.WithError("Could not process errors from failed deletion", err) } } - os.Exit(0) } func deleteAllProfiles(profiles []*pkg_config.Profile) []error { @@ -165,7 +160,7 @@ func deleteProfile(profile *pkg_config.Profile) error { if err = cluster.DeleteHost(api); err != nil { switch err := errors.Cause(err).(type) { case mcnerror.ErrHostDoesNotExist: - return deletionError{fmt.Errorf("%s cluster does not exist", profile.Name), MissingCluster} + out.T(out.Meh, `"{{.name}}" cluster does not exist`, out.V{"name": profile.Name}) default: return deletionError{fmt.Errorf("failed to delete cluster %v", err), Fatal} } From 6dcb45ad5273fcf26c449f7958af7a51bd0e4f2d Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 23 Jul 2019 17:26:27 +0200 Subject: [PATCH 021/106] Refactor --- cmd/minikube/cmd/delete.go | 49 ++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 062d836e61..364a705ba7 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -52,7 +52,8 @@ type typeOfError int const ( Fatal typeOfError = 0 MissingProfile typeOfError = 1 - Usage typeOfError = 2 + MissingCluster typeOfError = 2 + Usage typeOfError = 3 ) type deletionError struct { @@ -94,13 +95,13 @@ func runDelete(cmd *cobra.Command, args []string) { profileName := viper.GetString(pkg_config.MachineProfile) profile, err := pkg_config.LoadProfile(profileName) - if err == nil { - err = deleteProfile(profile) - if err != nil { - handleDeletionErrors([]error{err}) - } - } else { - out.ErrT(out.Sad, "Error loading profile: {{.name}} {{.error}}", out.V{"name": profileName, "error": err}) + if err != nil { + out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": profileName}) + } + + err = deleteProfile(profile) + if err != nil { + handleDeletionErrors([]error{err}) } } } @@ -111,13 +112,15 @@ func handleDeletionErrors(errors []error) { if ok { switch deletionError.errtype { case Fatal: - out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) + out.FatalT(deletionError.Error()) case MissingProfile: - out.ErrT(out.Sad, "Error deleting profile: {{.error}}", out.V{"error": deletionError}) + out.ErrT(out.Sad, deletionError.Error()) + case MissingCluster: + out.ErrT(out.Meh, deletionError.Error()) case Usage: out.ErrT(out.Usage, "usage: minikube delete or minikube delete -p foo or minikube delete --all") default: - out.FatalT("Error deleting profile: {{.error}}", out.V{"error": deletionError}) + out.FatalT(deletionError.Error()) } } else { exit.WithError("Could not process errors from failed deletion", err) @@ -141,46 +144,52 @@ func deleteProfile(profile *pkg_config.Profile) error { api, err := machine.NewAPIClient() if err != nil { - return deletionError{fmt.Errorf("error getting client %v", err), Fatal} + return deletionError{fmt.Errorf("error deleting profile \"%s\": error getting client %v", profile.Name, err), Fatal} } defer api.Close() cc, err := pkg_config.Load() if err != nil && !os.IsNotExist(err) { - return deletionError{fmt.Errorf("error loading profile config: %s", profile.Name), Usage} + return deletionError{fmt.Errorf("error deleting profile \"%s\": error loading profile config: %s", profile.Name, profile.Name), Usage} } // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete if err == nil && cc.MachineConfig.VMDriver == constants.DriverNone { if err := uninstallKubernetes(api, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil { - return err + deletionError, ok := err.(deletionError) + if ok { + deletionError.err = fmt.Errorf("error deleting profile \"%s\": %v", profile.Name, err) + return deletionError + } else { + return err + } } } if err = cluster.DeleteHost(api); err != nil { switch err := errors.Cause(err).(type) { case mcnerror.ErrHostDoesNotExist: - out.T(out.Meh, `"{{.name}}" cluster does not exist`, out.V{"name": profile.Name}) + return deletionError{fmt.Errorf("error deleting profile \"%s\": \"%s\" cluster does not exist", profile.Name, profile.Name), MissingCluster} default: - return deletionError{fmt.Errorf("failed to delete cluster %v", err), Fatal} + return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to delete cluster %v", profile.Name, err), Fatal} } } if err := cmdUtil.KillMountProcess(); err != nil { - return deletionError{fmt.Errorf("failed to kill mount process: %v", err), Fatal} + return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to kill mount process: %v", profile.Name, err), Fatal} } if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { if os.IsNotExist(err) { - return deletionError{fmt.Errorf("%s profile does not exist", profile.Name), MissingProfile} + return deletionError{fmt.Errorf("error deleting profile \"%s\": %s profile does not exist", profile.Name, profile.Name), MissingProfile} } - return deletionError{fmt.Errorf("failed to remove profile %v", err), Fatal} + return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to remove profile %v", profile.Name, err), Fatal} } out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profile.Name}) machineName := pkg_config.GetMachineName() if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { - return deletionError{fmt.Errorf("update config %v", err), Fatal} + return deletionError{fmt.Errorf("error deleting profile \"%s\": update config %v", profile.Name, err), Fatal} } return nil } From 1ef11bfea8f2f054a72b4ea5e91b6afc1c984830 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 23 Jul 2019 17:53:14 +0200 Subject: [PATCH 022/106] Fix test --- cmd/minikube/cmd/delete.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 364a705ba7..3a01e656e2 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -160,9 +160,8 @@ func deleteProfile(profile *pkg_config.Profile) error { if ok { deletionError.err = fmt.Errorf("error deleting profile \"%s\": %v", profile.Name, err) return deletionError - } else { - return err } + return err } } From 96ef740782e61659f7e4ece287fc43d78c1375c5 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Wed, 24 Jul 2019 15:01:52 +0200 Subject: [PATCH 023/106] Improved logging --- cmd/minikube/cmd/delete.go | 44 +++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 3a01e656e2..f573eae02a 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -22,6 +22,7 @@ import ( "github.com/docker/machine/libmachine" "github.com/docker/machine/libmachine/mcnerror" + "github.com/golang/glog" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -53,7 +54,6 @@ const ( Fatal typeOfError = 0 MissingProfile typeOfError = 1 MissingCluster typeOfError = 2 - Usage typeOfError = 3 ) type deletionError struct { @@ -107,20 +107,48 @@ func runDelete(cmd *cobra.Command, args []string) { } func handleDeletionErrors(errors []error) { + if len(errors) == 1 { + handleSingleDeletionError(errors[0]) + } else { + handleMultipleDeletionErrors(errors) + } +} + +func handleSingleDeletionError(err error) { + deletionError, ok := err.(deletionError) + + if ok { + switch deletionError.errtype { + case Fatal: + out.FatalT(deletionError.Error()) + case MissingProfile: + out.ErrT(out.Sad, deletionError.Error()) + case MissingCluster: + out.ErrT(out.Meh, deletionError.Error()) + default: + out.FatalT(deletionError.Error()) + } + } else { + exit.WithError("Could not process error from failed deletion", err) + } +} + +func handleMultipleDeletionErrors(errors []error) { + out.ErrT(out.Sad, "Multiple errors deleting profiles") + for _, err := range errors { deletionError, ok := err.(deletionError) + if ok { switch deletionError.errtype { case Fatal: - out.FatalT(deletionError.Error()) + glog.Errorln(deletionError.Error()) case MissingProfile: - out.ErrT(out.Sad, deletionError.Error()) + glog.Errorln(deletionError.Error()) case MissingCluster: - out.ErrT(out.Meh, deletionError.Error()) - case Usage: - out.ErrT(out.Usage, "usage: minikube delete or minikube delete -p foo or minikube delete --all") + glog.Errorln(deletionError.Error()) default: - out.FatalT(deletionError.Error()) + glog.Errorln(deletionError.Error()) } } else { exit.WithError("Could not process errors from failed deletion", err) @@ -150,7 +178,7 @@ func deleteProfile(profile *pkg_config.Profile) error { cc, err := pkg_config.Load() if err != nil && !os.IsNotExist(err) { - return deletionError{fmt.Errorf("error deleting profile \"%s\": error loading profile config: %s", profile.Name, profile.Name), Usage} + return deletionError{fmt.Errorf("error deleting profile \"%s\": error loading profile config: %v", profile.Name, err), MissingProfile} } // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete From d4d8cc43f011a1e216d3a473c208d70532f600c0 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Wed, 24 Jul 2019 17:28:57 +0200 Subject: [PATCH 024/106] Refactor error init --- cmd/minikube/cmd/delete.go | 193 ++++++++++++++++++++----------------- 1 file changed, 103 insertions(+), 90 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index f573eae02a..166b7449e2 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -56,13 +56,13 @@ const ( MissingCluster typeOfError = 2 ) -type deletionError struct { - err error - errtype typeOfError +type DeletionError struct { + Err error + Errtype typeOfError } -func (error deletionError) Error() string { - return error.err.Error() +func (error DeletionError) Error() string { + return error.Err.Error() } // runDelete handles the executes the flow of "minikube delete" @@ -84,9 +84,9 @@ func runDelete(cmd *cobra.Command, args []string) { exit.WithError("Error getting profiles to delete", err) } - errs := deleteAllProfiles(profilesToDelete) + errs := DeleteAllProfiles(profilesToDelete) if len(errs) > 0 { - handleDeletionErrors(errs) + HandleDeletionErrors(errs) } } else { if len(args) > 0 { @@ -99,14 +99,103 @@ func runDelete(cmd *cobra.Command, args []string) { out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": profileName}) } - err = deleteProfile(profile) + err = DeleteProfile(profile) if err != nil { - handleDeletionErrors([]error{err}) + HandleDeletionErrors([]error{err}) } } } -func handleDeletionErrors(errors []error) { +func DeleteAllProfiles(profiles []*pkg_config.Profile) []error { + var errs []error + for _, profile := range profiles { + err := DeleteProfile(profile) + if err != nil { + errs = append(errs, err) + } + } + return errs +} + +func DeleteProfile(profile *pkg_config.Profile) error { + viper.Set(pkg_config.MachineProfile, profile.Name) + + api, err := machine.NewAPIClient() + if err != nil { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("error getting client %v", err)) + return DeletionError{Err: delErr, Errtype: Fatal} + } + defer api.Close() + + cc, err := pkg_config.Load() + if err != nil && !os.IsNotExist(err) { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("error loading profile config: %v", err)) + return DeletionError{Err: delErr, Errtype: MissingProfile} + } + + // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete + if err == nil && cc.MachineConfig.VMDriver == constants.DriverNone { + if err := uninstallKubernetes(api, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil { + deletionError, ok := err.(DeletionError) + if ok { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("%v", err)) + deletionError.Err = delErr + return deletionError + } + return err + } + } + + if err = cluster.DeleteHost(api); err != nil { + switch err := errors.Cause(err).(type) { + case mcnerror.ErrHostDoesNotExist: + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("\"%s\" cluster does not exist", profile.Name)) + return DeletionError{Err: delErr, Errtype: MissingCluster} + default: + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("failed to delete cluster %v", err)) + return DeletionError{Err: delErr, Errtype: Fatal} + } + } + + if err := cmdUtil.KillMountProcess(); err != nil { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("failed to kill mount process: %v", err)) + return DeletionError{Err: delErr, Errtype: Fatal} + } + + if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { + if os.IsNotExist(err) { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("\"%s\" profile does not exist", profile.Name)) + return DeletionError{Err: delErr, Errtype: MissingProfile} + } + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("failed to remove profile %v", err)) + return DeletionError{Err: delErr, Errtype: Fatal} + } + out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profile.Name}) + + machineName := pkg_config.GetMachineName() + if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { + delErr := profileDeletionErr(profile.Name, fmt.Sprintf("update config %v", err)) + return DeletionError{Err: delErr, Errtype: Fatal} + } + return nil +} + +func profileDeletionErr(profileName string, additionalInfo string) error { + return fmt.Errorf("error deleting profile \"%s\": %s", profileName, additionalInfo) +} + +func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) error { + out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName}) + clusterBootstrapper, err := getClusterBootstrapper(api, bsName) + if err != nil { + return DeletionError{Err: fmt.Errorf("unable to get bootstrapper: %v", err), Errtype: Fatal} + } else if err = clusterBootstrapper.DeleteCluster(kc); err != nil { + return DeletionError{Err: fmt.Errorf("failed to delete cluster: %v", err), Errtype: Fatal} + } + return nil +} + +func HandleDeletionErrors(errors []error) { if len(errors) == 1 { handleSingleDeletionError(errors[0]) } else { @@ -115,10 +204,10 @@ func handleDeletionErrors(errors []error) { } func handleSingleDeletionError(err error) { - deletionError, ok := err.(deletionError) + deletionError, ok := err.(DeletionError) if ok { - switch deletionError.errtype { + switch deletionError.Errtype { case Fatal: out.FatalT(deletionError.Error()) case MissingProfile: @@ -137,10 +226,10 @@ func handleMultipleDeletionErrors(errors []error) { out.ErrT(out.Sad, "Multiple errors deleting profiles") for _, err := range errors { - deletionError, ok := err.(deletionError) + deletionError, ok := err.(DeletionError) if ok { - switch deletionError.errtype { + switch deletionError.Errtype { case Fatal: glog.Errorln(deletionError.Error()) case MissingProfile: @@ -156,82 +245,6 @@ func handleMultipleDeletionErrors(errors []error) { } } -func deleteAllProfiles(profiles []*pkg_config.Profile) []error { - var errs []error - for _, profile := range profiles { - err := deleteProfile(profile) - if err != nil { - errs = append(errs, err) - } - } - return errs -} - -func deleteProfile(profile *pkg_config.Profile) error { - viper.Set(pkg_config.MachineProfile, profile.Name) - - api, err := machine.NewAPIClient() - if err != nil { - return deletionError{fmt.Errorf("error deleting profile \"%s\": error getting client %v", profile.Name, err), Fatal} - } - defer api.Close() - - cc, err := pkg_config.Load() - if err != nil && !os.IsNotExist(err) { - return deletionError{fmt.Errorf("error deleting profile \"%s\": error loading profile config: %v", profile.Name, err), MissingProfile} - } - - // In the case of "none", we want to uninstall Kubernetes as there is no VM to delete - if err == nil && cc.MachineConfig.VMDriver == constants.DriverNone { - if err := uninstallKubernetes(api, cc.KubernetesConfig, viper.GetString(cmdcfg.Bootstrapper)); err != nil { - deletionError, ok := err.(deletionError) - if ok { - deletionError.err = fmt.Errorf("error deleting profile \"%s\": %v", profile.Name, err) - return deletionError - } - return err - } - } - - if err = cluster.DeleteHost(api); err != nil { - switch err := errors.Cause(err).(type) { - case mcnerror.ErrHostDoesNotExist: - return deletionError{fmt.Errorf("error deleting profile \"%s\": \"%s\" cluster does not exist", profile.Name, profile.Name), MissingCluster} - default: - return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to delete cluster %v", profile.Name, err), Fatal} - } - } - - if err := cmdUtil.KillMountProcess(); err != nil { - return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to kill mount process: %v", profile.Name, err), Fatal} - } - - if err := os.RemoveAll(constants.GetProfilePath(viper.GetString(pkg_config.MachineProfile))); err != nil { - if os.IsNotExist(err) { - return deletionError{fmt.Errorf("error deleting profile \"%s\": %s profile does not exist", profile.Name, profile.Name), MissingProfile} - } - return deletionError{fmt.Errorf("error deleting profile \"%s\": failed to remove profile %v", profile.Name, err), Fatal} - } - out.T(out.Crushed, `The "{{.cluster_name}}" cluster has been deleted.`, out.V{"cluster_name": profile.Name}) - - machineName := pkg_config.GetMachineName() - if err := pkgutil.DeleteKubeConfigContext(constants.KubeconfigPath, machineName); err != nil { - return deletionError{fmt.Errorf("error deleting profile \"%s\": update config %v", profile.Name, err), Fatal} - } - return nil -} - -func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsName string) error { - out.T(out.Resetting, "Uninstalling Kubernetes {{.kubernetes_version}} using {{.bootstrapper_name}} ...", out.V{"kubernetes_version": kc.KubernetesVersion, "bootstrapper_name": bsName}) - clusterBootstrapper, err := getClusterBootstrapper(api, bsName) - if err != nil { - return deletionError{fmt.Errorf("unable to get bootstrapper: %v", err), Fatal} - } else if err = clusterBootstrapper.DeleteCluster(kc); err != nil { - return deletionError{fmt.Errorf("failed to delete cluster: %v", err), Fatal} - } - return nil -} - func init() { deleteCmd.Flags().BoolVar(&deleteAll, "all", false, "Set flag to delete all profiles") RootCmd.AddCommand(deleteCmd) From 6f81089dfb4b7055bf59a335fe708be4acc6fa8e Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Wed, 24 Jul 2019 20:35:58 +0200 Subject: [PATCH 025/106] Fixed review findings --- cmd/minikube/cmd/delete.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 166b7449e2..cc50c74ca7 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -229,16 +229,7 @@ func handleMultipleDeletionErrors(errors []error) { deletionError, ok := err.(DeletionError) if ok { - switch deletionError.Errtype { - case Fatal: - glog.Errorln(deletionError.Error()) - case MissingProfile: - glog.Errorln(deletionError.Error()) - case MissingCluster: - glog.Errorln(deletionError.Error()) - default: - glog.Errorln(deletionError.Error()) - } + glog.Errorln(deletionError.Error()) } else { exit.WithError("Could not process errors from failed deletion", err) } From a4fd88514b990a22741b7c959b584f3782e209ba Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 13:15:27 +0200 Subject: [PATCH 026/106] Added valid configs for delete_test --- .../delete/.minikube/machines/p1/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p1/hyperkit.json | 1 + .../delete/.minikube/machines/p2/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p2/hyperkit.json | 1 + .../delete/.minikube/profiles/p1/config.json | 3 +- .../delete/.minikube/profiles/p2/config.json | 4 +- 6 files changed, 165 insertions(+), 4 deletions(-) create mode 100644 pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json create mode 100644 pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json new file mode 100644 index 0000000000..213451c654 --- /dev/null +++ b/pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p1", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p1" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json new file mode 100644 index 0000000000..7882c7a13e --- /dev/null +++ b/pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p1/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json new file mode 100644 index 0000000000..da03857efb --- /dev/null +++ b/pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.51", + "MachineName": "p2", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p2/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p2" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json new file mode 100644 index 0000000000..e399e66bf7 --- /dev/null +++ b/pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p2/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json index 86699a29bb..00655266e6 100644 --- a/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json +++ b/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json @@ -9,7 +9,6 @@ "ContainerRuntime": "docker", "HyperkitVpnKitSock": "", "HyperkitVSockPorts": [], - "XhyveDiskDriver": "ahci-hd", "DockerEnv": null, "InsecureRegistry": null, "RegistryMirror": null, @@ -30,7 +29,7 @@ }, "KubernetesConfig": { "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.75", + "NodeIP": "192.168.64.50", "NodePort": 8443, "NodeName": "minikube", "APIServerName": "minikubeCA", diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json index d77e0221d2..77529a124f 100644 --- a/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json +++ b/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json @@ -5,7 +5,7 @@ "Memory": 2000, "CPUs": 2, "DiskSize": 20000, - "VMDriver": "virtualbox", + "VMDriver": "hyperkit", "ContainerRuntime": "docker", "HyperkitVpnKitSock": "", "HyperkitVSockPorts": [], @@ -29,7 +29,7 @@ }, "KubernetesConfig": { "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.99.136", + "NodeIP": "192.168.64.51", "NodePort": 8443, "NodeName": "minikube", "APIServerName": "minikubeCA", From d7d05b7494cd0ff93623bd0bd6ed3d8dbf7a97ca Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 16:33:46 +0200 Subject: [PATCH 027/106] Added more testdata --- .../.minikube/machines/p1/config.json | 0 .../.minikube/machines/p1/hyperkit.json | 0 .../machines/p10_invalid_file/config.json | 1 + .../machines/p10_invalid_file/hyperkit.json | 1 + .../machines/p11_partial_config/config.json | 72 +++++++++++++++++ .../machines/p11_partial_config/hyperkit.json | 1 + .../.minikube/machines/p2/config.json | 0 .../.minikube/machines/p2/hyperkit.json | 0 .../.minikube/machines/p3/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p3/hyperkit.json | 1 + .../.minikube/machines/p4/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p4/hyperkit.json | 1 + .../.minikube/machines/p5/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p5/hyperkit.json | 1 + .../.minikube/machines/p7_empty}/config.json | 0 .../.minikube/machines/p7_empty/hyperkit.json | 0 .../machines/p8_empty_config/config.json | 0 .../machines/p8_empty_config/hyperkit.json | 1 + .../machines/p9_empty_driver/config.json | 80 +++++++++++++++++++ .../machines/p9_empty_driver/hyperkit.json | 0 .../.minikube/profiles/p1/config.json | 0 .../.minikube/profiles/p10/config.json | 49 ++++++++++++ .../.minikube/profiles/p11/config.json | 49 ++++++++++++ .../.minikube/profiles/p2/config.json | 0 .../.minikube/profiles/p3_empty/config.json | 0 .../profiles/p4_invalid_file/config.json | 0 .../profiles/p5_partial_config/config.json | 0 .../.minikube/profiles/p6/config.json | 49 ++++++++++++ .../.minikube/profiles/p7/config.json | 49 ++++++++++++ .../.minikube/profiles/p8/config.json | 49 ++++++++++++ .../.minikube/profiles/p9/config.json | 49 ++++++++++++ .../.minikube/machines/p1/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p1/hyperkit.json | 1 + .../machines/p10_invalid_file/config.json | 1 + .../machines/p10_invalid_file/hyperkit.json | 1 + .../machines/p11_partial_config/config.json | 72 +++++++++++++++++ .../machines/p11_partial_config/hyperkit.json | 1 + .../.minikube/machines/p2/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p2/hyperkit.json | 1 + .../.minikube/machines/p3/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p3/hyperkit.json | 1 + .../.minikube/machines/p4/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p4/hyperkit.json | 1 + .../.minikube/machines/p5/config.json | 80 +++++++++++++++++++ .../.minikube/machines/p5/hyperkit.json | 1 + .../.minikube/machines/p7_empty/config.json | 0 .../.minikube/machines/p7_empty/hyperkit.json | 0 .../machines/p8_empty_config/config.json | 0 .../machines/p8_empty_config/hyperkit.json | 1 + .../machines/p9_empty_driver/config.json | 80 +++++++++++++++++++ .../machines/p9_empty_driver/hyperkit.json | 0 .../.minikube/profiles/p1/config.json | 49 ++++++++++++ .../.minikube/profiles/p10/config.json | 49 ++++++++++++ .../.minikube/profiles/p11/config.json | 49 ++++++++++++ .../.minikube/profiles/p2/config.json | 49 ++++++++++++ .../.minikube/profiles/p3_empty/config.json | 0 .../profiles/p4_invalid_file/config.json | 1 + .../profiles/p5_partial_config/config.json | 47 +++++++++++ .../.minikube/profiles/p6/config.json | 49 ++++++++++++ .../.minikube/profiles/p7/config.json | 49 ++++++++++++ .../.minikube/profiles/p8/config.json | 49 ++++++++++++ .../.minikube/profiles/p9/config.json | 49 ++++++++++++ 62 files changed, 1694 insertions(+) rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/machines/p1/config.json (100%) rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/machines/p1/hyperkit.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/machines/p2/config.json (100%) rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/machines/p2/hyperkit.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json rename pkg/minikube/config/testdata/{delete/.minikube/profiles/p3_empty => delete-all/.minikube/machines/p7_empty}/config.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/profiles/p1/config.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/profiles/p2/config.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_empty/config.json rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/profiles/p4_invalid_file/config.json (100%) rename pkg/minikube/config/testdata/{delete => delete-all}/.minikube/profiles/p5_partial_config/config.json (100%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/machines/p1/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/machines/p1/hyperkit.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json new file mode 100644 index 0000000000..acbaeb7304 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json @@ -0,0 +1,72 @@ +{ + "ConfigVersion": 3, + "Driver": { + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p11/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p11/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p11/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json new file mode 100644 index 0000000000..6bc256048f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p11/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p11/tty,log=/Users/marekschwarz/.minikube/machines/p11/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p11/bzImage,/Users/marekschwarz/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p11/tty,log=/Users/marekschwarz/.minikube/machines/p11/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p11/bzImage,/Users/marekschwarz/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/machines/p2/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json diff --git a/pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/machines/p2/hyperkit.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json new file mode 100644 index 0000000000..2ecf37cab5 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.52", + "MachineName": "p3", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p3/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p3" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json new file mode 100644 index 0000000000..216b692bda --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p3/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p3/tty,log=/Users/marekschwarz/.minikube/machines/p3/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p3/bzImage,/Users/marekschwarz/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p3/tty,log=/Users/marekschwarz/.minikube/machines/p3/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p3/bzImage,/Users/marekschwarz/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json new file mode 100644 index 0000000000..f54271c5f3 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.53", + "MachineName": "p4", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p4/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p4/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p4/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p4" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json new file mode 100644 index 0000000000..d77cca2ca1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p4/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json new file mode 100644 index 0000000000..23bff535ec --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.54", + "MachineName": "p5", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p5/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p5" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json new file mode 100644 index 0000000000..927b144799 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p5/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/profiles/p3_empty/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json new file mode 100644 index 0000000000..be5e73f904 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p8/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p8/tty,log=/Users/marekschwarz/.minikube/machines/p8/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p8/bzImage,/Users/marekschwarz/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p8/tty,log=/Users/marekschwarz/.minikube/machines/p8/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p8/bzImage,/Users/marekschwarz/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json new file mode 100644 index 0000000000..62837eed54 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.58", + "MachineName": "p9", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p9/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p9/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p9/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p9" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/profiles/p1/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json new file mode 100644 index 0000000000..ea47981d29 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.59", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json new file mode 100644 index 0000000000..789b9b5557 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.60", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/profiles/p2/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_empty/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_invalid_file/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/profiles/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_invalid_file/config.json diff --git a/pkg/minikube/config/testdata/delete/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete/.minikube/profiles/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_partial_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json new file mode 100644 index 0000000000..1e0980752a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.55", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json new file mode 100644 index 0000000000..5891cb15bf --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.56", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json new file mode 100644 index 0000000000..a1557f6df1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.57", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json new file mode 100644 index 0000000000..9a55310acc --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.58", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json new file mode 100644 index 0000000000..213451c654 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p1", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p1" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json new file mode 100644 index 0000000000..7882c7a13e --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p1/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json new file mode 100644 index 0000000000..efc4280179 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json @@ -0,0 +1,72 @@ +{ + "ConfigVersion": 3, + "Driver": { + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p11/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json new file mode 100644 index 0000000000..a924f25ad0 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p11/bzImage","initrd":"/Users/someuser/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring -f kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json new file mode 100644 index 0000000000..da03857efb --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.51", + "MachineName": "p2", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p2/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p2" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json new file mode 100644 index 0000000000..e399e66bf7 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p2/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json new file mode 100644 index 0000000000..2ecf37cab5 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.52", + "MachineName": "p3", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p3/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p3" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json new file mode 100644 index 0000000000..38b7db487f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3/bzImage","initrd":"/Users/someuser/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring -f kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json new file mode 100644 index 0000000000..5eedd16a38 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.53", + "MachineName": "p4", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p4" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json new file mode 100644 index 0000000000..d77cca2ca1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p4/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json new file mode 100644 index 0000000000..23bff535ec --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.54", + "MachineName": "p5", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p5/id_rsa", + "StorePath": "/Users/marekschwarz/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", + "BootKernel": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/bzImage", + "BootInitrd": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/marekschwarz/.minikube", + "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/marekschwarz/.minikube" + } + }, + "Name": "p5" +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json new file mode 100644 index 0000000000..b1b136f59d --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json new file mode 100644 index 0000000000..2b7fd6fc94 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8/bzImage","initrd":"/Users/someuser/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring -f kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json new file mode 100644 index 0000000000..b6f1aa2fc4 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.58", + "MachineName": "p9", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p9/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p9" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json new file mode 100644 index 0000000000..00655266e6 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.50", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json new file mode 100644 index 0000000000..ea47981d29 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.59", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json new file mode 100644 index 0000000000..789b9b5557 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.60", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json new file mode 100644 index 0000000000..77529a124f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.51", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json new file mode 100644 index 0000000000..9e2e347718 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json @@ -0,0 +1 @@ +invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json new file mode 100644 index 0000000000..29f62c0149 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json @@ -0,0 +1,47 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "XhyveDiskDriver": "ahci-hd", + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json new file mode 100644 index 0000000000..1e0980752a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.55", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json new file mode 100644 index 0000000000..5891cb15bf --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.56", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json new file mode 100644 index 0000000000..a1557f6df1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.57", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json new file mode 100644 index 0000000000..9a55310acc --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.58", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} From 1d9a61f31e6bc00a3173534b6a6827cb0c84f840 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 18:54:19 +0200 Subject: [PATCH 028/106] Changed username --- .../.minikube/machines/p1/config.json | 28 +++++++++---------- .../.minikube/machines/p1/hyperkit.json | 2 +- .../machines/p11_partial_config/config.json | 18 ++++++------ .../machines/p11_partial_config/hyperkit.json | 2 +- .../.minikube/machines/p2/config.json | 28 +++++++++---------- .../.minikube/machines/p2/hyperkit.json | 2 +- .../.minikube/machines/p3/config.json | 28 +++++++++---------- .../.minikube/machines/p3/hyperkit.json | 2 +- .../.minikube/machines/p4/config.json | 28 +++++++++---------- .../.minikube/machines/p4/hyperkit.json | 2 +- .../.minikube/machines/p5/config.json | 28 +++++++++---------- .../.minikube/machines/p5/hyperkit.json | 2 +- .../machines/p8_empty_config/hyperkit.json | 2 +- .../machines/p9_empty_driver/config.json | 28 +++++++++---------- .../.minikube/machines/p1/config.json | 28 +++++++++---------- .../.minikube/machines/p1/hyperkit.json | 2 +- .../.minikube/machines/p2/config.json | 28 +++++++++---------- .../.minikube/machines/p2/hyperkit.json | 2 +- .../.minikube/machines/p3/config.json | 28 +++++++++---------- .../.minikube/machines/p4/hyperkit.json | 2 +- .../.minikube/machines/p5/config.json | 28 +++++++++---------- .../.minikube/machines/p5/hyperkit.json | 2 +- 22 files changed, 160 insertions(+), 160 deletions(-) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json index 213451c654..90a026a01c 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json @@ -5,12 +5,12 @@ "MachineName": "p1", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p1/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p1" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json index 7882c7a13e..df350fb656 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p1/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p1/bzImage","initrd":"/Users/someuser/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring -f kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json index acbaeb7304..efc4280179 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json @@ -3,8 +3,8 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p11/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p11/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", @@ -15,8 +15,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p11/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p11/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -58,15 +58,15 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json index 6bc256048f..a924f25ad0 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p11/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p11/tty,log=/Users/marekschwarz/.minikube/machines/p11/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p11/bzImage,/Users/marekschwarz/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p11/tty,log=/Users/marekschwarz/.minikube/machines/p11/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p11/bzImage,/Users/marekschwarz/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p11/bzImage","initrd":"/Users/someuser/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring -f kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json index da03857efb..d6acef4d4f 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json @@ -5,12 +5,12 @@ "MachineName": "p2", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p2/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p2" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json index e399e66bf7..4520dd1642 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p2/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p2/bzImage","initrd":"/Users/someuser/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring -f kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json index 2ecf37cab5..84e8fbfaaa 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json @@ -5,12 +5,12 @@ "MachineName": "p3", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p3/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p3" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json index 216b692bda..38b7db487f 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p3/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p3/tty,log=/Users/marekschwarz/.minikube/machines/p3/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p3/bzImage,/Users/marekschwarz/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p3/tty,log=/Users/marekschwarz/.minikube/machines/p3/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p3/bzImage,/Users/marekschwarz/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3/bzImage","initrd":"/Users/someuser/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring -f kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json index f54271c5f3..5eedd16a38 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json @@ -5,12 +5,12 @@ "MachineName": "p4", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p4/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p4/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p4/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p4" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json index d77cca2ca1..8489ab0646 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p4/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4/bzImage","initrd":"/Users/someuser/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring -f kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json index 23bff535ec..4d058d4b1f 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json @@ -5,12 +5,12 @@ "MachineName": "p5", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p5/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p5" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json index 927b144799..70960a3aa5 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p5/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring -f kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json index be5e73f904..2b7fd6fc94 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p8/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p8/tty,log=/Users/marekschwarz/.minikube/machines/p8/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p8/bzImage,/Users/marekschwarz/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p8/tty,log=/Users/marekschwarz/.minikube/machines/p8/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p8/bzImage,/Users/marekschwarz/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8/bzImage","initrd":"/Users/someuser/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring -f kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json index 62837eed54..b6f1aa2fc4 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json @@ -5,12 +5,12 @@ "MachineName": "p9", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p9/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p9/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p9/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p9/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p9" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json index 213451c654..90a026a01c 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json @@ -5,12 +5,12 @@ "MachineName": "p1", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p1/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p1/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p1" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json index 7882c7a13e..df350fb656 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p1/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p1/tty,log=/Users/marekschwarz/.minikube/machines/p1/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p1/bzImage,/Users/marekschwarz/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p1/bzImage","initrd":"/Users/someuser/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring -f kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json index da03857efb..d6acef4d4f 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json @@ -5,12 +5,12 @@ "MachineName": "p2", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p2/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p2/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p2" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json index e399e66bf7..4520dd1642 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p2/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p2/tty,log=/Users/marekschwarz/.minikube/machines/p2/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p2/bzImage,/Users/marekschwarz/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p2/bzImage","initrd":"/Users/someuser/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring -f kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json index 2ecf37cab5..84e8fbfaaa 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json @@ -5,12 +5,12 @@ "MachineName": "p3", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p3/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p3/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p3" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json index d77cca2ca1..8489ab0646 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/marekschwarz/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/marekschwarz/.minikube/machines/p4/bzImage","initrd":"/Users/marekschwarz/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/marekschwarz/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p4/tty,log=/Users/marekschwarz/.minikube/machines/p4/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p4/bzImage,/Users/marekschwarz/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} \ No newline at end of file +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4/bzImage","initrd":"/Users/someuser/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring -f kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json index 23bff535ec..4d058d4b1f 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json @@ -5,12 +5,12 @@ "MachineName": "p5", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/marekschwarz/.minikube/machines/p5/id_rsa", - "StorePath": "/Users/marekschwarz/.minikube", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5/id_rsa", + "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/marekschwarz/.minikube/cache/iso/minikube-v1.2.0.iso", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", "DiskSize": 20000, "CPU": 2, "Memory": 2000, @@ -18,8 +18,8 @@ "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/bzImage", - "BootInitrd": "/Users/marekschwarz/.minikube/machines/p5/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -62,19 +62,19 @@ "IsExperimental": false }, "AuthOptions": { - "CertDir": "/Users/marekschwarz/.minikube", - "CaCertPath": "/Users/marekschwarz/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/marekschwarz/.minikube/certs/ca-key.pem", + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", "CaCertRemotePath": "", - "ServerCertPath": "/Users/marekschwarz/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/marekschwarz/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/marekschwarz/.minikube/certs/key.pem", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", "ServerCertRemotePath": "", "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/marekschwarz/.minikube/certs/cert.pem", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", "ServerCertSANs": null, - "StorePath": "/Users/marekschwarz/.minikube" + "StorePath": "/Users/someuser/.minikube" } }, "Name": "p5" -} \ No newline at end of file +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json index b1b136f59d..70960a3aa5 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring","-f","kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/marekschwarz/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/marekschwarz/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/marekschwarz/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/marekschwarz/.minikube/machines/p5/tty,log=/Users/marekschwarz/.minikube/machines/p5/console-ring -f kexec,/Users/marekschwarz/.minikube/machines/p5/bzImage,/Users/marekschwarz/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring -f kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} From 59eb97408855474f5badfaef166c9a8d522a8612 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 22:44:37 +0200 Subject: [PATCH 029/106] Fixed testdata --- .../machines/p11_partial_config/config.json | 8 ++++---- .../.minikube/machines/p3/hyperkit.json | 1 - .../.minikube/machines/{p3 => p3_empty}/config.json | 12 ++++++------ .../.minikube/machines/p3_empty/hyperkit.json | 1 + .../.minikube/machines/p4/hyperkit.json | 1 - .../machines/{p4 => p4_invalid_file}/config.json | 12 ++++++------ .../.minikube/machines/p4_invalid_file/hyperkit.json | 1 + .../.minikube/machines/p5/hyperkit.json | 1 - .../machines/{p5 => p5_partial_config}/config.json | 12 ++++++------ .../machines/p5_partial_config/hyperkit.json | 1 + .../.minikube/machines/p8_empty_config/hyperkit.json | 2 +- .../.minikube/machines/p9_empty_driver/config.json | 12 ++++++------ .../profiles/{p10 => p10_invalid_file}/config.json | 0 .../profiles/{p11 => p11_partial_config}/config.json | 0 .../.minikube/profiles/{p7 => p7_empty}/config.json | 0 .../profiles/{p8 => p8_empty_config}/config.json | 0 .../profiles/{p9 => p9_empty_driver}/config.json | 0 17 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/machines/{p3 => p3_empty}/config.json (87%) create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/machines/{p4 => p4_invalid_file}/config.json (86%) create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/machines/{p5 => p5_partial_config}/config.json (86%) create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p10 => p10_invalid_file}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p11 => p11_partial_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p7 => p7_empty}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p8 => p8_empty_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p9 => p9_empty_driver}/config.json (100%) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json index efc4280179..b95393d6f0 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json @@ -3,7 +3,7 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p11/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p11_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -11,12 +11,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json deleted file mode 100644 index 38b7db487f..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3/bzImage","initrd":"/Users/someuser/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring -f kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json similarity index 87% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json index 84e8fbfaaa..e387da62d9 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.52", - "MachineName": "p3", + "MachineName": "p3_empty", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_empty/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p3" + "Name": "p3_empty" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json new file mode 100644 index 0000000000..31f09ed93e --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3_empty","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3_empty/bzImage","initrd":"/Users/someuser/.minikube/machines/p3_empty/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3_empty/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3_empty/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring -f kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json deleted file mode 100644 index 8489ab0646..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4/bzImage","initrd":"/Users/someuser/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring -f kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json index 5eedd16a38..cf7f38defa 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.53", - "MachineName": "p4", + "MachineName": "p4_invalid_file", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_invalid_file/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p4" + "Name": "p4_invalid_file" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json new file mode 100644 index 0000000000..281dcf5822 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4_invalid_file","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4_invalid_file/bzImage","initrd":"/Users/someuser/.minikube/machines/p4_invalid_file/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring -f kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json deleted file mode 100644 index 70960a3aa5..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring -f kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json index 4d058d4b1f..bf01fde29e 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.54", - "MachineName": "p5", + "MachineName": "p5_partial_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p5/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p5" + "Name": "p5_partial_config" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json new file mode 100644 index 0000000000..8ac2881b79 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5_partial_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5_partial_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p5_partial_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json index 2b7fd6fc94..d7b31cea7b 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8/bzImage","initrd":"/Users/someuser/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring -f kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8_empty_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8_empty_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p8_empty_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json index b6f1aa2fc4..1f5e919815 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.58", - "MachineName": "p9", + "MachineName": "p9_empty_driver", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p9/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p9_empty_driver/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9_empty_driver", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p9" + "Name": "p9_empty_driver" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10_invalid_file/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10_invalid_file/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11_partial_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_empty_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_empty_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json From fa0cdbf64b0d48d15eb742e7f636f2dc15fcf5c3 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 22:46:35 +0200 Subject: [PATCH 030/106] Fixed testdata --- .../machines/p11_partial_config/config.json | 8 ++++---- .../delete-all/.minikube/machines/p3/hyperkit.json | 1 - .../.minikube/machines/{p3 => p3_empty}/config.json | 12 ++++++------ .../.minikube/machines/p3_empty/hyperkit.json | 1 + .../delete-all/.minikube/machines/p4/hyperkit.json | 1 - .../machines/{p4 => p4_invalid_file}/config.json | 12 ++++++------ .../.minikube/machines/p4_invalid_file/hyperkit.json | 1 + .../delete-all/.minikube/machines/p5/hyperkit.json | 1 - .../machines/{p5 => p5_partial_config}/config.json | 12 ++++++------ .../machines/p5_partial_config/hyperkit.json | 1 + .../.minikube/machines/p8_empty_config/hyperkit.json | 2 +- .../.minikube/machines/p9_empty_driver/config.json | 12 ++++++------ .../profiles/{p10 => p10_invalid_file}/config.json | 0 .../profiles/{p11 => p11_partial_config}/config.json | 0 .../.minikube/profiles/{p7 => p7_empty}/config.json | 0 .../profiles/{p8 => p8_empty_config}/config.json | 0 .../profiles/{p9 => p9_empty_driver}/config.json | 0 17 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p3 => p3_empty}/config.json (87%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p4 => p4_invalid_file}/config.json (86%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p5 => p5_partial_config}/config.json (86%) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p10 => p10_invalid_file}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p11 => p11_partial_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p7 => p7_empty}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p8 => p8_empty_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p9 => p9_empty_driver}/config.json (100%) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json index efc4280179..b95393d6f0 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json @@ -3,7 +3,7 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p11/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p11_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -11,12 +11,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p11/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json deleted file mode 100644 index 38b7db487f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3/p3.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3/bzImage","initrd":"/Users/someuser/.minikube/machines/p3/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3/p3.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3/tty,log=/Users/someuser/.minikube/machines/p3/console-ring -f kexec,/Users/someuser/.minikube/machines/p3/bzImage,/Users/someuser/.minikube/machines/p3/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json similarity index 87% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json index 84e8fbfaaa..e387da62d9 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.52", - "MachineName": "p3", + "MachineName": "p3_empty", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_empty/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p3" + "Name": "p3_empty" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json new file mode 100644 index 0000000000..31f09ed93e --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3_empty","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3_empty/bzImage","initrd":"/Users/someuser/.minikube/machines/p3_empty/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3_empty/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3_empty/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring -f kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json deleted file mode 100644 index 8489ab0646..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4/p4.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4/bzImage","initrd":"/Users/someuser/.minikube/machines/p4/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4/p4.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4/tty,log=/Users/someuser/.minikube/machines/p4/console-ring -f kexec,/Users/someuser/.minikube/machines/p4/bzImage,/Users/someuser/.minikube/machines/p4/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json index 5eedd16a38..cf7f38defa 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.53", - "MachineName": "p4", + "MachineName": "p4_invalid_file", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_invalid_file/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p4" + "Name": "p4_invalid_file" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json new file mode 100644 index 0000000000..281dcf5822 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4_invalid_file","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4_invalid_file/bzImage","initrd":"/Users/someuser/.minikube/machines/p4_invalid_file/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring -f kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json deleted file mode 100644 index 70960a3aa5..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5/p5.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5/bzImage","initrd":"/Users/someuser/.minikube/machines/p5/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5/p5.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5/tty,log=/Users/someuser/.minikube/machines/p5/console-ring -f kexec,/Users/someuser/.minikube/machines/p5/bzImage,/Users/someuser/.minikube/machines/p5/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json similarity index 86% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json index 4d058d4b1f..bf01fde29e 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.54", - "MachineName": "p5", + "MachineName": "p5_partial_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p5/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p5/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p5" + "Name": "p5_partial_config" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json new file mode 100644 index 0000000000..8ac2881b79 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json @@ -0,0 +1 @@ +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5_partial_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5_partial_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p5_partial_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json index 2b7fd6fc94..d7b31cea7b 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json @@ -1 +1 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8/p8.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8/bzImage","initrd":"/Users/someuser/.minikube/machines/p8/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8/p8.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8/tty,log=/Users/someuser/.minikube/machines/p8/console-ring -f kexec,/Users/someuser/.minikube/machines/p8/bzImage,/Users/someuser/.minikube/machines/p8/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8"} +{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8_empty_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8_empty_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p8_empty_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json index b6f1aa2fc4..1f5e919815 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.58", - "MachineName": "p9", + "MachineName": "p9_empty_driver", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p9/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p9_empty_driver/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9_empty_driver", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p9/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p9" + "Name": "p9_empty_driver" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json From 342584ab93b778bc41da1b328be2e47793b5a397 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 25 Jul 2019 23:31:25 +0200 Subject: [PATCH 031/106] Fixed testdata --- .../.minikube/machines/p1/hyperkit.json | 1 - .../machines/p10_invalid_file/hyperkit.json | 1 - .../machines/p11_partial_config/hyperkit.json | 1 - .../.minikube/machines/p2/config.json | 80 ------------------- .../.minikube/machines/p2/hyperkit.json | 1 - .../p2_empty_profile_config}/config.json | 12 +-- .../.minikube/machines/p3_empty/hyperkit.json | 1 - .../p3_invalid_profile_config}/config.json | 12 +-- .../machines/p4_invalid_file/hyperkit.json | 1 - .../p4_partial_profile_config}/config.json | 12 +-- .../machines/p5_partial_config/hyperkit.json | 1 - .../config.json | 0 .../.minikube/machines/p7_empty/hyperkit.json | 0 .../config.json | 0 .../machines/p8_empty_config/hyperkit.json | 1 - .../config.json | 8 +- .../machines/p9_empty_driver/config.json | 80 ------------------- .../machines/p9_empty_driver/hyperkit.json | 0 .../.minikube/profiles/p2/config.json | 49 ------------ .../p2_empty_profile_config}/config.json | 0 .../config.json | 0 .../config.json | 0 .../config.json | 0 .../config.json | 0 .../.minikube/profiles/p7_empty/config.json | 49 ------------ .../config.json | 0 .../config.json | 0 .../profiles/p9_empty_driver/config.json | 49 ------------ .../.minikube/machines/p1/hyperkit.json | 1 - .../machines/p10_invalid_file/hyperkit.json | 1 - .../machines/p11_partial_config/hyperkit.json | 1 - .../.minikube/machines/p2/config.json | 80 ------------------- .../.minikube/machines/p2/hyperkit.json | 1 - .../p2_empty_profile_config}/config.json | 12 +-- .../.minikube/machines/p3_empty/hyperkit.json | 1 - .../p3_invalid_profile_config}/config.json | 12 +-- .../machines/p4_invalid_file/hyperkit.json | 1 - .../p4_partial_profile_config}/config.json | 12 +-- .../machines/p5_partial_config/hyperkit.json | 1 - .../p6_empty_machine_config}/config.json | 0 .../.minikube/machines/p7_empty/hyperkit.json | 0 .../config.json | 0 .../machines/p8_empty_config/config.json | 0 .../machines/p8_empty_config/hyperkit.json | 1 - .../config.json | 8 +- .../machines/p9_empty_driver/config.json | 80 ------------------- .../machines/p9_empty_driver/hyperkit.json | 0 .../.minikube/profiles/p2/config.json | 49 ------------ .../p2_empty_profile_config}/config.json | 0 .../.minikube/profiles/p3_empty/config.json | 0 .../config.json | 0 .../config.json | 0 .../config.json | 0 .../config.json | 0 .../.minikube/profiles/p7_empty/config.json | 49 ------------ .../config.json | 0 .../config.json | 0 .../profiles/p9_empty_driver/config.json | 49 ------------ 58 files changed, 44 insertions(+), 674 deletions(-) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json rename pkg/minikube/config/testdata/{delete-single/.minikube/machines/p3_empty => delete-all/.minikube/machines/p2_empty_profile_config}/config.json (85%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json rename pkg/minikube/config/testdata/{delete-single/.minikube/machines/p4_invalid_file => delete-all/.minikube/machines/p3_invalid_profile_config}/config.json (84%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json rename pkg/minikube/config/testdata/{delete-single/.minikube/machines/p5_partial_config => delete-all/.minikube/machines/p4_partial_profile_config}/config.json (84%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p7_empty => p6_empty_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p10_invalid_file => p7_invalid_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json rename pkg/minikube/config/testdata/delete-all/.minikube/machines/{p11_partial_config => p8_partial_machine_config}/config.json (85%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json rename pkg/minikube/config/testdata/delete-all/.minikube/{machines/p8_empty_config => profiles/p2_empty_profile_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p4_invalid_file => p3_invalid_profile_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p5_partial_config => p4_partial_profile_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p6 => p5_missing_machine_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p8_empty_config => p6_empty_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p10_invalid_file => p7_invalid_machine_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-all/.minikube/profiles/{p11_partial_config => p8_partial_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json rename pkg/minikube/config/testdata/{delete-all/.minikube/machines/p3_empty => delete-single/.minikube/machines/p2_empty_profile_config}/config.json (85%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json rename pkg/minikube/config/testdata/{delete-all/.minikube/machines/p4_invalid_file => delete-single/.minikube/machines/p3_invalid_profile_config}/config.json (84%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json rename pkg/minikube/config/testdata/{delete-all/.minikube/machines/p5_partial_config => delete-single/.minikube/machines/p4_partial_profile_config}/config.json (84%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json rename pkg/minikube/config/testdata/{delete-all/.minikube/profiles/p3_empty => delete-single/.minikube/machines/p6_empty_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/machines/{p10_invalid_file => p7_invalid_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json rename pkg/minikube/config/testdata/delete-single/.minikube/machines/{p11_partial_config => p8_partial_machine_config}/config.json (85%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json rename pkg/minikube/config/testdata/delete-single/.minikube/{machines/p7_empty => profiles/p2_empty_profile_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p4_invalid_file => p3_invalid_profile_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p5_partial_config => p4_partial_profile_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p6 => p5_missing_machine_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p8_empty_config => p6_empty_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p10_invalid_file => p7_invalid_machine_config}/config.json (100%) rename pkg/minikube/config/testdata/delete-single/.minikube/profiles/{p11_partial_config => p8_partial_machine_config}/config.json (100%) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json deleted file mode 100644 index df350fb656..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p1/bzImage","initrd":"/Users/someuser/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring -f kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json deleted file mode 100644 index 581f9e648f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json deleted file mode 100644 index a924f25ad0..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p11/bzImage","initrd":"/Users/someuser/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring -f kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json deleted file mode 100644 index d6acef4d4f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.51", - "MachineName": "p2", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p2/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p2" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json deleted file mode 100644 index 4520dd1642..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p2/bzImage","initrd":"/Users/someuser/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring -f kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json similarity index 85% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json index e387da62d9..a9e6592c7a 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.52", - "MachineName": "p3_empty", + "MachineName": "p2_empty_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_empty/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p3_empty" + "Name": "p2_empty_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json deleted file mode 100644 index 31f09ed93e..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3_empty","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3_empty/bzImage","initrd":"/Users/someuser/.minikube/machines/p3_empty/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3_empty/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3_empty/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring -f kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json similarity index 84% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json index cf7f38defa..8d23c98dc6 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.53", - "MachineName": "p4_invalid_file", + "MachineName": "p3_invalid_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_invalid_file/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p4_invalid_file" + "Name": "p3_invalid_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json deleted file mode 100644 index 281dcf5822..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4_invalid_file","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4_invalid_file/bzImage","initrd":"/Users/someuser/.minikube/machines/p4_invalid_file/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring -f kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json similarity index 84% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json index bf01fde29e..14b416d3c2 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.54", - "MachineName": "p5_partial_config", + "MachineName": "p4_partial_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p5_partial_config" + "Name": "p4_partial_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json deleted file mode 100644 index 8ac2881b79..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5_partial_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5_partial_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p5_partial_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_empty/hyperkit.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p10_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json deleted file mode 100644 index d7b31cea7b..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8_empty_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8_empty_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p8_empty_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json similarity index 85% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json index b95393d6f0..d4525a7861 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json @@ -3,7 +3,7 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p11_partial_config/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -11,12 +11,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11_partial_config", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json deleted file mode 100644 index 1f5e919815..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.58", - "MachineName": "p9_empty_driver", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p9_empty_driver/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9_empty_driver", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p9_empty_driver" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p9_empty_driver/hyperkit.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json deleted file mode 100644 index 77529a124f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.51", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_empty_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_empty_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json deleted file mode 100644 index 5891cb15bf..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_empty/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.56", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p10_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p11_partial_config/config.json rename to pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json deleted file mode 100644 index 9a55310acc..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p9_empty_driver/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.58", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json deleted file mode 100644 index df350fb656..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p1","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p1/p1.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p1/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p1/bzImage","initrd":"/Users/someuser/.minikube/machines/p1/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13262,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p1/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","5e6787b6-aecb-11e9-81cf-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p1/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 5e6787b6-aecb-11e9-81cf-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p1/p1.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p1/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p1/tty,log=/Users/someuser/.minikube/machines/p1/console-ring -f kexec,/Users/someuser/.minikube/machines/p1/bzImage,/Users/someuser/.minikube/machines/p1/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json deleted file mode 100644 index 581f9e648f..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json deleted file mode 100644 index a924f25ad0..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p11","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"4f16872c-aee8-11e9-8815-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p11/p11.rawdisk"}], "vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p11/bzImage","initrd":"/Users/someuser/.minikube/machines/p11/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14335,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p11/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","4f16872c-aee8-11e9-8815-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p11/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 4f16872c-aee8-11e9-8815-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p11/p11.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p11/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p11/tty,log=/Users/someuser/.minikube/machines/p11/console-ring -f kexec,/Users/someuser/.minikube/machines/p11/bzImage,/Users/someuser/.minikube/machines/p11/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json deleted file mode 100644 index d6acef4d4f..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.51", - "MachineName": "p2", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p2/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "a83fbd30-aecc-11e9-a55f-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p2" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json deleted file mode 100644 index 4520dd1642..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p2","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p2/p2.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p2/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p2/bzImage","initrd":"/Users/someuser/.minikube/machines/p2/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13454,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p2/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","a83fbd30-aecc-11e9-a55f-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p2/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U a83fbd30-aecc-11e9-a55f-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p2/p2.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p2/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p2/tty,log=/Users/someuser/.minikube/machines/p2/console-ring -f kexec,/Users/someuser/.minikube/machines/p2/bzImage,/Users/someuser/.minikube/machines/p2/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json similarity index 85% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json index e387da62d9..a9e6592c7a 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_empty/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.52", - "MachineName": "p3_empty", + "MachineName": "p2_empty_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_empty/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3_empty/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p3_empty" + "Name": "p2_empty_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json deleted file mode 100644 index 31f09ed93e..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_empty/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p3_empty","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p3_empty/bzImage","initrd":"/Users/someuser/.minikube/machines/p3_empty/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13669,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p3_empty/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p3_empty/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p3_empty/p3_empty.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p3_empty/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p3_empty/tty,log=/Users/someuser/.minikube/machines/p3_empty/console-ring -f kexec,/Users/someuser/.minikube/machines/p3_empty/bzImage,/Users/someuser/.minikube/machines/p3_empty/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_empty"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json similarity index 84% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json index cf7f38defa..8d23c98dc6 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_invalid_file/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.53", - "MachineName": "p4_invalid_file", + "MachineName": "p3_invalid_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_invalid_file/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4_invalid_file/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p4_invalid_file" + "Name": "p3_invalid_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json deleted file mode 100644 index 281dcf5822..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_invalid_file/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p4_invalid_file","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"759044c8-aee4-11e9-bd0a-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p4_invalid_file/bzImage","initrd":"/Users/someuser/.minikube/machines/p4_invalid_file/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13752,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","759044c8-aee4-11e9-bd0a-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p4_invalid_file/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 759044c8-aee4-11e9-bd0a-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p4_invalid_file/p4_invalid_file.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p4_invalid_file/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p4_invalid_file/tty,log=/Users/someuser/.minikube/machines/p4_invalid_file/console-ring -f kexec,/Users/someuser/.minikube/machines/p4_invalid_file/bzImage,/Users/someuser/.minikube/machines/p4_invalid_file/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_invalid_file"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json similarity index 84% rename from pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json index bf01fde29e..14b416d3c2 100644 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p5_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json @@ -2,10 +2,10 @@ "ConfigVersion": 3, "Driver": { "IPAddress": "192.168.64.54", - "MachineName": "p5_partial_config", + "MachineName": "p4_partial_profile_config", "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -14,12 +14,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, @@ -76,5 +76,5 @@ "StorePath": "/Users/someuser/.minikube" } }, - "Name": "p5_partial_config" + "Name": "p4_partial_profile_config" } diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json deleted file mode 100644 index 8ac2881b79..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p5_partial_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p5_partial_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"faf8face-aee4-11e9-9ba1-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p5_partial_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p5_partial_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":13829,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","faf8face-aee4-11e9-9ba1-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p5_partial_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U faf8face-aee4-11e9-9ba1-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p5_partial_config/p5_partial_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p5_partial_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p5_partial_config/tty,log=/Users/someuser/.minikube/machines/p5_partial_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p5_partial_config/bzImage,/Users/someuser/.minikube/machines/p5_partial_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config"} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_empty/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/hyperkit.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p10_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json deleted file mode 100644 index d7b31cea7b..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_empty_config/hyperkit.json +++ /dev/null @@ -1 +0,0 @@ -{"hyperkit":"/usr/local/bin/hyperkit","argv0":"","state_dir":"/Users/someuser/.minikube/machines/p8_empty_config","vpnkit_sock":"","vpnkit_uuid":"","vpnkit_preferred_ipv4":"","uuid":"7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","disks":[{"path":"/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","size":20000,"format":"","driver":"virtio-blk"}],"iso":["/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso"],"vsock":false,"vsock_ports":null,"vsock_guest_cid":3,"vmnet":true,"9p_sockets":null,"kernel":"/Users/someuser/.minikube/machines/p8_empty_config/bzImage","initrd":"/Users/someuser/.minikube/machines/p8_empty_config/initrd","bootrom":"","cpus":2,"memory":2000,"console":1,"extra_files":null,"pid":14123,"arguments":["-A","-u","-F","/Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid","-c","2","-m","2000M","-s","0:0,hostbridge","-s","31,lpc","-s","1:0,virtio-net","-U","7f30e71e-aee7-11e9-96c9-8c8590c3b8b4","-s","2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk","-s","3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso","-s","4,virtio-rnd","-l","com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring","-f","kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"],"cmdline":"/usr/local/bin/hyperkit -A -u -F /Users/someuser/.minikube/machines/p8_empty_config/hyperkit.pid -c 2 -m 2000M -s 0:0,hostbridge -s 31,lpc -s 1:0,virtio-net -U 7f30e71e-aee7-11e9-96c9-8c8590c3b8b4 -s 2:0,virtio-blk,/Users/someuser/.minikube/machines/p8_empty_config/p8_empty_config.rawdisk -s 3,ahci-cd,/Users/someuser/.minikube/machines/p8_empty_config/boot2docker.iso -s 4,virtio-rnd -l com1,autopty=/Users/someuser/.minikube/machines/p8_empty_config/tty,log=/Users/someuser/.minikube/machines/p8_empty_config/console-ring -f kexec,/Users/someuser/.minikube/machines/p8_empty_config/bzImage,/Users/someuser/.minikube/machines/p8_empty_config/initrd,earlyprintk=serial loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_empty_config"} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json similarity index 85% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json index b95393d6f0..d4525a7861 100644 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p11_partial_config/config.json +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json @@ -3,7 +3,7 @@ "Driver": { "SSHUser": "docker", "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p11_partial_config/id_rsa", + "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", "StorePath": "/Users/someuser/.minikube", "SwarmMaster": false, "SwarmHost": "", @@ -11,12 +11,12 @@ "DiskSize": 20000, "CPU": 2, "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p11_partial_config", + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", "NFSShares": [], "NFSSharesRoot": "/nfsshares", "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p11_partial_config/b2d-image/boot/initrd", + "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", "Initrd": "initrd", "Vmlinuz": "bzImage" }, diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json deleted file mode 100644 index 1f5e919815..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.58", - "MachineName": "p9_empty_driver", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p9_empty_driver/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p9_empty_driver", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "bc3426d0-aee7-11e9-b24a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p9_empty_driver/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p9_empty_driver" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p9_empty_driver/hyperkit.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json deleted file mode 100644 index 77529a124f..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.51", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_empty/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_empty/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_partial_config/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_empty_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_empty_config/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json deleted file mode 100644 index 5891cb15bf..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_empty/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.56", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10_invalid_file/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p10_invalid_file/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11_partial_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/delete-single/.minikube/profiles/p11_partial_config/config.json rename to pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json deleted file mode 100644 index 9a55310acc..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p9_empty_driver/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.58", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} From a1d73a7a34788ed80943943d105cb67dddbf7305 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Mon, 29 Jul 2019 23:19:13 +0200 Subject: [PATCH 032/106] Added method to delete invalid profiles Added unit tests for DeleteProfiles deleteProfile for not part of api anymore Added more validation for profiles --- cmd/minikube/cmd/delete.go | 44 ++- cmd/minikube/cmd/delete_test.go | 412 ++++++++++++++++++++++++++++ pkg/minikube/config/profile.go | 10 +- pkg/minikube/constants/constants.go | 9 + 4 files changed, 465 insertions(+), 10 deletions(-) create mode 100644 cmd/minikube/cmd/delete_test.go diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index cc50c74ca7..f58d12bf61 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -84,7 +84,7 @@ func runDelete(cmd *cobra.Command, args []string) { exit.WithError("Error getting profiles to delete", err) } - errs := DeleteAllProfiles(profilesToDelete) + errs := DeleteProfiles(profilesToDelete) if len(errs) > 0 { HandleDeletionErrors(errs) } @@ -99,25 +99,33 @@ func runDelete(cmd *cobra.Command, args []string) { out.ErrT(out.Meh, `"{{.name}}" profile does not exist`, out.V{"name": profileName}) } - err = DeleteProfile(profile) + errs := DeleteProfiles([]*pkg_config.Profile{profile}) if err != nil { - HandleDeletionErrors([]error{err}) + HandleDeletionErrors(errs) } } } -func DeleteAllProfiles(profiles []*pkg_config.Profile) []error { +func DeleteProfiles(profiles []*pkg_config.Profile) []error { var errs []error for _, profile := range profiles { - err := DeleteProfile(profile) - if err != nil { + err := deleteProfile(profile) + + _, errStat := os.Stat(constants.GetMachinePath(profile.Name, constants.GetMinipath())) + // TODO: if (err != nil && !profile.IsValid()) || (err != nil && !machineConfig.IsValid()) { + if (err != nil && !profile.IsValid()) || (err != nil && os.IsNotExist(errStat)) { + invalidProfileDeletionErrs := DeleteInvalidProfile(profile) + if len(invalidProfileDeletionErrs) > 0 { + errs = append(errs, invalidProfileDeletionErrs...) + } + } else if err != nil { errs = append(errs, err) } } return errs } -func DeleteProfile(profile *pkg_config.Profile) error { +func deleteProfile(profile *pkg_config.Profile) error { viper.Set(pkg_config.MachineProfile, profile.Name) api, err := machine.NewAPIClient() @@ -180,6 +188,28 @@ func DeleteProfile(profile *pkg_config.Profile) error { return nil } +func DeleteInvalidProfile(profile *pkg_config.Profile) []error { + out.T(out.DeletingHost, "Trying to delete invalid profile {{.profile}}", out.V{"profile": profile.Name}) + + var errs []error + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + err := os.RemoveAll(pathToProfile) + if err != nil { + errs = append(errs, DeletionError{err, Fatal}) + } + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + err := os.RemoveAll(pathToMachine) + if err != nil { + errs = append(errs, DeletionError{err, Fatal}) + } + } + return errs +} + func profileDeletionErr(profileName string, additionalInfo string) error { return fmt.Errorf("error deleting profile \"%s\": %s", profileName, additionalInfo) } diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go new file mode 100644 index 0000000000..1e2c03e25c --- /dev/null +++ b/cmd/minikube/cmd/delete_test.go @@ -0,0 +1,412 @@ +/* +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 cmd + +import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" + "testing" + + "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/constants" +) + +func TestDeleteProfileWithValidConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p1" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p2_empty_profile_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p3_invalid_profile_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p4_partial_profile_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p5_missing_machine_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != numberOfMachineDirs { + t.Fatal("Deleted a machine config when it should not") + } +} + +func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p6_empty_machine_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p7_invalid_machine_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} + +func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-single/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + profileToDelete := "p8_partial_machine_config" + profile, _ := config.LoadProfile(profileToDelete) + + errs := DeleteProfiles([]*config.Profile{profile}) + + if len(errs) > 0 { + HandleDeletionErrors(errs) + t.Fatal("Errors while deleting profiles") + } + + pathToProfile := constants.GetProfilePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { + t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } + + if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + t.Fatal("Did not delete exactly one profile") + } +} diff --git a/pkg/minikube/config/profile.go b/pkg/minikube/config/profile.go index f95990b463..9d454964dc 100644 --- a/pkg/minikube/config/profile.go +++ b/pkg/minikube/config/profile.go @@ -23,8 +23,12 @@ import ( "k8s.io/minikube/pkg/minikube/constants" ) -// isValid checks if the profile has the essential info needed for a profile -func (p *Profile) isValid() bool { +// IsValid checks if the profile has the essential info needed for a profile +func (p *Profile) IsValid() bool { + if p.Config == nil { + return false + } + if p.Config.MachineConfig.VMDriver == "" { return false } @@ -48,7 +52,7 @@ func ListProfiles(miniHome ...string) (validPs []*Profile, inValidPs []*Profile, inValidPs = append(inValidPs, p) continue } - if !p.isValid() { + if !p.IsValid() { inValidPs = append(inValidPs, p) continue } diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 2929079a88..a03582eb37 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -208,6 +208,15 @@ func GetProfilePath(profile string, miniHome ...string) string { return filepath.Join(miniPath, "profiles", profile) } +// GetMachinePath returns the Minikube machine path of a machine +func GetMachinePath(machine string, miniHome ...string) string { + miniPath := GetMinipath() + if len(miniHome) > 0 { + miniPath = miniHome[0] + } + return filepath.Join(miniPath, "machines", machine) +} + // AddonsPath is the default path of the addons configuration const AddonsPath = "/etc/kubernetes/addons" From 333c29397662c806c691b0912e7320337779bb55 Mon Sep 17 00:00:00 2001 From: bhanu011 Date: Wed, 7 Aug 2019 02:46:09 +0530 Subject: [PATCH 033/106] 4883: Advice when user tries to set profile name --- cmd/minikube/cmd/config/util.go | 29 ++++++++++++++++++++++++++++ cmd/minikube/cmd/config/util_test.go | 24 +++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index 18c0b5cd8f..0a3a189611 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -27,6 +27,7 @@ import ( "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/command" "k8s.io/minikube/pkg/minikube/config" + pkgConfig "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/exit" "k8s.io/minikube/pkg/minikube/machine" @@ -226,3 +227,31 @@ func EnableOrDisableStorageClasses(name, val string) error { return EnableOrDisableAddon(name, val) } + +//ValidateProfile checks if the profile user is trying to switch exists, else throws error +func ValidateProfile(profile string) error { + var profileFound bool + validProfiles, invalidProfiles, err := pkgConfig.ListProfiles() + if err != nil { + exit.WithError("Not able to retrieve profile list", err) + } + + // handling invalid profiles + for _, invalidProf := range invalidProfiles { + if profile == invalidProf.Name { + return errors.New("You are trying to switch to invalid profile") + } + } + + // valid profiles if found, setting profileFound to true + for _, prof := range validProfiles { + if prof.Name == profile { + profileFound = true + break + } + } + if !profileFound { + return errors.New("Profile you are trying to switch is not found") + } + return nil +} diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go index 0f0cf189c8..b7ab5d80de 100644 --- a/cmd/minikube/cmd/config/util_test.go +++ b/cmd/minikube/cmd/config/util_test.go @@ -17,6 +17,7 @@ limitations under the License. package config import ( + "fmt" "testing" "k8s.io/minikube/pkg/minikube/assets" @@ -111,3 +112,26 @@ func TestIsAddonAlreadySet(t *testing.T) { } } } + +func TestValidateProfile(t *testing.T) { + testCases := []struct { + profileName string + expectErr string + }{ + { + profileName: "not_so_common", + expectErr: "Profile you are trying to switch is not found", + }, + } + + for _, test := range testCases { + profileNam := test.profileName + expectedMsg := test.expectErr + + err := ValidateProfile(profileNam) + fmt.Println(err.Error()) + if err.Error() != expectedMsg { + t.Errorf("Didnt receive expected message") + } + } +} From 50329ed870a4da50d5954eeebcf10cc7ba0a99f1 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Wed, 7 Aug 2019 21:48:46 +0200 Subject: [PATCH 034/106] Added machine.go to Load and Validate machines Added empty machine_test.go Added testdata for machine.go --- cmd/minikube/cmd/delete.go | 11 +- pkg/minikube/config/machine.go | 115 ++++++++++++++++++ pkg/minikube/config/machine_test.go | 17 +++ .../machine/.minikube/machines/p1/config.json | 80 ++++++++++++ .../machine/.minikube/machines/p2/config.json | 80 ++++++++++++ .../machines/p3_empty_config/config.json | 0 .../p4_invalid_machine_config/config.json | 1 + .../machines/p5_partial_config/config.json | 72 +++++++++++ 8 files changed, 373 insertions(+), 3 deletions(-) create mode 100644 pkg/minikube/config/machine.go create mode 100644 pkg/minikube/config/machine_test.go create mode 100644 pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json create mode 100644 pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json create mode 100644 pkg/minikube/config/testdata/machine/.minikube/machines/p3_empty_config/config.json create mode 100644 pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index f58d12bf61..fcca91bf11 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -111,9 +111,14 @@ func DeleteProfiles(profiles []*pkg_config.Profile) []error { for _, profile := range profiles { err := deleteProfile(profile) - _, errStat := os.Stat(constants.GetMachinePath(profile.Name, constants.GetMinipath())) - // TODO: if (err != nil && !profile.IsValid()) || (err != nil && !machineConfig.IsValid()) { - if (err != nil && !profile.IsValid()) || (err != nil && os.IsNotExist(errStat)) { + var mm *pkg_config.Machine + var loadErr error + + if err != nil { + mm, loadErr = pkg_config.LoadMachine(profile.Name) + } + + if (err != nil && !profile.IsValid()) || (loadErr != nil || !mm.IsValid()) { invalidProfileDeletionErrs := DeleteInvalidProfile(profile) if len(invalidProfileDeletionErrs) > 0 { errs = append(errs, invalidProfileDeletionErrs...) diff --git a/pkg/minikube/config/machine.go b/pkg/minikube/config/machine.go new file mode 100644 index 0000000000..ecbc193361 --- /dev/null +++ b/pkg/minikube/config/machine.go @@ -0,0 +1,115 @@ +/* +Copyright 2019 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 + +//TODO: Resolve import cycle +import ( + "github.com/docker/machine/libmachine/host" + "github.com/pkg/errors" + "io/ioutil" + "k8s.io/minikube/pkg/minikube/cluster" + "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/machine" + "path/filepath" +) + +type Machine struct { + *host.Host +} + +func (h *Machine) IsValid() bool { + if h == nil { + return false + } + + if h.Host == nil { + return false + } + + if h.Host.Name == "" { + return false + } + + if h.Host.Driver == nil { + return false + } + + if h.Host.HostOptions == nil { + return false + } + + if h.Host.RawDriver == nil { + return false + } + return true +} + +func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines []*Machine, err error) { + pDirs, err := machineDirs(miniHome...) + if err != nil { + return nil, nil, err + } + for _, n := range pDirs { + p, err := LoadMachine(n) + if err != nil { + inValidMachines = append(inValidMachines, p) + continue + } + if !p.IsValid() { + inValidMachines = append(inValidMachines, p) + continue + } + validMachines = append(validMachines, p) + } + return validMachines, inValidMachines, nil +} + +func LoadMachine(name string) (*Machine, error) { + api, err := machine.NewAPIClient() + if err != nil { + return nil, err + } + + h, err := cluster.CheckIfHostExistsAndLoad(api, name) + if err != nil { + return nil, err + } + + var mm Machine + if h != nil { + mm.Host = h + } else { + return nil, errors.New("host is nil") + } + + return &mm, nil +} + +func machineDirs(miniHome ...string) (dirs []string, err error) { + miniPath := constants.GetMinipath() + if len(miniHome) > 0 { + miniPath = miniHome[0] + } + mRootDir := filepath.Join(miniPath, "machines") + items, err := ioutil.ReadDir(mRootDir) + for _, f := range items { + if f.IsDir() { + dirs = append(dirs, f.Name()) + } + } + return dirs, err +} diff --git a/pkg/minikube/config/machine_test.go b/pkg/minikube/config/machine_test.go new file mode 100644 index 0000000000..435edadbaf --- /dev/null +++ b/pkg/minikube/config/machine_test.go @@ -0,0 +1,17 @@ +/* +Copyright 2019 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 diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json new file mode 100644 index 0000000000..90a026a01c --- /dev/null +++ b/pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p1", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p1" +} diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json b/pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json new file mode 100644 index 0000000000..3a9813e57d --- /dev/null +++ b/pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p2", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p2" +} diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p3_empty_config/config.json b/pkg/minikube/config/testdata/machine/.minikube/machines/p3_empty_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json b/pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json b/pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json new file mode 100644 index 0000000000..d7b7092761 --- /dev/null +++ b/pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json @@ -0,0 +1,72 @@ +{ + "ConfigVersion": 3, + "Driver": { + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p5_partial_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p5_partial_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p5_partial_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, +} From c93908dd0aec69e618f23e98589d0bf063a95daf Mon Sep 17 00:00:00 2001 From: bhanu011 Date: Fri, 9 Aug 2019 00:58:08 +0530 Subject: [PATCH 035/106] 4883: Advice when user tries to set profile name --- cmd/minikube/cmd/config/profile.go | 6 ++++++ cmd/minikube/cmd/config/util.go | 25 ++++++++++++++++++------- cmd/minikube/cmd/config/util_test.go | 13 +++++++------ 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/cmd/minikube/cmd/config/profile.go b/cmd/minikube/cmd/config/profile.go index c15be55847..4c8db41444 100644 --- a/cmd/minikube/cmd/config/profile.go +++ b/cmd/minikube/cmd/config/profile.go @@ -47,6 +47,12 @@ var ProfileCmd = &cobra.Command{ profile := args[0] if profile == "default" { profile = "minikube" + } else { + // not validating when it is default profile + errProfile, ok := ValidateProfile(profile) + if !ok && errProfile != nil { + out.FailureT(errProfile.Msg) + } } err := Set(pkgConfig.MachineProfile, profile) if err != nil { diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index 0a3a189611..ca81590ad8 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -228,9 +228,19 @@ func EnableOrDisableStorageClasses(name, val string) error { return EnableOrDisableAddon(name, val) } -//ValidateProfile checks if the profile user is trying to switch exists, else throws error -func ValidateProfile(profile string) error { - var profileFound bool +// ErrValidateProfile Error to validate profile +type ErrValidateProfile struct { + Name string + Msg string +} + +func (e ErrValidateProfile) Error() string { + return e.Msg +} + +// ValidateProfile checks if the profile user is trying to switch exists, else throws error +func ValidateProfile(profile string) (*ErrValidateProfile, bool) { + validProfiles, invalidProfiles, err := pkgConfig.ListProfiles() if err != nil { exit.WithError("Not able to retrieve profile list", err) @@ -239,11 +249,12 @@ func ValidateProfile(profile string) error { // handling invalid profiles for _, invalidProf := range invalidProfiles { if profile == invalidProf.Name { - return errors.New("You are trying to switch to invalid profile") + return &ErrValidateProfile{Name: profile, Msg: fmt.Sprintf("%q is an invalid profile", profile)}, false } } - // valid profiles if found, setting profileFound to true + profileFound := false + // valid profiles if found, setting profileFound to trueexpectedMsg for _, prof := range validProfiles { if prof.Name == profile { profileFound = true @@ -251,7 +262,7 @@ func ValidateProfile(profile string) error { } } if !profileFound { - return errors.New("Profile you are trying to switch is not found") + return &ErrValidateProfile{Name: profile, Msg: fmt.Sprintf("profile %q not found", profile)}, false } - return nil + return nil, true } diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go index b7ab5d80de..f3ac169129 100644 --- a/cmd/minikube/cmd/config/util_test.go +++ b/cmd/minikube/cmd/config/util_test.go @@ -119,18 +119,19 @@ func TestValidateProfile(t *testing.T) { expectErr string }{ { - profileName: "not_so_common", - expectErr: "Profile you are trying to switch is not found", + profileName: "82374328742_2974224498", + }, + { + profileName: "minikube", }, } for _, test := range testCases { profileNam := test.profileName - expectedMsg := test.expectErr + expectedMsg := fmt.Sprintf("profile %q not found", test.profileName) - err := ValidateProfile(profileNam) - fmt.Println(err.Error()) - if err.Error() != expectedMsg { + err, ok := ValidateProfile(profileNam) + if !ok && err.Error() != expectedMsg { t.Errorf("Didnt receive expected message") } } From 6ed4262849278b7f76c8601b5d832d23cae74de5 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 8 Aug 2019 21:41:58 +0200 Subject: [PATCH 036/106] Resolved import cycle Added unit test for machine.go --- cmd/minikube/cmd/delete.go | 4 +- pkg/minikube/{config => cluster}/machine.go | 6 +- pkg/minikube/cluster/machine_test.go | 70 +++++++++++++++++++ .../machine/.minikube/machines/p1/config.json | 0 .../machine/.minikube/machines/p2/config.json | 0 .../machines/p3_empty_config/config.json | 0 .../p4_invalid_machine_config/config.json | 0 .../machines/p5_partial_config/config.json | 0 pkg/minikube/config/machine_test.go | 17 ----- 9 files changed, 74 insertions(+), 23 deletions(-) rename pkg/minikube/{config => cluster}/machine.go (94%) create mode 100644 pkg/minikube/cluster/machine_test.go rename pkg/minikube/{config => cluster}/testdata/machine/.minikube/machines/p1/config.json (100%) rename pkg/minikube/{config => cluster}/testdata/machine/.minikube/machines/p2/config.json (100%) rename pkg/minikube/{config => cluster}/testdata/machine/.minikube/machines/p3_empty_config/config.json (100%) rename pkg/minikube/{config => cluster}/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json (100%) rename pkg/minikube/{config => cluster}/testdata/machine/.minikube/machines/p5_partial_config/config.json (100%) delete mode 100644 pkg/minikube/config/machine_test.go diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index fcca91bf11..d7d77e488b 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -111,11 +111,11 @@ func DeleteProfiles(profiles []*pkg_config.Profile) []error { for _, profile := range profiles { err := deleteProfile(profile) - var mm *pkg_config.Machine + var mm *cluster.Machine var loadErr error if err != nil { - mm, loadErr = pkg_config.LoadMachine(profile.Name) + mm, loadErr = cluster.LoadMachine(profile.Name) } if (err != nil && !profile.IsValid()) || (loadErr != nil || !mm.IsValid()) { diff --git a/pkg/minikube/config/machine.go b/pkg/minikube/cluster/machine.go similarity index 94% rename from pkg/minikube/config/machine.go rename to pkg/minikube/cluster/machine.go index ecbc193361..4c60aa9655 100644 --- a/pkg/minikube/config/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -14,14 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package config +package cluster -//TODO: Resolve import cycle import ( "github.com/docker/machine/libmachine/host" "github.com/pkg/errors" "io/ioutil" - "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/machine" "path/filepath" @@ -84,7 +82,7 @@ func LoadMachine(name string) (*Machine, error) { return nil, err } - h, err := cluster.CheckIfHostExistsAndLoad(api, name) + h, err := CheckIfHostExistsAndLoad(api, name) if err != nil { return nil, err } diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go new file mode 100644 index 0000000000..0b7b111364 --- /dev/null +++ b/pkg/minikube/cluster/machine_test.go @@ -0,0 +1,70 @@ +/* +Copyright 2019 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 cluster + +import ( + "io/ioutil" + "k8s.io/minikube/pkg/minikube/constants" + "os" + "path/filepath" + "testing" +) + +func TestListMachines(t *testing.T) { + const ( + numberOfValidMachines = 2 + numberOfInValidMachines = 3 + totalNumberOfMachines = numberOfValidMachines + numberOfInValidMachines + ) + + testMinikubeDir := "./testdata/machine" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + validMachines, inValidMachines, err := ListMachines() + + if err != nil { + t.Error(err) + } + + if numberOfValidMachines != len(validMachines) { + t.Errorf("expected %d valid machines, got %d", numberOfValidMachines, len(validMachines)) + } + + if numberOfInValidMachines != len(inValidMachines) { + t.Errorf("expected %d invalid machines, got %d", numberOfInValidMachines, len(inValidMachines)) + } + + if totalNumberOfMachines != len(validMachines)+len(inValidMachines) { + t.Errorf("expected %d total machines, got %d", totalNumberOfMachines, len(validMachines)+len(inValidMachines)) + } + + if numberOfMachineDirs != len(validMachines)+len(inValidMachines) { + t.Error("expected number of machine directories to be equal to the number of total machines") + } +} diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json similarity index 100% rename from pkg/minikube/config/testdata/machine/.minikube/machines/p1/config.json rename to pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json similarity index 100% rename from pkg/minikube/config/testdata/machine/.minikube/machines/p2/config.json rename to pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p3_empty_config/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p3_empty_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/machine/.minikube/machines/p3_empty_config/config.json rename to pkg/minikube/cluster/testdata/machine/.minikube/machines/p3_empty_config/config.json diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json rename to pkg/minikube/cluster/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json diff --git a/pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p5_partial_config/config.json similarity index 100% rename from pkg/minikube/config/testdata/machine/.minikube/machines/p5_partial_config/config.json rename to pkg/minikube/cluster/testdata/machine/.minikube/machines/p5_partial_config/config.json diff --git a/pkg/minikube/config/machine_test.go b/pkg/minikube/config/machine_test.go deleted file mode 100644 index 435edadbaf..0000000000 --- a/pkg/minikube/config/machine_test.go +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2019 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 From 1a790dad18d2b1b46da04433d6938aac98967e6f Mon Sep 17 00:00:00 2001 From: bhanu011 Date: Fri, 9 Aug 2019 01:17:56 +0530 Subject: [PATCH 037/106] 4883: Fixed unused variable issue in test case --- cmd/minikube/cmd/config/util_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go index f3ac169129..3e14d05704 100644 --- a/cmd/minikube/cmd/config/util_test.go +++ b/cmd/minikube/cmd/config/util_test.go @@ -116,7 +116,6 @@ func TestIsAddonAlreadySet(t *testing.T) { func TestValidateProfile(t *testing.T) { testCases := []struct { profileName string - expectErr string }{ { profileName: "82374328742_2974224498", From 17365e7e4286523cc85386da997fb814ecefe24a Mon Sep 17 00:00:00 2001 From: bhanu011 Date: Fri, 9 Aug 2019 01:41:42 +0530 Subject: [PATCH 038/106] 4883: removed exit with error --- cmd/minikube/cmd/config/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index ca81590ad8..b633a856b0 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -243,7 +243,7 @@ func ValidateProfile(profile string) (*ErrValidateProfile, bool) { validProfiles, invalidProfiles, err := pkgConfig.ListProfiles() if err != nil { - exit.WithError("Not able to retrieve profile list", err) + out.FailureT(err.Error()) } // handling invalid profiles From f0dd5a7e35b357baa699bb72991b346d0da8c62b Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 8 Aug 2019 23:16:46 +0200 Subject: [PATCH 039/106] Added unit test for deletion of all profiles Improved logging --- cmd/minikube/cmd/delete.go | 10 +++-- cmd/minikube/cmd/delete_test.go | 79 +++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 12 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index d7d77e488b..692560e967 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -87,6 +87,8 @@ func runDelete(cmd *cobra.Command, args []string) { errs := DeleteProfiles(profilesToDelete) if len(errs) > 0 { HandleDeletionErrors(errs) + } else { + out.T(out.DeletingHost, "Successfully deleted all profiles") } } else { if len(args) > 0 { @@ -100,8 +102,10 @@ func runDelete(cmd *cobra.Command, args []string) { } errs := DeleteProfiles([]*pkg_config.Profile{profile}) - if err != nil { + if len(errs) > 0 { HandleDeletionErrors(errs) + } else { + out.T(out.DeletingHost, "Successfully deleted profile \"{{.name}}\"", out.V{"name": profileName}) } } } @@ -119,7 +123,7 @@ func DeleteProfiles(profiles []*pkg_config.Profile) []error { } if (err != nil && !profile.IsValid()) || (loadErr != nil || !mm.IsValid()) { - invalidProfileDeletionErrs := DeleteInvalidProfile(profile) + invalidProfileDeletionErrs := deleteInvalidProfile(profile) if len(invalidProfileDeletionErrs) > 0 { errs = append(errs, invalidProfileDeletionErrs...) } @@ -193,7 +197,7 @@ func deleteProfile(profile *pkg_config.Profile) error { return nil } -func DeleteInvalidProfile(profile *pkg_config.Profile) []error { +func deleteInvalidProfile(profile *pkg_config.Profile) []error { out.T(out.DeletingHost, "Trying to delete invalid profile {{.profile}}", out.V{"profile": profile.Name}) var errs []error diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go index 1e2c03e25c..a377c3135e 100644 --- a/cmd/minikube/cmd/delete_test.go +++ b/cmd/minikube/cmd/delete_test.go @@ -17,7 +17,6 @@ limitations under the License. package cmd import ( - "fmt" "io/ioutil" "os" "path/filepath" @@ -37,7 +36,7 @@ func TestDeleteProfileWithValidConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -85,7 +84,7 @@ func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -133,7 +132,7 @@ func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -181,7 +180,7 @@ func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -229,7 +228,7 @@ func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -277,7 +276,7 @@ func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -325,7 +324,7 @@ func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -373,7 +372,7 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { err = os.Setenv(constants.MinikubeHome, miniDir) if err != nil { - fmt.Printf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) } files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) @@ -410,3 +409,65 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { t.Fatal("Did not delete exactly one profile") } } + +func TestDeleteAllProfiles(t *testing.T) { + const numberOfTotalProfileDirs = 8 + const numberOfTotalMachineDirs = 7 + + testMinikubeDir := "../../../pkg/minikube/config/testdata/delete-all/.minikube" + miniDir, err := filepath.Abs(testMinikubeDir) + + if err != nil { + t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) + } + + err = os.Setenv(constants.MinikubeHome, miniDir) + if err != nil { + t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + } + + files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs := len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs := len(files) + + if numberOfTotalProfileDirs != numberOfProfileDirs { + t.Error("invalid testdata") + } + + if numberOfTotalMachineDirs != numberOfMachineDirs { + t.Error("invalid testdata") + } + + validProfiles, inValidProfiles, err := config.ListProfiles() + + if err != nil { + t.Error(err) + } + + if numberOfTotalProfileDirs != len(validProfiles)+len(inValidProfiles) { + t.Error("invalid testdata") + } + + profiles := append(validProfiles, inValidProfiles...) + errs := DeleteProfiles(profiles) + + if errs != nil { + t.Errorf("errors while deleting all profiles: %v", errs) + } + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + numberOfProfileDirs = len(files) + + files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + numberOfMachineDirs = len(files) + + if numberOfProfileDirs != 0 { + t.Errorf("Did not delete all profiles: still %d profiles left", numberOfProfileDirs) + } + + if numberOfMachineDirs != 0 { + t.Errorf("Did not delete all profiles: still %d machines left", numberOfMachineDirs) + } +} From 229c9b7ee9c54668c89ca12e2c286cd5570548e2 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 8 Aug 2019 23:21:05 +0200 Subject: [PATCH 040/106] Fixed lint errors --- pkg/minikube/cluster/machine.go | 5 +++-- pkg/minikube/cluster/machine_test.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go index 4c60aa9655..cd28295ee2 100644 --- a/pkg/minikube/cluster/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -17,12 +17,13 @@ limitations under the License. package cluster import ( + "io/ioutil" + "path/filepath" + "github.com/docker/machine/libmachine/host" "github.com/pkg/errors" - "io/ioutil" "k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/machine" - "path/filepath" ) type Machine struct { diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index 0b7b111364..5a9e2c7107 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -18,10 +18,11 @@ package cluster import ( "io/ioutil" - "k8s.io/minikube/pkg/minikube/constants" "os" "path/filepath" "testing" + + "k8s.io/minikube/pkg/minikube/constants" ) func TestListMachines(t *testing.T) { From 4835945839823e8828698c7d2e93427022d42558 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sun, 18 Aug 2019 19:44:09 +0200 Subject: [PATCH 041/106] Bugfix Refactor --- cmd/minikube/cmd/delete.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 692560e967..60729515a1 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -115,20 +115,17 @@ func DeleteProfiles(profiles []*pkg_config.Profile) []error { for _, profile := range profiles { err := deleteProfile(profile) - var mm *cluster.Machine - var loadErr error - if err != nil { - mm, loadErr = cluster.LoadMachine(profile.Name) - } + mm, loadErr := cluster.LoadMachine(profile.Name) - if (err != nil && !profile.IsValid()) || (loadErr != nil || !mm.IsValid()) { - invalidProfileDeletionErrs := deleteInvalidProfile(profile) - if len(invalidProfileDeletionErrs) > 0 { - errs = append(errs, invalidProfileDeletionErrs...) + if !profile.IsValid() || (loadErr != nil || !mm.IsValid()) { + invalidProfileDeletionErrs := deleteInvalidProfile(profile) + if len(invalidProfileDeletionErrs) > 0 { + errs = append(errs, invalidProfileDeletionErrs...) + } + } else { + errs = append(errs, err) } - } else if err != nil { - errs = append(errs, err) } } return errs From d5bfa87edf127d65f04677ea2d092aa41a1c15bf Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sun, 18 Aug 2019 22:12:43 +0200 Subject: [PATCH 042/106] Added delete --all to proxy_test --- test/integration/proxy_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/integration/proxy_test.go b/test/integration/proxy_test.go index 3241d80b56..de4ee46622 100644 --- a/test/integration/proxy_test.go +++ b/test/integration/proxy_test.go @@ -96,9 +96,16 @@ func TestProxy(t *testing.T) { t.Errorf("Error shutting down the http proxy") } - _, _, err = r.RunWithContext(ctx, "delete") + _, _, err = r.RunWithContext(ctx, "delete --all") if err != nil { - t.Logf("Error deleting minikube when cleaning up proxy setup: %s", err) + t.Errorf("Error deleting minikube when cleaning up proxy setup: %s", err) + } + + stdOut, stdErr, _ := r.RunWithContext(ctx, "profile list") + + msg := "No minikube profile was found" + if stdOut != "" || !strings.Contains(stdErr, msg) { + t.Errorf("minikube delete --all did not delete all profiles") } }(t) From da1f935da847fb32149c16e2d277c13d6b6f3d60 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Mon, 19 Aug 2019 21:40:23 +0200 Subject: [PATCH 043/106] Readded Shutdown and Teardown --- test/integration/z_proxy_test.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test/integration/z_proxy_test.go b/test/integration/z_proxy_test.go index e26099cfb9..43fc879e31 100644 --- a/test/integration/z_proxy_test.go +++ b/test/integration/z_proxy_test.go @@ -22,7 +22,6 @@ limitations under the License. package integration import ( - "context" "fmt" "io/ioutil" "os" @@ -34,7 +33,7 @@ import ( "net/url" "github.com/elazarl/goproxy" - retryablehttp "github.com/hashicorp/go-retryablehttp" + "github.com/hashicorp/go-retryablehttp" "github.com/phayes/freeport" "github.com/pkg/errors" "k8s.io/minikube/test/integration/util" @@ -94,11 +93,6 @@ func TestProxy(t *testing.T) { t.Errorf("Error reverting the NO_PROXY env") } - err := srv.Shutdown(context.TODO()) // shutting down the http proxy after tests - if err != nil { - t.Errorf("Error shutting down the http proxy") - } - _, _, err = r.RunWithContext(ctx, "delete --all") if err != nil { t.Errorf("Error deleting minikube when cleaning up proxy setup: %s", err) @@ -110,6 +104,15 @@ func TestProxy(t *testing.T) { if stdOut != "" || !strings.Contains(stdErr, msg) { t.Errorf("minikube delete --all did not delete all profiles") } + + err := srv.Shutdown(context.TODO()) // shutting down the http proxy after tests + if err != nil { + t.Errorf("Error shutting down the http proxy") + } + if !isTestNoneDriver(t) { + mk.TearDown(t) + } + }(t) t.Run("ProxyConsoleWarnning", testProxyWarning) t.Run("ProxyDashboard", testProxyDashboard) From 5289e1f465632b93263fbd90c239a0ddac6ae00f Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Mon, 19 Aug 2019 21:59:10 +0200 Subject: [PATCH 044/106] Fixed lint errors --- test/integration/z_proxy_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/z_proxy_test.go b/test/integration/z_proxy_test.go index 43fc879e31..6d7666dab2 100644 --- a/test/integration/z_proxy_test.go +++ b/test/integration/z_proxy_test.go @@ -22,6 +22,7 @@ limitations under the License. package integration import ( + "context" "fmt" "io/ioutil" "os" @@ -33,7 +34,7 @@ import ( "net/url" "github.com/elazarl/goproxy" - "github.com/hashicorp/go-retryablehttp" + retryablehttp "github.com/hashicorp/go-retryablehttp" "github.com/phayes/freeport" "github.com/pkg/errors" "k8s.io/minikube/test/integration/util" @@ -93,12 +94,12 @@ func TestProxy(t *testing.T) { t.Errorf("Error reverting the NO_PROXY env") } - _, _, err = r.RunWithContext(ctx, "delete --all") - if err != nil { + _, stdErr := mk.RunCommand("delete --all", false) + if stdErr != "" { t.Errorf("Error deleting minikube when cleaning up proxy setup: %s", err) } - stdOut, stdErr, _ := r.RunWithContext(ctx, "profile list") + stdOut, stdErr := mk.RunCommand("profile list", false) msg := "No minikube profile was found" if stdOut != "" || !strings.Contains(stdErr, msg) { From b3741bd9523b4009a74cde88a497449a2933da85 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Tue, 20 Aug 2019 21:10:29 +0200 Subject: [PATCH 045/106] Readded init --- cmd/minikube/cmd/delete.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index da6fb503e7..3bef814c42 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -336,3 +336,8 @@ func killMountProcess() error { } return nil } + +func init() { + deleteCmd.Flags().BoolVar(&deleteAll, "all", false, "Set flag to delete all profiles") + RootCmd.AddCommand(deleteCmd) +} From 808477ae1ea6ca715a2328471f3d0e165396f8dd Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Fri, 23 Aug 2019 19:47:41 +0200 Subject: [PATCH 046/106] Moved GetMachinePath to machine.go and renamed it to MachinePath Added comments to public functions --- cmd/minikube/cmd/delete.go | 4 +++- cmd/minikube/cmd/delete_test.go | 17 +++++++++-------- pkg/minikube/cluster/machine.go | 13 +++++++++++++ pkg/minikube/constants/constants.go | 9 --------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index 3bef814c42..3e388b2c43 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -113,6 +113,7 @@ func runDelete(cmd *cobra.Command, args []string) { } } +// Deletes one or more profiles func DeleteProfiles(profiles []*pkg_config.Profile) []error { var errs []error for _, profile := range profiles { @@ -223,7 +224,7 @@ func deleteInvalidProfile(profile *pkg_config.Profile) []error { } } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { err := os.RemoveAll(pathToMachine) if err != nil { @@ -248,6 +249,7 @@ func uninstallKubernetes(api libmachine.API, kc pkg_config.KubernetesConfig, bsN return nil } +// Handles deletion error from DeleteProfiles func HandleDeletionErrors(errors []error) { if len(errors) == 1 { handleSingleDeletionError(errors[0]) diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go index a377c3135e..d76e7e6148 100644 --- a/cmd/minikube/cmd/delete_test.go +++ b/cmd/minikube/cmd/delete_test.go @@ -22,6 +22,7 @@ import ( "path/filepath" "testing" + "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/constants" ) @@ -60,7 +61,7 @@ func TestDeleteProfileWithValidConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -108,7 +109,7 @@ func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -156,7 +157,7 @@ func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -204,7 +205,7 @@ func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -252,7 +253,7 @@ func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -300,7 +301,7 @@ func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -348,7 +349,7 @@ func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } @@ -396,7 +397,7 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := constants.GetMachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go index cd28295ee2..e674bfe095 100644 --- a/pkg/minikube/cluster/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -30,6 +30,7 @@ type Machine struct { *host.Host } +// IsValid checks if the machine has the essential info needed for a machine func (h *Machine) IsValid() bool { if h == nil { return false @@ -57,6 +58,8 @@ func (h *Machine) IsValid() bool { return true } +// ListsMachines return all valid and invalid machines +// If a machine is valid or invalid is determined by the cluster.IsValid function func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines []*Machine, err error) { pDirs, err := machineDirs(miniHome...) if err != nil { @@ -77,6 +80,7 @@ func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines return validMachines, inValidMachines, nil } +// Loads a machine or throws an error if the machine could not be loadedG func LoadMachine(name string) (*Machine, error) { api, err := machine.NewAPIClient() if err != nil { @@ -112,3 +116,12 @@ func machineDirs(miniHome ...string) (dirs []string, err error) { } return dirs, err } + +// MachinePath returns the Minikube machine path of a machine +func MachinePath(machine string, miniHome ...string) string { + miniPath := constants.GetMinipath() + if len(miniHome) > 0 { + miniPath = miniHome[0] + } + return filepath.Join(miniPath, "machines", machine) +} diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 4378af264a..6bc072b91c 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -210,15 +210,6 @@ func GetProfilePath(profile string, miniHome ...string) string { return filepath.Join(miniPath, "profiles", profile) } -// GetMachinePath returns the Minikube machine path of a machine -func GetMachinePath(machine string, miniHome ...string) string { - miniPath := GetMinipath() - if len(miniHome) > 0 { - miniPath = miniHome[0] - } - return filepath.Join(miniPath, "machines", machine) -} - // AddonsPath is the default path of the addons configuration const AddonsPath = "/etc/kubernetes/addons" From 79e8250da454c95c59e007025665754ec3015302 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 21 Sep 2019 14:39:35 +0200 Subject: [PATCH 047/106] Use localpath --- cmd/minikube/cmd/delete.go | 6 +- cmd/minikube/cmd/delete_test.go | 142 +++++++++--------- pkg/minikube/cluster/machine.go | 6 +- pkg/minikube/cluster/machine_test.go | 8 +- .../.minikube/machines/p1/config.json | 80 ---------- .../p2_empty_profile_config/config.json | 80 ---------- .../p3_invalid_profile_config/config.json | 80 ---------- .../p4_partial_profile_config/config.json | 80 ---------- .../p6_empty_machine_config/config.json | 0 .../p7_invalid_machine_config/config.json | 1 - .../p8_partial_machine_config/config.json | 72 --------- .../.minikube/profiles/p1/config.json | 49 ------ .../p2_empty_profile_config/config.json | 0 .../p3_invalid_profile_config/config.json | 1 - .../p4_partial_profile_config/config.json | 47 ------ .../p5_missing_machine_config/config.json | 49 ------ .../p6_empty_machine_config/config.json | 49 ------ .../p7_invalid_machine_config/config.json | 49 ------ .../p8_partial_machine_config/config.json | 49 ------ .../.minikube/machines/p1/config.json | 80 ---------- .../p2_empty_profile_config/config.json | 80 ---------- .../p3_invalid_profile_config/config.json | 80 ---------- .../p4_partial_profile_config/config.json | 80 ---------- .../p6_empty_machine_config/config.json | 0 .../p7_invalid_machine_config/config.json | 1 - .../p8_partial_machine_config/config.json | 72 --------- .../.minikube/profiles/p1/config.json | 49 ------ .../p2_empty_profile_config/config.json | 0 .../p3_invalid_profile_config/config.json | 1 - .../p4_partial_profile_config/config.json | 47 ------ .../p5_missing_machine_config/config.json | 49 ------ .../p6_empty_machine_config/config.json | 49 ------ .../p7_invalid_machine_config/config.json | 49 ------ .../p8_partial_machine_config/config.json | 49 ------ 34 files changed, 81 insertions(+), 1453 deletions(-) delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json diff --git a/cmd/minikube/cmd/delete.go b/cmd/minikube/cmd/delete.go index e9ab1d7e62..7acdf1f6bc 100644 --- a/cmd/minikube/cmd/delete.go +++ b/cmd/minikube/cmd/delete.go @@ -185,7 +185,7 @@ func deleteProfile(profile *pkg_config.Profile) error { } // In case DeleteHost didn't complete the job. - machineDir := filepath.Join(localpath.MiniPath(), "machines", profile) + machineDir := filepath.Join(localpath.MiniPath(), "machines", profile.Name) if _, err := os.Stat(machineDir); err == nil { out.T(out.DeletingHost, `Removing {{.directory}} ...`, out.V{"directory": machineDir}) err := os.RemoveAll(machineDir) @@ -220,7 +220,7 @@ func deleteInvalidProfile(profile *pkg_config.Profile) []error { out.T(out.DeletingHost, "Trying to delete invalid profile {{.profile}}", out.V{"profile": profile.Name}) var errs []error - pathToProfile := pkg_config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := pkg_config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { err := os.RemoveAll(pathToProfile) if err != nil { @@ -228,7 +228,7 @@ func deleteInvalidProfile(profile *pkg_config.Profile) []error { } } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { err := os.RemoveAll(pathToMachine) if err != nil { diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go index 4297be9812..b5304c7852 100644 --- a/cmd/minikube/cmd/delete_test.go +++ b/cmd/minikube/cmd/delete_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" - "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/localpath" ) func TestDeleteProfileWithValidConfig(t *testing.T) { @@ -35,15 +35,15 @@ func TestDeleteProfileWithValidConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p1" @@ -56,21 +56,21 @@ func TestDeleteProfileWithValidConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -83,15 +83,15 @@ func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p2_empty_profile_config" @@ -104,21 +104,21 @@ func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -131,15 +131,15 @@ func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p3_invalid_profile_config" @@ -152,21 +152,21 @@ func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -179,15 +179,15 @@ func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p4_partial_profile_config" @@ -200,21 +200,21 @@ func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -227,15 +227,15 @@ func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p5_missing_machine_config" @@ -248,21 +248,21 @@ func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != numberOfMachineDirs { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != numberOfMachineDirs { t.Fatal("Deleted a machine config when it should not") } } @@ -275,15 +275,15 @@ func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p6_empty_machine_config" @@ -296,21 +296,21 @@ func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -323,15 +323,15 @@ func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p7_invalid_machine_config" @@ -344,21 +344,21 @@ func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -371,15 +371,15 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) profileToDelete := "p8_partial_machine_config" @@ -392,21 +392,21 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { t.Fatal("Errors while deleting profiles") } - pathToProfile := config.ProfileFolderPath(profile.Name, constants.GetMinipath()) + pathToProfile := config.ProfileFolderPath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToProfile); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - pathToMachine := cluster.MachinePath(profile.Name, constants.GetMinipath()) + pathToMachine := cluster.MachinePath(profile.Name, localpath.MiniPath()) if _, err := os.Stat(pathToMachine); !os.IsNotExist(err) { t.Fatalf("Profile folder of profile \"%s\" was not deleted", profile.Name) } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")); len(files) != (numberOfProfileDirs - 1) { t.Fatal("Did not delete exactly one profile") } - if files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")); len(files) != (numberOfMachineDirs - 1) { + if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } } @@ -422,15 +422,15 @@ func TestDeleteAllProfiles(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs := len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) if numberOfTotalProfileDirs != numberOfProfileDirs { @@ -458,10 +458,10 @@ func TestDeleteAllProfiles(t *testing.T) { t.Errorf("errors while deleting all profiles: %v", errs) } - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "profiles")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "profiles")) numberOfProfileDirs = len(files) - files, _ = ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ = ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs = len(files) if numberOfProfileDirs != 0 { diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go index e674bfe095..8a24b04e3c 100644 --- a/pkg/minikube/cluster/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -22,7 +22,7 @@ import ( "github.com/docker/machine/libmachine/host" "github.com/pkg/errors" - "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/localpath" "k8s.io/minikube/pkg/minikube/machine" ) @@ -103,7 +103,7 @@ func LoadMachine(name string) (*Machine, error) { } func machineDirs(miniHome ...string) (dirs []string, err error) { - miniPath := constants.GetMinipath() + miniPath := localpath.MiniPath() if len(miniHome) > 0 { miniPath = miniHome[0] } @@ -119,7 +119,7 @@ func machineDirs(miniHome ...string) (dirs []string, err error) { // MachinePath returns the Minikube machine path of a machine func MachinePath(machine string, miniHome ...string) string { - miniPath := constants.GetMinipath() + miniPath := localpath.MiniPath() if len(miniHome) > 0 { miniPath = miniHome[0] } diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index 5a9e2c7107..7c6d6e7262 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "k8s.io/minikube/pkg/minikube/constants" + "k8s.io/minikube/pkg/minikube/localpath" ) func TestListMachines(t *testing.T) { @@ -39,12 +39,12 @@ func TestListMachines(t *testing.T) { t.Errorf("error getting dir path for %s : %v", testMinikubeDir, err) } - err = os.Setenv(constants.MinikubeHome, miniDir) + err = os.Setenv(localpath.MinikubeHome, miniDir) if err != nil { - t.Errorf("error setting up test environment. could not set %s", constants.MinikubeHome) + t.Errorf("error setting up test environment. could not set %s", localpath.MinikubeHome) } - files, _ := ioutil.ReadDir(filepath.Join(constants.GetMinipath(), "machines")) + files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) validMachines, inValidMachines, err := ListMachines() diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json deleted file mode 100644 index 90a026a01c..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.50", - "MachineName": "p1", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p1" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json deleted file mode 100644 index a9e6592c7a..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.52", - "MachineName": "p2_empty_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p2_empty_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json deleted file mode 100644 index 8d23c98dc6..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.53", - "MachineName": "p3_invalid_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p3_invalid_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json deleted file mode 100644 index 14b416d3c2..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.54", - "MachineName": "p4_partial_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p4_partial_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json deleted file mode 100644 index 581f9e648f..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json deleted file mode 100644 index d4525a7861..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, -} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json deleted file mode 100644 index 00655266e6..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.50", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json deleted file mode 100644 index 9e2e347718..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json deleted file mode 100644 index 29f62c0149..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "XhyveDiskDriver": "ahci-hd", - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json deleted file mode 100644 index 1e0980752a..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.55", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json deleted file mode 100644 index a1557f6df1..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.57", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json deleted file mode 100644 index ea47981d29..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.59", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json deleted file mode 100644 index 789b9b5557..0000000000 --- a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.60", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json deleted file mode 100644 index 90a026a01c..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.50", - "MachineName": "p1", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p1" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json deleted file mode 100644 index a9e6592c7a..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.52", - "MachineName": "p2_empty_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p2_empty_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json deleted file mode 100644 index 8d23c98dc6..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.53", - "MachineName": "p3_invalid_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p3_invalid_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json deleted file mode 100644 index 14b416d3c2..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "IPAddress": "192.168.64.54", - "MachineName": "p4_partial_profile_config", - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "DriverName": "hyperkit", - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", - "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", - "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, - "Name": "p4_partial_profile_config" -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json deleted file mode 100644 index 581f9e648f..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json deleted file mode 100644 index d4525a7861..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "ConfigVersion": 3, - "Driver": { - "SSHUser": "docker", - "SSHPort": 22, - "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", - "StorePath": "/Users/someuser/.minikube", - "SwarmMaster": false, - "SwarmHost": "", - "SwarmDiscovery": "", - "DiskSize": 20000, - "CPU": 2, - "Memory": 2000, - "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", - "NFSShares": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", - "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", - "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", - "Initrd": "initrd", - "Vmlinuz": "bzImage" - }, - "HostOptions": { - "Driver": "", - "Memory": 0, - "Disk": 0, - "EngineOptions": { - "ArbitraryFlags": null, - "Dns": null, - "GraphDir": "", - "Env": null, - "Ipv6": false, - "InsecureRegistry": [ - "10.96.0.0/12" - ], - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsVerify": false, - "RegistryMirror": null, - "InstallURL": "" - }, - "SwarmOptions": { - "IsSwarm": false, - "Address": "", - "Discovery": "", - "Agent": false, - "Master": false, - "Host": "tcp://0.0.0.0:3376", - "Image": "swarm:latest", - "Strategy": "spread", - "Heartbeat": 0, - "Overcommit": 0, - "ArbitraryFlags": null, - "ArbitraryJoinFlags": null, - "Env": null, - "IsExperimental": false - }, - "AuthOptions": { - "CertDir": "/Users/someuser/.minikube", - "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", - "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", - "CaCertRemotePath": "", - "ServerCertRemotePath": "", - "ServerKeyRemotePath": "", - "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", - "ServerCertSANs": null, - "StorePath": "/Users/someuser/.minikube" - } - }, -} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json deleted file mode 100644 index 00655266e6..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.50", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json deleted file mode 100644 index 9e2e347718..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json +++ /dev/null @@ -1 +0,0 @@ -invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json deleted file mode 100644 index 29f62c0149..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "XhyveDiskDriver": "ahci-hd", - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json deleted file mode 100644 index 1e0980752a..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.55", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json deleted file mode 100644 index a1557f6df1..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.57", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json deleted file mode 100644 index ea47981d29..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.59", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json deleted file mode 100644 index 789b9b5557..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "MachineConfig": { - "KeepContext": false, - "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", - "Memory": 2000, - "CPUs": 2, - "DiskSize": 20000, - "VMDriver": "hyperkit", - "ContainerRuntime": "docker", - "HyperkitVpnKitSock": "", - "HyperkitVSockPorts": [], - "DockerEnv": null, - "InsecureRegistry": null, - "RegistryMirror": null, - "HostOnlyCIDR": "192.168.99.1/24", - "HypervVirtualSwitch": "", - "KVMNetwork": "default", - "KVMQemuURI": "qemu:///system", - "KVMGPU": false, - "KVMHidden": false, - "DockerOpt": null, - "DisableDriverMounts": false, - "NFSShare": [], - "NFSSharesRoot": "/nfsshares", - "UUID": "", - "NoVTXCheck": false, - "DNSProxy": false, - "HostDNSResolver": true - }, - "KubernetesConfig": { - "KubernetesVersion": "v1.15.0", - "NodeIP": "192.168.64.60", - "NodePort": 8443, - "NodeName": "minikube", - "APIServerName": "minikubeCA", - "APIServerNames": null, - "APIServerIPs": null, - "DNSDomain": "cluster.local", - "ContainerRuntime": "docker", - "CRISocket": "", - "NetworkPlugin": "", - "FeatureGates": "", - "ServiceCIDR": "10.96.0.0/12", - "ImageRepository": "", - "ExtraOptions": null, - "ShouldLoadCachedImages": true, - "EnableDefaultCNI": false - } -} From 02bea609cfa87e398384426f95e977ff59393a27 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 21 Sep 2019 14:45:48 +0200 Subject: [PATCH 048/106] Readded testdata --- .../.minikube/machines/p1/config.json | 80 +++++++++++++++++++ .../p2_empty_profile_config/config.json | 80 +++++++++++++++++++ .../p3_invalid_profile_config/config.json | 80 +++++++++++++++++++ .../p4_partial_profile_config/config.json | 80 +++++++++++++++++++ .../p6_empty_machine_config/config.json | 0 .../p7_invalid_machine_config/config.json | 1 + .../p8_partial_machine_config/config.json | 72 +++++++++++++++++ .../.minikube/profiles/p1/config.json | 49 ++++++++++++ .../p2_empty_profile_config/config.json | 0 .../p3_invalid_profile_config/config.json | 1 + .../p4_partial_profile_config/config.json | 47 +++++++++++ .../p5_missing_machine_config/config.json | 49 ++++++++++++ .../p6_empty_machine_config/config.json | 49 ++++++++++++ .../p7_invalid_machine_config/config.json | 49 ++++++++++++ .../p8_partial_machine_config/config.json | 49 ++++++++++++ .../delete-single/.minikube/certs/ca-key.pem | 27 +++++++ .../delete-single/.minikube/certs/ca.pem | 18 +++++ .../delete-single/.minikube/certs/cert.pem | 18 +++++ .../delete-single/.minikube/certs/key.pem | 27 +++++++ 19 files changed, 776 insertions(+) create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json new file mode 100644 index 0000000000..90a026a01c --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p1/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p1", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p1" +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json new file mode 100644 index 0000000000..a9e6592c7a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p2_empty_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.52", + "MachineName": "p2_empty_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p2_empty_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json new file mode 100644 index 0000000000..8d23c98dc6 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p3_invalid_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.53", + "MachineName": "p3_invalid_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p3_invalid_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json new file mode 100644 index 0000000000..14b416d3c2 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p4_partial_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.54", + "MachineName": "p4_partial_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p4_partial_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p6_empty_machine_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p7_invalid_machine_config/config.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json new file mode 100644 index 0000000000..d4525a7861 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/machines/p8_partial_machine_config/config.json @@ -0,0 +1,72 @@ +{ + "ConfigVersion": 3, + "Driver": { + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, +} diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json new file mode 100644 index 0000000000..00655266e6 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p1/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.50", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p2_empty_profile_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json new file mode 100644 index 0000000000..9e2e347718 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p3_invalid_profile_config/config.json @@ -0,0 +1 @@ +invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json new file mode 100644 index 0000000000..29f62c0149 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p4_partial_profile_config/config.json @@ -0,0 +1,47 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "XhyveDiskDriver": "ahci-hd", + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json new file mode 100644 index 0000000000..1e0980752a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p5_missing_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.55", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json new file mode 100644 index 0000000000..a1557f6df1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p6_empty_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.57", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json new file mode 100644 index 0000000000..ea47981d29 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p7_invalid_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.59", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json new file mode 100644 index 0000000000..789b9b5557 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-all/.minikube/profiles/p8_partial_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.60", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem new file mode 100644 index 0000000000..441bc472fc --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEogIBAAKCAQEA1B/BgbWm6z9UdvzyiFnh0u6aH33VjqYpVfkYQoM71LnOV1yW +XeUTs691ojgXJn9WC+ztD3wxTZnRFoVPOI+gdT/oQZp7LL42HGGNVeyGqTjhEtAn +uMK3BXRQwMfJstX7zRDAyk3xzljEeUa8N/N1hTNiKTQ0G1StnN7q/ZM50jUO0C0V +NeU3a0FHxWFZzuaz5TwTfRpSFG9+v7mTPsWlIVzG3HU3UWwMsp2YQlnlwN/jM4qI +BMobLBVgcRCZit9ZIxCgzVElDoTctFj4CaNB5bhylD4rLCUiJ3Bt0KPqk7XlrZbk +9DLvJox131VSXHgseMKDo+p9Ez/Y9sQw5zP+gwIDAQABAoIBABNC+vBLTWfpLUNM +vr0w5DeiIO6hH4Y/gltjLhfEEOfFI359Us4d4gcb9KORUlDVmTul/PS+A0AXqovP ++RyatihPcEicvXiXoRQ8q3fU7XlqR83Mhv7Y94OQR1DqE1+g3KeHUOpN35osJ1MX +4Dl4awB4ZP521hBxRP6Mo2v5NXPn4P1G47bxE+aZJ1i7wXlgswcVZvEPxWHVCRGx +94tV2AdCcggWsXHN1omFFCRDoCo7e4EiLkral2r3pD0qq0tI/6Zy4AC/Y6xhCMlj +Ovu/kE+r40Rtak4fhyUnEIi32PmQUUxBUN8o2z+m3qznQDRJlg0IBXwZI5XBycTA +V2YaewkCgYEA1PIjstthnp6YdeWmJ/sEexflfUO+jsg6FNBnITUbOXfQ1tOKJs44 +FXpIJQ7BLWalW0VeQJnaPOoS871YovHK85h0N68q5quDKCkVMLTkFyfPc9quJKLW +LGSrA6pNj7Ez1BEf2Z2r3TI0TIWWJ48d3hf2LHdmTzBGSbsuTc+XaJcCgYEA/wMU +kbk/op8Z35n+o02o/ZNf4KsRPJUbLVWH/hdfKp1aJz84AC/zd5H/8d/vxSKJF9eP +HbBUeb5qN9dXaT4riwiskOHzStQzFS/v1agtl3ArB769CKoCYF+FB7vk+QtRzv6m +DrdJaGYULdWOQEm6DLTEJRiHdlVX9hvKXNBhCvUCgYBEElujE0ozgJNQLOdepHmc +N9len8dMsWkPukcdcHKRfmG+KsVg/k8jXoGthvft4YA+mwA0OnpvOoxwajjpbc3o +7PVJz68xKea1cdyaQ1kepdVFPcSpZXx9mHiqpUhCBO2Cfy7lS+fiv+fEBngnkTKF +CrfhIxILgm0VqMZ2jUPjZQKBgDXWZKVPQswGYuP+EvBPGPpP/tHjy8PKhu5PPGK8 +dG7+wWW/xwbjGLeJr0tVR72KyP6rl59g9rStKqeXYvDpGzBDKIt96GtH2XEDqdKl +qtpp5+u+rRIDMnU+NUuos3KQnTjiMhSxRWIxCtmSWHHiHtFH6JEcWJz275cZzuNB +avtxAoGAAZ3JVCfOtMv2zVs4cG4QiC24nHhx5JjZDWXNrjJQywpXb0uBorHjBwS9 +4k1NBcPcYdU5PYopkeQefkxHLI0LvzpfJXOq1BamadMbiJGwArZc5pHlgnZ6PylS +WvE3WoQMgaY9szU1AMZudoylGnJByKNC3w3wdm4/YB2TSfJcd1M= +-----END RSA PRIVATE KEY----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem new file mode 100644 index 0000000000..df3eece0cf --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC3DCCAcSgAwIBAgIRAPwzER0vgZZZ/QdTg3sTODowDQYJKoZIhvcNAQELBQAw +FzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MB4XDTE5MDcwNzE0MTMwMFoXDTIyMDYy +MTE0MTMwMFowFzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MIIBIjANBgkqhkiG9w0B +AQEFAAOCAQ8AMIIBCgKCAQEA1B/BgbWm6z9UdvzyiFnh0u6aH33VjqYpVfkYQoM7 +1LnOV1yWXeUTs691ojgXJn9WC+ztD3wxTZnRFoVPOI+gdT/oQZp7LL42HGGNVeyG +qTjhEtAnuMK3BXRQwMfJstX7zRDAyk3xzljEeUa8N/N1hTNiKTQ0G1StnN7q/ZM5 +0jUO0C0VNeU3a0FHxWFZzuaz5TwTfRpSFG9+v7mTPsWlIVzG3HU3UWwMsp2YQlnl +wN/jM4qIBMobLBVgcRCZit9ZIxCgzVElDoTctFj4CaNB5bhylD4rLCUiJ3Bt0KPq +k7XlrZbk9DLvJox131VSXHgseMKDo+p9Ez/Y9sQw5zP+gwIDAQABoyMwITAOBgNV +HQ8BAf8EBAMCAqwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA +OP+dMVX9Jxu1XzbtfpKKfuu7zspeQGctrUXtQMQ6CcYPTanrtZP8toxuF6C+Etvx +Xz0GBImMcPhvH2SjU39PPTdHolhAoDXbVDV3P9RAHKiK1r5bUoTyJVZCSO4YRqI3 +ykhAM0qPF9pt3IZJEWW5QK+IC96jLNVSos7oAs05bdedsl9WiIp4xAPpTvtJo+JR +0pOWAEfJBeIhiaSDYyZzF//wmtbjPe5Atz6zmAQNVYk64UqhKpyZ5CR4MHsAUa+E +r81A548vbOw6HG9adfmvzhBbocRBIoqUIEPGky7nYVFAgUpf1lDyovy6QNDRuyRb +YOYsH41aipc56Hbm3prb+g== +-----END CERTIFICATE----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem new file mode 100644 index 0000000000..e7f152a07e --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE----- +MIIC+jCCAeKgAwIBAgIRAJA5fD0w22hA22aKxvTXmZcwDQYJKoZIhvcNAQELBQAw +FzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MB4XDTE5MDcwNzE0MTMwMFoXDTIyMDYy +MTE0MTMwMFowIzEhMB8GA1UECgwYbWFyZWtzY2h3YXJ6Ljxib290c3RyYXA+MIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1uJIfWVJQ5P+050xzTwZtU8y +VU5Izsb+guJOgfrMxgTwRxSOkuJEW+sWpZVPY9KJ9EqDHIK1V4Vi5WoeuTwYj17Q +/6mTaAG7rVpsG2FU5LzjP8Jhn9XRaKtKjYIy200Rn0i2djkOger0hudRx1utNXkw +tc3N7EpWMTJ/5KeR+lKJn3JdgLTVn/NAbXYK08eghoJ8qogl6kkCuzKWOtTPu5ab +LrGO40VF8n0wz7UE4GVO60l9M/4yCrG7nYV5glSZzbeiEzF1GGh4FgRalIyEbnTc +APqqVwTxqnzsU+bfjYOGIjc3ZooPcJyAml4nX6NUAtlJvPo2p0I8jDOeY/+MawID +AQABozUwMzAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDAYD +VR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAcaY46IMMeIh7NjIm2Ke01K9l +kuW8Br8LitNNTBQn9D5jrQwTYhmyPpkQxQaepIGNFYDju6DI9r1uQ/PaB+kstw/3 +sgIMgA8yaqvW0HCYQZD4fOq7Zfzx7max1eb8S+666yNuAxRmLBuw+/uv+RVkA3tl +ALx0t+dqTJ0q7STtcroTL9hB3BIwt3x1sS4v3NJJwxf6/V1pmIvaqVEgLj0FqVoQ +zbsgYHJoxJw6Rvfgz7X+EsZCiLzbl4JoXMjMIg06g7vKVOknamTruUe/1O9tRxRk +gjFZ6K4NvaSBB2ASnSaJK3ixHbxlmpu+NCOal0rd5ZUL5Ud87JlGR3F92+8doA== +-----END CERTIFICATE----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem new file mode 100644 index 0000000000..cd0043ac2c --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA1uJIfWVJQ5P+050xzTwZtU8yVU5Izsb+guJOgfrMxgTwRxSO +kuJEW+sWpZVPY9KJ9EqDHIK1V4Vi5WoeuTwYj17Q/6mTaAG7rVpsG2FU5LzjP8Jh +n9XRaKtKjYIy200Rn0i2djkOger0hudRx1utNXkwtc3N7EpWMTJ/5KeR+lKJn3Jd +gLTVn/NAbXYK08eghoJ8qogl6kkCuzKWOtTPu5abLrGO40VF8n0wz7UE4GVO60l9 +M/4yCrG7nYV5glSZzbeiEzF1GGh4FgRalIyEbnTcAPqqVwTxqnzsU+bfjYOGIjc3 +ZooPcJyAml4nX6NUAtlJvPo2p0I8jDOeY/+MawIDAQABAoIBAEz1B38ZOi7gnt/M +qVxWTOK5NU6F1d9wNxBK2lEEsDeu5xqdyx3huReuTxMIMUGP0mZSFTituyJYG/4L +jmtKkYUvMOyPH8Kc9Ej2XEdGCXBOEZjxFaN3oSK6Td32Jh6SMGB6WxZmAsMWkXKK +/6fFNngzKfXCeiBI0yuVaWZLeSVLqAhkX6u+DPjkPLHZUaSabPgh15W7Edc643/2 +uKg2pKa+MJL7KftktjruS/fSwU6bHUmklJj1IZPIKf3NNXkrER5lQ8F9zFU5Ahcx +BD6LyHahmC894VL8hJlrBn7kbYNX1rISMtnSbnXZUhakmNqoYkpor9h0Lg97v/SD +nYKCABECgYEA50K0akS4LErSwd2n787aKOkIJ1Jm/PbNRfUKxei7FSVknTej1EpJ +8ivUGb3qJ4MKl3mbnDAQj7uNVlyi2YKFA83excHud4H3M6flg1vTbh5KjyEZoahX +aExlURDgENYGqj1d7IvxeaPp7h5pm2Y4ATL7ccGnc6wY9zdvc3k3WQMCgYEA7d8W +iWbVPxOP7POKDQmHlsJ6Cr6YKS1IbCwflUJ02+SIGZc/rDzf9GAuykhJhvRyDEgt +4b2BFLmvcQAxdVZrB8x+DruLi97JDhEuGxngotin4B8xpFaz/4OB8MYyKKBUAvQC +ww+A0MgyABFoTx71c4ZJpX3IVZY34auXXzytfnkCgYEA0hTPrkX1BQ+Hu+NvHrNL +jaR76rS5qA1P1sBO5BCSexg3+XZFFqHR4PQdvrC+mNw67/Xh/ZXQRbH8KDsJGQyv +ZxBK0l1lEx12gm+AWL8/J6bO1o0cKrWxiab01xq8Ya776QTMYQmT+IuGA/GOwEOw +lq5Iq0Nfqf3pxBKQ5VZ1iB8CgYEAzAAQJuR/K+pN+6vdkFLE6uF8ouxUOLQyMTsi +FvL4n4D9y9yv6boHY2B9oFOgY1IO4UOhvcC1DB43PRUqVXQ4tGaHEYF8Kwd0rFDF +ls55nY9rYcW+4C7Pjemtrd18NOVTR3kXSUxpcCTQ5MgJChoF7P6U+I3IGsaKxEpR +toamUBkCgYAlB3eT1EQMJd99qJsP/WSQW1ydtithyY3a8Iwv/M6+ITQDbdoprW1J +tCLVpyDzos8EKkqSEULmcfoQzTaMiPPFJJ08LX0JX9B8q1wlN3ReZNccUhQH4vaC +X5eFyKNxrz9tb1uQmUkifFH44XiKBjyijM1jFqYxlxAUUrAodt1o8Q== +-----END RSA PRIVATE KEY----- From 42c017f5d6839e281a3702db5b1af85250b14e5c Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 21 Sep 2019 14:47:02 +0200 Subject: [PATCH 049/106] Readded testdata --- .../.minikube/machines/p1/config.json | 80 +++++++++++++++++++ .../p2_empty_profile_config/config.json | 80 +++++++++++++++++++ .../p3_invalid_profile_config/config.json | 80 +++++++++++++++++++ .../p4_partial_profile_config/config.json | 80 +++++++++++++++++++ .../p6_empty_machine_config/config.json | 0 .../p7_invalid_machine_config/config.json | 1 + .../p8_partial_machine_config/config.json | 72 +++++++++++++++++ .../.minikube/profiles/p1/config.json | 49 ++++++++++++ .../p2_empty_profile_config/config.json | 0 .../p3_invalid_profile_config/config.json | 1 + .../p4_partial_profile_config/config.json | 47 +++++++++++ .../p5_missing_machine_config/config.json | 49 ++++++++++++ .../p6_empty_machine_config/config.json | 49 ++++++++++++ .../p7_invalid_machine_config/config.json | 49 ++++++++++++ .../p8_partial_machine_config/config.json | 49 ++++++++++++ 15 files changed, 686 insertions(+) create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json create mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json new file mode 100644 index 0000000000..90a026a01c --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p1/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.50", + "MachineName": "p1", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p1/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p1", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "5e6787b6-aecb-11e9-81cf-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p1/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p1" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json new file mode 100644 index 0000000000..a9e6592c7a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p2_empty_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.52", + "MachineName": "p2_empty_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p2_empty_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p2_empty_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "ddd37c1c-aedf-11e9-afa7-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p2_empty_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p2_empty_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json new file mode 100644 index 0000000000..8d23c98dc6 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p3_invalid_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.53", + "MachineName": "p3_invalid_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p3_invalid_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "759044c8-aee4-11e9-bd0a-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p3_invalid_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p3_invalid_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json new file mode 100644 index 0000000000..14b416d3c2 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p4_partial_profile_config/config.json @@ -0,0 +1,80 @@ +{ + "ConfigVersion": 3, + "Driver": { + "IPAddress": "192.168.64.54", + "MachineName": "p4_partial_profile_config", + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p4_partial_profile_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "Boot2DockerURL": "file:///Users/someuser/.minikube/cache/iso/minikube-v1.2.0.iso", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p4_partial_profile_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "faf8face-aee4-11e9-9ba1-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p4_partial_profile_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "DriverName": "hyperkit", + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertPath": "/Users/someuser/.minikube/machines/server.pem", + "ServerKeyPath": "/Users/someuser/.minikube/machines/server-key.pem", + "ClientKeyPath": "/Users/someuser/.minikube/certs/key.pem", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, + "Name": "p4_partial_profile_config" +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p6_empty_machine_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json new file mode 100644 index 0000000000..581f9e648f --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p7_invalid_machine_config/config.json @@ -0,0 +1 @@ +invalid json file :) diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json new file mode 100644 index 0000000000..d4525a7861 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/machines/p8_partial_machine_config/config.json @@ -0,0 +1,72 @@ +{ + "ConfigVersion": 3, + "Driver": { + "SSHUser": "docker", + "SSHPort": 22, + "SSHKeyPath": "/Users/someuser/.minikube/machines/p8_partial_machine_config/id_rsa", + "StorePath": "/Users/someuser/.minikube", + "SwarmMaster": false, + "SwarmHost": "", + "SwarmDiscovery": "", + "DiskSize": 20000, + "CPU": 2, + "Memory": 2000, + "Cmdline": "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=p8_partial_machine_config", + "NFSShares": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "4f16872c-aee8-11e9-8815-8c8590c3b8b4", + "BootKernel": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/bzImage", + "BootInitrd": "/Users/someuser/.minikube/machines/p8_partial_machine_config/b2d-image/boot/initrd", + "Initrd": "initrd", + "Vmlinuz": "bzImage" + }, + "HostOptions": { + "Driver": "", + "Memory": 0, + "Disk": 0, + "EngineOptions": { + "ArbitraryFlags": null, + "Dns": null, + "GraphDir": "", + "Env": null, + "Ipv6": false, + "InsecureRegistry": [ + "10.96.0.0/12" + ], + "Labels": null, + "LogLevel": "", + "StorageDriver": "", + "SelinuxEnabled": false, + "TlsVerify": false, + "RegistryMirror": null, + "InstallURL": "" + }, + "SwarmOptions": { + "IsSwarm": false, + "Address": "", + "Discovery": "", + "Agent": false, + "Master": false, + "Host": "tcp://0.0.0.0:3376", + "Image": "swarm:latest", + "Strategy": "spread", + "Heartbeat": 0, + "Overcommit": 0, + "ArbitraryFlags": null, + "ArbitraryJoinFlags": null, + "Env": null, + "IsExperimental": false + }, + "AuthOptions": { + "CertDir": "/Users/someuser/.minikube", + "CaCertPath": "/Users/someuser/.minikube/certs/ca.pem", + "CaPrivateKeyPath": "/Users/someuser/.minikube/certs/ca-key.pem", + "CaCertRemotePath": "", + "ServerCertRemotePath": "", + "ServerKeyRemotePath": "", + "ClientCertPath": "/Users/someuser/.minikube/certs/cert.pem", + "ServerCertSANs": null, + "StorePath": "/Users/someuser/.minikube" + } + }, +} diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json new file mode 100644 index 0000000000..00655266e6 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p1/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.50", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p2_empty_profile_config/config.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json new file mode 100644 index 0000000000..9e2e347718 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p3_invalid_profile_config/config.json @@ -0,0 +1 @@ +invalid json file :) \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json new file mode 100644 index 0000000000..29f62c0149 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p4_partial_profile_config/config.json @@ -0,0 +1,47 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "XhyveDiskDriver": "ahci-hd", + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json new file mode 100644 index 0000000000..1e0980752a --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p5_missing_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.55", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json new file mode 100644 index 0000000000..a1557f6df1 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p6_empty_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.57", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json new file mode 100644 index 0000000000..ea47981d29 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p7_invalid_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.59", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} \ No newline at end of file diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json new file mode 100644 index 0000000000..789b9b5557 --- /dev/null +++ b/pkg/minikube/config/testdata/delete-single/.minikube/profiles/p8_partial_machine_config/config.json @@ -0,0 +1,49 @@ +{ + "MachineConfig": { + "KeepContext": false, + "MinikubeISO": "https://storage.googleapis.com/minikube/iso/minikube-v1.2.0.iso", + "Memory": 2000, + "CPUs": 2, + "DiskSize": 20000, + "VMDriver": "hyperkit", + "ContainerRuntime": "docker", + "HyperkitVpnKitSock": "", + "HyperkitVSockPorts": [], + "DockerEnv": null, + "InsecureRegistry": null, + "RegistryMirror": null, + "HostOnlyCIDR": "192.168.99.1/24", + "HypervVirtualSwitch": "", + "KVMNetwork": "default", + "KVMQemuURI": "qemu:///system", + "KVMGPU": false, + "KVMHidden": false, + "DockerOpt": null, + "DisableDriverMounts": false, + "NFSShare": [], + "NFSSharesRoot": "/nfsshares", + "UUID": "", + "NoVTXCheck": false, + "DNSProxy": false, + "HostDNSResolver": true + }, + "KubernetesConfig": { + "KubernetesVersion": "v1.15.0", + "NodeIP": "192.168.64.60", + "NodePort": 8443, + "NodeName": "minikube", + "APIServerName": "minikubeCA", + "APIServerNames": null, + "APIServerIPs": null, + "DNSDomain": "cluster.local", + "ContainerRuntime": "docker", + "CRISocket": "", + "NetworkPlugin": "", + "FeatureGates": "", + "ServiceCIDR": "10.96.0.0/12", + "ImageRepository": "", + "ExtraOptions": null, + "ShouldLoadCachedImages": true, + "EnableDefaultCNI": false + } +} From 5cabb01a4f0cf946c8ce30437974516c2786b7a1 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 21 Sep 2019 14:55:24 +0200 Subject: [PATCH 050/106] Removed certs --- .../delete-single/.minikube/certs/ca-key.pem | 27 ------------------- .../delete-single/.minikube/certs/ca.pem | 18 ------------- .../delete-single/.minikube/certs/cert.pem | 18 ------------- .../delete-single/.minikube/certs/key.pem | 27 ------------------- 4 files changed, 90 deletions(-) delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem delete mode 100644 pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem deleted file mode 100644 index 441bc472fc..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEogIBAAKCAQEA1B/BgbWm6z9UdvzyiFnh0u6aH33VjqYpVfkYQoM71LnOV1yW -XeUTs691ojgXJn9WC+ztD3wxTZnRFoVPOI+gdT/oQZp7LL42HGGNVeyGqTjhEtAn -uMK3BXRQwMfJstX7zRDAyk3xzljEeUa8N/N1hTNiKTQ0G1StnN7q/ZM50jUO0C0V -NeU3a0FHxWFZzuaz5TwTfRpSFG9+v7mTPsWlIVzG3HU3UWwMsp2YQlnlwN/jM4qI -BMobLBVgcRCZit9ZIxCgzVElDoTctFj4CaNB5bhylD4rLCUiJ3Bt0KPqk7XlrZbk -9DLvJox131VSXHgseMKDo+p9Ez/Y9sQw5zP+gwIDAQABAoIBABNC+vBLTWfpLUNM -vr0w5DeiIO6hH4Y/gltjLhfEEOfFI359Us4d4gcb9KORUlDVmTul/PS+A0AXqovP -+RyatihPcEicvXiXoRQ8q3fU7XlqR83Mhv7Y94OQR1DqE1+g3KeHUOpN35osJ1MX -4Dl4awB4ZP521hBxRP6Mo2v5NXPn4P1G47bxE+aZJ1i7wXlgswcVZvEPxWHVCRGx -94tV2AdCcggWsXHN1omFFCRDoCo7e4EiLkral2r3pD0qq0tI/6Zy4AC/Y6xhCMlj -Ovu/kE+r40Rtak4fhyUnEIi32PmQUUxBUN8o2z+m3qznQDRJlg0IBXwZI5XBycTA -V2YaewkCgYEA1PIjstthnp6YdeWmJ/sEexflfUO+jsg6FNBnITUbOXfQ1tOKJs44 -FXpIJQ7BLWalW0VeQJnaPOoS871YovHK85h0N68q5quDKCkVMLTkFyfPc9quJKLW -LGSrA6pNj7Ez1BEf2Z2r3TI0TIWWJ48d3hf2LHdmTzBGSbsuTc+XaJcCgYEA/wMU -kbk/op8Z35n+o02o/ZNf4KsRPJUbLVWH/hdfKp1aJz84AC/zd5H/8d/vxSKJF9eP -HbBUeb5qN9dXaT4riwiskOHzStQzFS/v1agtl3ArB769CKoCYF+FB7vk+QtRzv6m -DrdJaGYULdWOQEm6DLTEJRiHdlVX9hvKXNBhCvUCgYBEElujE0ozgJNQLOdepHmc -N9len8dMsWkPukcdcHKRfmG+KsVg/k8jXoGthvft4YA+mwA0OnpvOoxwajjpbc3o -7PVJz68xKea1cdyaQ1kepdVFPcSpZXx9mHiqpUhCBO2Cfy7lS+fiv+fEBngnkTKF -CrfhIxILgm0VqMZ2jUPjZQKBgDXWZKVPQswGYuP+EvBPGPpP/tHjy8PKhu5PPGK8 -dG7+wWW/xwbjGLeJr0tVR72KyP6rl59g9rStKqeXYvDpGzBDKIt96GtH2XEDqdKl -qtpp5+u+rRIDMnU+NUuos3KQnTjiMhSxRWIxCtmSWHHiHtFH6JEcWJz275cZzuNB -avtxAoGAAZ3JVCfOtMv2zVs4cG4QiC24nHhx5JjZDWXNrjJQywpXb0uBorHjBwS9 -4k1NBcPcYdU5PYopkeQefkxHLI0LvzpfJXOq1BamadMbiJGwArZc5pHlgnZ6PylS -WvE3WoQMgaY9szU1AMZudoylGnJByKNC3w3wdm4/YB2TSfJcd1M= ------END RSA PRIVATE KEY----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem deleted file mode 100644 index df3eece0cf..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/certs/ca.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC3DCCAcSgAwIBAgIRAPwzER0vgZZZ/QdTg3sTODowDQYJKoZIhvcNAQELBQAw -FzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MB4XDTE5MDcwNzE0MTMwMFoXDTIyMDYy -MTE0MTMwMFowFzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEA1B/BgbWm6z9UdvzyiFnh0u6aH33VjqYpVfkYQoM7 -1LnOV1yWXeUTs691ojgXJn9WC+ztD3wxTZnRFoVPOI+gdT/oQZp7LL42HGGNVeyG -qTjhEtAnuMK3BXRQwMfJstX7zRDAyk3xzljEeUa8N/N1hTNiKTQ0G1StnN7q/ZM5 -0jUO0C0VNeU3a0FHxWFZzuaz5TwTfRpSFG9+v7mTPsWlIVzG3HU3UWwMsp2YQlnl -wN/jM4qIBMobLBVgcRCZit9ZIxCgzVElDoTctFj4CaNB5bhylD4rLCUiJ3Bt0KPq -k7XlrZbk9DLvJox131VSXHgseMKDo+p9Ez/Y9sQw5zP+gwIDAQABoyMwITAOBgNV -HQ8BAf8EBAMCAqwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA -OP+dMVX9Jxu1XzbtfpKKfuu7zspeQGctrUXtQMQ6CcYPTanrtZP8toxuF6C+Etvx -Xz0GBImMcPhvH2SjU39PPTdHolhAoDXbVDV3P9RAHKiK1r5bUoTyJVZCSO4YRqI3 -ykhAM0qPF9pt3IZJEWW5QK+IC96jLNVSos7oAs05bdedsl9WiIp4xAPpTvtJo+JR -0pOWAEfJBeIhiaSDYyZzF//wmtbjPe5Atz6zmAQNVYk64UqhKpyZ5CR4MHsAUa+E -r81A548vbOw6HG9adfmvzhBbocRBIoqUIEPGky7nYVFAgUpf1lDyovy6QNDRuyRb -YOYsH41aipc56Hbm3prb+g== ------END CERTIFICATE----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem deleted file mode 100644 index e7f152a07e..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/certs/cert.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC+jCCAeKgAwIBAgIRAJA5fD0w22hA22aKxvTXmZcwDQYJKoZIhvcNAQELBQAw -FzEVMBMGA1UEChMMbWFyZWtzY2h3YXJ6MB4XDTE5MDcwNzE0MTMwMFoXDTIyMDYy -MTE0MTMwMFowIzEhMB8GA1UECgwYbWFyZWtzY2h3YXJ6Ljxib290c3RyYXA+MIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1uJIfWVJQ5P+050xzTwZtU8y -VU5Izsb+guJOgfrMxgTwRxSOkuJEW+sWpZVPY9KJ9EqDHIK1V4Vi5WoeuTwYj17Q -/6mTaAG7rVpsG2FU5LzjP8Jhn9XRaKtKjYIy200Rn0i2djkOger0hudRx1utNXkw -tc3N7EpWMTJ/5KeR+lKJn3JdgLTVn/NAbXYK08eghoJ8qogl6kkCuzKWOtTPu5ab -LrGO40VF8n0wz7UE4GVO60l9M/4yCrG7nYV5glSZzbeiEzF1GGh4FgRalIyEbnTc -APqqVwTxqnzsU+bfjYOGIjc3ZooPcJyAml4nX6NUAtlJvPo2p0I8jDOeY/+MawID -AQABozUwMzAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDAYD -VR0TAQH/BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAcaY46IMMeIh7NjIm2Ke01K9l -kuW8Br8LitNNTBQn9D5jrQwTYhmyPpkQxQaepIGNFYDju6DI9r1uQ/PaB+kstw/3 -sgIMgA8yaqvW0HCYQZD4fOq7Zfzx7max1eb8S+666yNuAxRmLBuw+/uv+RVkA3tl -ALx0t+dqTJ0q7STtcroTL9hB3BIwt3x1sS4v3NJJwxf6/V1pmIvaqVEgLj0FqVoQ -zbsgYHJoxJw6Rvfgz7X+EsZCiLzbl4JoXMjMIg06g7vKVOknamTruUe/1O9tRxRk -gjFZ6K4NvaSBB2ASnSaJK3ixHbxlmpu+NCOal0rd5ZUL5Ud87JlGR3F92+8doA== ------END CERTIFICATE----- diff --git a/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem b/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem deleted file mode 100644 index cd0043ac2c..0000000000 --- a/pkg/minikube/config/testdata/delete-single/.minikube/certs/key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA1uJIfWVJQ5P+050xzTwZtU8yVU5Izsb+guJOgfrMxgTwRxSO -kuJEW+sWpZVPY9KJ9EqDHIK1V4Vi5WoeuTwYj17Q/6mTaAG7rVpsG2FU5LzjP8Jh -n9XRaKtKjYIy200Rn0i2djkOger0hudRx1utNXkwtc3N7EpWMTJ/5KeR+lKJn3Jd -gLTVn/NAbXYK08eghoJ8qogl6kkCuzKWOtTPu5abLrGO40VF8n0wz7UE4GVO60l9 -M/4yCrG7nYV5glSZzbeiEzF1GGh4FgRalIyEbnTcAPqqVwTxqnzsU+bfjYOGIjc3 -ZooPcJyAml4nX6NUAtlJvPo2p0I8jDOeY/+MawIDAQABAoIBAEz1B38ZOi7gnt/M -qVxWTOK5NU6F1d9wNxBK2lEEsDeu5xqdyx3huReuTxMIMUGP0mZSFTituyJYG/4L -jmtKkYUvMOyPH8Kc9Ej2XEdGCXBOEZjxFaN3oSK6Td32Jh6SMGB6WxZmAsMWkXKK -/6fFNngzKfXCeiBI0yuVaWZLeSVLqAhkX6u+DPjkPLHZUaSabPgh15W7Edc643/2 -uKg2pKa+MJL7KftktjruS/fSwU6bHUmklJj1IZPIKf3NNXkrER5lQ8F9zFU5Ahcx -BD6LyHahmC894VL8hJlrBn7kbYNX1rISMtnSbnXZUhakmNqoYkpor9h0Lg97v/SD -nYKCABECgYEA50K0akS4LErSwd2n787aKOkIJ1Jm/PbNRfUKxei7FSVknTej1EpJ -8ivUGb3qJ4MKl3mbnDAQj7uNVlyi2YKFA83excHud4H3M6flg1vTbh5KjyEZoahX -aExlURDgENYGqj1d7IvxeaPp7h5pm2Y4ATL7ccGnc6wY9zdvc3k3WQMCgYEA7d8W -iWbVPxOP7POKDQmHlsJ6Cr6YKS1IbCwflUJ02+SIGZc/rDzf9GAuykhJhvRyDEgt -4b2BFLmvcQAxdVZrB8x+DruLi97JDhEuGxngotin4B8xpFaz/4OB8MYyKKBUAvQC -ww+A0MgyABFoTx71c4ZJpX3IVZY34auXXzytfnkCgYEA0hTPrkX1BQ+Hu+NvHrNL -jaR76rS5qA1P1sBO5BCSexg3+XZFFqHR4PQdvrC+mNw67/Xh/ZXQRbH8KDsJGQyv -ZxBK0l1lEx12gm+AWL8/J6bO1o0cKrWxiab01xq8Ya776QTMYQmT+IuGA/GOwEOw -lq5Iq0Nfqf3pxBKQ5VZ1iB8CgYEAzAAQJuR/K+pN+6vdkFLE6uF8ouxUOLQyMTsi -FvL4n4D9y9yv6boHY2B9oFOgY1IO4UOhvcC1DB43PRUqVXQ4tGaHEYF8Kwd0rFDF -ls55nY9rYcW+4C7Pjemtrd18NOVTR3kXSUxpcCTQ5MgJChoF7P6U+I3IGsaKxEpR -toamUBkCgYAlB3eT1EQMJd99qJsP/WSQW1ydtithyY3a8Iwv/M6+ITQDbdoprW1J -tCLVpyDzos8EKkqSEULmcfoQzTaMiPPFJJ08LX0JX9B8q1wlN3ReZNccUhQH4vaC -X5eFyKNxrz9tb1uQmUkifFH44XiKBjyijM1jFqYxlxAUUrAodt1o8Q== ------END RSA PRIVATE KEY----- From d52730a54f5f875ebd6ca74bea0ca0b8b00070ad Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Sat, 21 Sep 2019 23:32:30 +0200 Subject: [PATCH 051/106] Fixed test errors --- cmd/minikube/cmd/delete_test.go | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cmd/minikube/cmd/delete_test.go b/cmd/minikube/cmd/delete_test.go index b5304c7852..042b86dd4c 100644 --- a/cmd/minikube/cmd/delete_test.go +++ b/cmd/minikube/cmd/delete_test.go @@ -22,6 +22,7 @@ import ( "path/filepath" "testing" + "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/cluster" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/localpath" @@ -73,6 +74,8 @@ func TestDeleteProfileWithValidConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { @@ -121,6 +124,8 @@ func TestDeleteProfileWithEmptyProfileConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { @@ -169,6 +174,8 @@ func TestDeleteProfileWithInvalidProfileConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { @@ -217,6 +224,8 @@ func TestDeleteProfileWithPartialProfileConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { @@ -265,6 +274,8 @@ func TestDeleteProfileWithMissingMachineConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != numberOfMachineDirs { t.Fatal("Deleted a machine config when it should not") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { @@ -313,6 +324,8 @@ func TestDeleteProfileWithEmptyMachineConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { @@ -361,6 +374,8 @@ func TestDeleteProfileWithInvalidMachineConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { @@ -409,6 +424,8 @@ func TestDeleteProfileWithPartialMachineConfig(t *testing.T) { if files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")); len(files) != (numberOfMachineDirs - 1) { t.Fatal("Did not delete exactly one profile") } + + viper.Set(config.MachineProfile, "") } func TestDeleteAllProfiles(t *testing.T) { @@ -471,4 +488,6 @@ func TestDeleteAllProfiles(t *testing.T) { if numberOfMachineDirs != 0 { t.Errorf("Did not delete all profiles: still %d machines left", numberOfMachineDirs) } + + viper.Set(config.MachineProfile, "") } From 6ef1ee3e17677733d9db19cf35c303c64bae59d6 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Tue, 1 Oct 2019 23:45:22 +1000 Subject: [PATCH 052/106] improve test coverage in machine --- pkg/minikube/machine/cache_binaries_test.go | 189 ++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 pkg/minikube/machine/cache_binaries_test.go diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go new file mode 100644 index 0000000000..484ce95251 --- /dev/null +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -0,0 +1,189 @@ +package machine + +import ( + "fmt" + "io/ioutil" + "os" + "runtime" + "testing" + + "k8s.io/minikube/pkg/minikube/assets" + "k8s.io/minikube/pkg/minikube/bootstrapper" + "k8s.io/minikube/pkg/minikube/command" +) + +type copyFailRunner struct { + command.Runner +} + +func (copyFailRunner) Copy(a assets.CopyableFile) error { + return fmt.Errorf("test error during copy file") +} + +func TestCopyBinary(t *testing.T) { + + fakeCommandRunnerCopyFail := func() command.Runner { + r := command.NewFakeCommandRunner() + return copyFailRunner{r} + } + + var tc = []struct { + lastUpdateCheckFilePath string + src, dst, desc string + err bool + runner command.Runner + }{ + { + desc: "not existing src", + dst: "/tmp/testCopyBinary1", + src: "/tmp/testCopyBinary2", + err: true, + runner: command.NewFakeCommandRunner(), + }, + { + desc: "src /etc/hosts", + dst: "/tmp/testCopyBinary1", + src: "/etc/hosts", + err: false, + runner: command.NewFakeCommandRunner(), + }, + { + desc: "existing src, dst without permissions", + dst: "/etc/passwd", + src: "/etc/hosts", + err: true, + runner: fakeCommandRunnerCopyFail(), + }, + } + for _, test := range tc { + t.Run(test.desc, func(t *testing.T) { + err := CopyBinary(test.runner, test.src, test.dst) + if err != nil && !test.err { + t.Fatalf("Error %v expected but not occured", err) + } + if err == nil && test.err { + t.Fatal("Unexpected error") + } + }) + } +} + +func TestCacheBinariesForBootstrapper(t *testing.T) { + var tc = []struct { + version, clusterBootstrapper string + err bool + }{ + { + version: "v1.16.0", + clusterBootstrapper: bootstrapper.BootstrapperTypeKubeadm, + }, + { + version: "invalid version", + clusterBootstrapper: bootstrapper.BootstrapperTypeKubeadm, + err: true, + }, + } + for _, test := range tc { + t.Run(test.version, func(t *testing.T) { + err := CacheBinariesForBootstrapper(test.version, test.clusterBootstrapper) + if err != nil && !test.err { + t.Fatalf("Got unexpected error %v", err) + } + if err == nil && test.err { + t.Fatalf("Expected error but got %v", err) + } + }) + } +} +func TestCacheBinary(t *testing.T) { + oldMinikubeHome := os.Getenv("MINIKUBE_HOME") + defer os.Setenv("MINIKUBE_HOME", oldMinikubeHome) + + minikubeHome, err := ioutil.TempDir("/tmp", "") + if err != nil { + t.Fatalf("error during creating tmp dir: %v", err) + } + defer os.RemoveAll(minikubeHome) + + var tc = []struct { + desc, version, osName, archName string + minikubeHome, binary, description string + err bool + }{ + { + desc: "ok kubeadm", + version: "v1.16.0", + osName: runtime.GOOS, + archName: runtime.GOARCH, + binary: "kubeadm", + err: false, + minikubeHome: minikubeHome, + }, + { + desc: "minikube home is dev/null", + version: "v1.16.0", + osName: runtime.GOOS, + archName: "arm", + binary: "kubectl", + err: true, + minikubeHome: "/dev/null", + }, + { + desc: "minikube home in etc and arm runtime", + version: "v1.16.0", + osName: runtime.GOOS, + archName: "arm", + binary: "kubectl", + err: true, + minikubeHome: "/etc", + }, + { + desc: "minikube home in etc", + version: "v1.16.0", + osName: runtime.GOOS, + archName: runtime.GOARCH, + binary: "kubectl", + err: true, + minikubeHome: "/etc", + }, + { + desc: "binary foo", + version: "v1.16.0", + osName: runtime.GOOS, + archName: runtime.GOARCH, + binary: "foo", + err: true, + minikubeHome: minikubeHome, + }, + { + desc: "version 9000", + version: "v9000", + osName: runtime.GOOS, + archName: runtime.GOARCH, + binary: "foo", + err: true, + minikubeHome: minikubeHome, + }, + { + desc: "bad os", + version: "v1.16.0", + osName: "no-such-os", + archName: runtime.GOARCH, + binary: "kubectl", + err: true, + minikubeHome: minikubeHome, + }, + } + for _, test := range tc { + t.Run(test.desc, func(t *testing.T) { + os.Setenv("MINIKUBE_HOME", test.minikubeHome) + _, err := CacheBinary(test.binary, test.version, test.osName, test.archName) + if err != nil && !test.err { + t.Fatalf("Got unexpected error %v", err) + } + if err == nil && test.err { + t.Fatalf("Expected error but got %v", err) + } + }) + } +} From e3a84f5f60a8754562918177646f6c41f7c7b8de Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Tue, 1 Oct 2019 23:46:07 +1000 Subject: [PATCH 053/106] add boilerplate --- pkg/minikube/machine/cache_binaries_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 484ce95251..03d5752b1c 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -1,3 +1,19 @@ +/* +Copyright 2019 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 machine import ( From 8d95d98348e57e63c197a3e5f3b295a9bf65f3d7 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Tue, 1 Oct 2019 23:49:49 +1000 Subject: [PATCH 054/106] self review fixes --- pkg/minikube/machine/cache_binaries_test.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 03d5752b1c..767c1136b3 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -36,13 +36,11 @@ func (copyFailRunner) Copy(a assets.CopyableFile) error { return fmt.Errorf("test error during copy file") } +func newFakeCommandRunnerCopyFail() command.Runner { + return copyFailRunner{command.NewFakeCommandRunner()} +} + func TestCopyBinary(t *testing.T) { - - fakeCommandRunnerCopyFail := func() command.Runner { - r := command.NewFakeCommandRunner() - return copyFailRunner{r} - } - var tc = []struct { lastUpdateCheckFilePath string src, dst, desc string @@ -68,7 +66,7 @@ func TestCopyBinary(t *testing.T) { dst: "/etc/passwd", src: "/etc/hosts", err: true, - runner: fakeCommandRunnerCopyFail(), + runner: newFakeCommandRunnerCopyFail(), }, } for _, test := range tc { From a99d6e934598f8fd540390791c2f7c43731cd565 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Tue, 1 Oct 2019 23:54:25 +1000 Subject: [PATCH 055/106] msg improvement --- pkg/minikube/machine/cache_binaries_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 767c1136b3..a252480de8 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -62,7 +62,7 @@ func TestCopyBinary(t *testing.T) { runner: command.NewFakeCommandRunner(), }, { - desc: "existing src, dst without permissions", + desc: "existing src, copy fail", dst: "/etc/passwd", src: "/etc/hosts", err: true, From f0eb90d941a156ef66335384094a20e559a7c6c9 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Wed, 2 Oct 2019 17:52:31 +1000 Subject: [PATCH 056/106] typofix --- pkg/minikube/machine/cache_binaries_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index a252480de8..72da130aff 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -73,7 +73,7 @@ func TestCopyBinary(t *testing.T) { t.Run(test.desc, func(t *testing.T) { err := CopyBinary(test.runner, test.src, test.dst) if err != nil && !test.err { - t.Fatalf("Error %v expected but not occured", err) + t.Fatalf("Error %v expected but not occurred", err) } if err == nil && test.err { t.Fatal("Unexpected error") From eff9be260f926073d9591be3283509e147a8f376 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Wed, 2 Oct 2019 18:30:08 +1000 Subject: [PATCH 057/106] remove unix specific files from tests --- pkg/minikube/machine/cache_binaries_test.go | 26 +++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 72da130aff..1f2fd4daad 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -118,7 +118,19 @@ func TestCacheBinary(t *testing.T) { t.Fatalf("error during creating tmp dir: %v", err) } defer os.RemoveAll(minikubeHome) - + noWritePermDir, err := ioutil.TempDir("/tmp", "") + if err != nil { + t.Fatalf("error during creating tmp dir: %v", err) + } + defer os.RemoveAll(noWritePermDir) + err = os.Chmod(noWritePermDir, 0000) + if err != nil { + t.Fatalf("error (%v) during changing permissions of dir %v", err, noWritePermDir) + } + noPermsDir := "/etc" + if runtime.GOOS == "windows" { + noPermsDir = "C:\\Windows\\System32" + } var tc = []struct { desc, version, osName, archName string minikubeHome, binary, description string @@ -134,31 +146,31 @@ func TestCacheBinary(t *testing.T) { minikubeHome: minikubeHome, }, { - desc: "minikube home is dev/null", + desc: "minikube home is pointing to dir without perms", version: "v1.16.0", osName: runtime.GOOS, archName: "arm", binary: "kubectl", err: true, - minikubeHome: "/dev/null", + minikubeHome: noPermsDir, }, { - desc: "minikube home in etc and arm runtime", + desc: "minikube home in dir without perms and arm runtime", version: "v1.16.0", osName: runtime.GOOS, archName: "arm", binary: "kubectl", err: true, - minikubeHome: "/etc", + minikubeHome: noWritePermDir, }, { - desc: "minikube home in etc", + desc: "minikube home in dir without perms", version: "v1.16.0", osName: runtime.GOOS, archName: runtime.GOARCH, binary: "kubectl", err: true, - minikubeHome: "/etc", + minikubeHome: noWritePermDir, }, { desc: "binary foo", From e73c10495572a4c9e99adb1da7721ea12b8596da Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Thu, 3 Oct 2019 15:30:31 +1000 Subject: [PATCH 058/106] add requested comment --- pkg/minikube/machine/cache_binaries_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index 1f2fd4daad..b522de6976 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -127,6 +127,8 @@ func TestCacheBinary(t *testing.T) { if err != nil { t.Fatalf("error (%v) during changing permissions of dir %v", err, noWritePermDir) } + + // noPermsDir is directory owned by root. Regular user is not able to write to it. noPermsDir := "/etc" if runtime.GOOS == "windows" { noPermsDir = "C:\\Windows\\System32" From 280e11880d8e508f3e5b24048de3b6b3df9ebdd3 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 18:32:36 +0200 Subject: [PATCH 059/106] Merge branch 'master' into DELETE_ALL_PROFILES Explicitly unset viper MachineProfile in machine_test --- pkg/minikube/cluster/machine_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index 7c6d6e7262..daf308a34d 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -17,11 +17,14 @@ limitations under the License. package cluster import ( + "fmt" "io/ioutil" "os" "path/filepath" "testing" + "github.com/spf13/viper" + "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/localpath" ) @@ -32,6 +35,8 @@ func TestListMachines(t *testing.T) { totalNumberOfMachines = numberOfValidMachines + numberOfInValidMachines ) + viper.Set(config.MachineProfile, "") + testMinikubeDir := "./testdata/machine" miniDir, err := filepath.Abs(testMinikubeDir) @@ -47,6 +52,7 @@ func TestListMachines(t *testing.T) { files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) + fmt.Println("Viper MachineProfile variable: " + viper.GetString(config.MachineProfile)) validMachines, inValidMachines, err := ListMachines() if err != nil { From 8a4b3b942fdb239ec9ac32f6d28965fe313c25c4 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 18:41:49 +0200 Subject: [PATCH 060/106] Added more debug code --- pkg/minikube/cluster/machine_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index daf308a34d..c57dde3d99 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -53,6 +53,9 @@ func TestListMachines(t *testing.T) { numberOfMachineDirs := len(files) fmt.Println("Viper MachineProfile variable: " + viper.GetString(config.MachineProfile)) + fmt.Println("MINIKUBE_HOME: " + os.Getenv(localpath.MinikubeHome)) + fmt.Printf("Files: %v", files) + validMachines, inValidMachines, err := ListMachines() if err != nil { From ae6f47d5627c44ee69418528a8454cb510834b6f Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 21:21:48 +0200 Subject: [PATCH 061/106] Appended "/.minikube" to testMinikubeDir for machine_test --- pkg/minikube/cluster/machine_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index c57dde3d99..89deaedc98 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -37,7 +37,7 @@ func TestListMachines(t *testing.T) { viper.Set(config.MachineProfile, "") - testMinikubeDir := "./testdata/machine" + testMinikubeDir := "./testdata/machine/.minikube" miniDir, err := filepath.Abs(testMinikubeDir) if err != nil { From ee97b87ef92520ab35d56de430ea1cc91bccb88e Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 21:31:28 +0200 Subject: [PATCH 062/106] Added debug code --- pkg/minikube/cluster/machine.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go index 8a24b04e3c..00556bee17 100644 --- a/pkg/minikube/cluster/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -17,6 +17,7 @@ limitations under the License. package cluster import ( + "fmt" "io/ioutil" "path/filepath" @@ -67,6 +68,8 @@ func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines } for _, n := range pDirs { p, err := LoadMachine(n) + fmt.Printf("MachineLoadError: %v", err) + if err != nil { inValidMachines = append(inValidMachines, p) continue From b8abe562b378b77d2a68ef83155b7b9a04b49785 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 22:20:47 +0200 Subject: [PATCH 063/106] Added more debug code --- pkg/minikube/machine/client.go | 2 ++ pkg/minikube/registry/registry.go | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index fdd4f2069f..3557cf56c7 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -19,6 +19,7 @@ package machine import ( "crypto/tls" "encoding/json" + "fmt" "net" "os" "path/filepath" @@ -128,6 +129,7 @@ func (api *LocalClient) Load(name string) (*host.Host, error) { } var def registry.DriverDef + fmt.Println("Searching for driver: " + h.DriverName) if def, err = registry.Driver(h.DriverName); err != nil { return nil, err } else if !def.Builtin || def.DriverCreator == nil { diff --git a/pkg/minikube/registry/registry.go b/pkg/minikube/registry/registry.go index 15b7b15e41..2960832890 100644 --- a/pkg/minikube/registry/registry.go +++ b/pkg/minikube/registry/registry.go @@ -133,6 +133,11 @@ func (r *driverRegistry) Driver(name string) (DriverDef, error) { r.lock.Lock() defer r.lock.Unlock() + fmt.Println("Drivers: ") + for _, d := range r.drivers { + fmt.Println(d.Name) + } + if driver, ok := r.drivers[name]; ok { return driver, nil } From 0c9cd491ce6fe79ae0a2c385e1b42e756c454d66 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 3 Oct 2019 22:33:24 +0200 Subject: [PATCH 064/106] Replaced driver "hyperkit" by "virtualbox" in testfiles Removed debug code --- pkg/minikube/cluster/machine.go | 3 --- pkg/minikube/cluster/machine_test.go | 5 ----- .../testdata/machine/.minikube/machines/p1/config.json | 2 +- .../testdata/machine/.minikube/machines/p2/config.json | 2 +- pkg/minikube/machine/client.go | 2 -- pkg/minikube/registry/registry.go | 5 ----- 6 files changed, 2 insertions(+), 17 deletions(-) diff --git a/pkg/minikube/cluster/machine.go b/pkg/minikube/cluster/machine.go index 00556bee17..8a24b04e3c 100644 --- a/pkg/minikube/cluster/machine.go +++ b/pkg/minikube/cluster/machine.go @@ -17,7 +17,6 @@ limitations under the License. package cluster import ( - "fmt" "io/ioutil" "path/filepath" @@ -68,8 +67,6 @@ func ListMachines(miniHome ...string) (validMachines []*Machine, inValidMachines } for _, n := range pDirs { p, err := LoadMachine(n) - fmt.Printf("MachineLoadError: %v", err) - if err != nil { inValidMachines = append(inValidMachines, p) continue diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index 89deaedc98..4f5e253f49 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -17,7 +17,6 @@ limitations under the License. package cluster import ( - "fmt" "io/ioutil" "os" "path/filepath" @@ -52,10 +51,6 @@ func TestListMachines(t *testing.T) { files, _ := ioutil.ReadDir(filepath.Join(localpath.MiniPath(), "machines")) numberOfMachineDirs := len(files) - fmt.Println("Viper MachineProfile variable: " + viper.GetString(config.MachineProfile)) - fmt.Println("MINIKUBE_HOME: " + os.Getenv(localpath.MinikubeHome)) - fmt.Printf("Files: %v", files) - validMachines, inValidMachines, err := ListMachines() if err != nil { diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json index 90a026a01c..83a27c78b2 100644 --- a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json +++ b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json @@ -23,7 +23,7 @@ "Initrd": "initrd", "Vmlinuz": "bzImage" }, - "DriverName": "hyperkit", + "DriverName": "virtualbox", "HostOptions": { "Driver": "", "Memory": 0, diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json index 3a9813e57d..4bb1814211 100644 --- a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json +++ b/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json @@ -23,7 +23,7 @@ "Initrd": "initrd", "Vmlinuz": "bzImage" }, - "DriverName": "hyperkit", + "DriverName": "virtualbox", "HostOptions": { "Driver": "", "Memory": 0, diff --git a/pkg/minikube/machine/client.go b/pkg/minikube/machine/client.go index 3557cf56c7..fdd4f2069f 100644 --- a/pkg/minikube/machine/client.go +++ b/pkg/minikube/machine/client.go @@ -19,7 +19,6 @@ package machine import ( "crypto/tls" "encoding/json" - "fmt" "net" "os" "path/filepath" @@ -129,7 +128,6 @@ func (api *LocalClient) Load(name string) (*host.Host, error) { } var def registry.DriverDef - fmt.Println("Searching for driver: " + h.DriverName) if def, err = registry.Driver(h.DriverName); err != nil { return nil, err } else if !def.Builtin || def.DriverCreator == nil { diff --git a/pkg/minikube/registry/registry.go b/pkg/minikube/registry/registry.go index 2960832890..15b7b15e41 100644 --- a/pkg/minikube/registry/registry.go +++ b/pkg/minikube/registry/registry.go @@ -133,11 +133,6 @@ func (r *driverRegistry) Driver(name string) (DriverDef, error) { r.lock.Lock() defer r.lock.Unlock() - fmt.Println("Drivers: ") - for _, d := range r.drivers { - fmt.Println(d.Name) - } - if driver, ok := r.drivers[name]; ok { return driver, nil } From fdf5345616567a538500c585c206c8903b554934 Mon Sep 17 00:00:00 2001 From: Josh Woodcock Date: Mon, 7 Oct 2019 09:18:43 -0500 Subject: [PATCH 065/106] Fix addons list output format option --- cmd/minikube/cmd/config/addons_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index 72aadadc22..ddc207ae08 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -52,7 +52,7 @@ var addonsListCmd = &cobra.Command{ } func init() { - AddonsCmd.Flags().StringVar(&addonListFormat, "format", defaultAddonListFormat, + addonsListCmd.Flags().StringVar(&addonListFormat, "format", defaultAddonListFormat, `Go template format string for the addon list output. The format for Go templates can be found here: https://golang.org/pkg/text/template/ For the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#AddonListTemplate`) AddonsCmd.AddCommand(addonsListCmd) From ac10db66310440b3ba8490186b0fae58920a6bb6 Mon Sep 17 00:00:00 2001 From: Cornelius Weig Date: Wed, 9 Oct 2019 00:21:09 +0200 Subject: [PATCH 066/106] Bump golangci-lint to v1.20.0 This version comes with significant memory improvements, making some adjustments for small memory footprint in the CI obsolete. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 89ace1bfa0..bdc8732eca 100755 --- a/Makefile +++ b/Makefile @@ -51,13 +51,13 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download KERNEL_VERSION ?= 4.15 # latest from https://github.com/golangci/golangci-lint/releases -GOLINT_VERSION ?= v1.18.0 +GOLINT_VERSION ?= v1.20.0 # Limit number of default jobs, to avoid the CI builds running out of memory GOLINT_JOBS ?= 4 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint -GOLINT_GOGC ?= 8 +GOLINT_GOGC ?= 100 # options for lint (golangci-lint) -GOLINT_OPTIONS = --deadline 4m \ +GOLINT_OPTIONS = --timeout 4m \ --build-tags "${MINIKUBE_INTEGRATION_BUILD_TAGS}" \ --enable goimports,gocritic,golint,gocyclo,interfacer,misspell,nakedret,stylecheck,unconvert,unparam \ --exclude 'variable on range scope.*in function literal|ifElseChain' From e63ecbe3b1c4e352d4f7d1af7c55827e6b326d2f Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 9 Oct 2019 11:45:00 -0700 Subject: [PATCH 067/106] switch pkgConfig to config --- cmd/minikube/cmd/config/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index f419d38e74..10be06c4f5 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -246,7 +246,7 @@ func (e ErrValidateProfile) Error() string { // ValidateProfile checks if the profile user is trying to switch exists, else throws error func ValidateProfile(profile string) (*ErrValidateProfile, bool) { - validProfiles, invalidProfiles, err := pkgConfig.ListProfiles() + validProfiles, invalidProfiles, err := config.ListProfiles() if err != nil { out.FailureT(err.Error()) } From c00d8b37c856f706d0083db063a31456c86fc514 Mon Sep 17 00:00:00 2001 From: Cornelius Weig Date: Wed, 9 Oct 2019 21:46:24 +0200 Subject: [PATCH 068/106] Fix issues found by new linter version --- cmd/minikube/cmd/start.go | 15 +++++++-------- cmd/minikube/cmd/update-check.go | 4 ---- cmd/minikube/cmd/version.go | 4 ---- pkg/minikube/extract/extract.go | 8 ++++---- pkg/minikube/tunnel/tunnel_manager.go | 4 ++-- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 9adf964c34..62ef4eda49 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -119,14 +119,13 @@ const ( ) var ( - registryMirror []string - dockerEnv []string - dockerOpt []string - insecureRegistry []string - apiServerNames []string - apiServerIPs []net.IP - extraOptions cfg.ExtraOptionSlice - enableUpdateNotification = true + registryMirror []string + dockerEnv []string + dockerOpt []string + insecureRegistry []string + apiServerNames []string + apiServerIPs []net.IP + extraOptions cfg.ExtraOptionSlice ) func init() { diff --git a/cmd/minikube/cmd/update-check.go b/cmd/minikube/cmd/update-check.go index 5fab5cfe05..ec519cae35 100644 --- a/cmd/minikube/cmd/update-check.go +++ b/cmd/minikube/cmd/update-check.go @@ -28,10 +28,6 @@ var updateCheckCmd = &cobra.Command{ Use: "update-check", Short: "Print current and latest version number", Long: `Print current and latest version number`, - PersistentPreRun: func(cmd *cobra.Command, args []string) { - // Explicitly disable update checking for the version command - enableUpdateNotification = false - }, Run: func(command *cobra.Command, args []string) { url := notify.GithubMinikubeReleasesURL r, err := notify.GetAllVersionsFromURL(url) diff --git a/cmd/minikube/cmd/version.go b/cmd/minikube/cmd/version.go index a7cb944d0d..00c61efd88 100644 --- a/cmd/minikube/cmd/version.go +++ b/cmd/minikube/cmd/version.go @@ -26,10 +26,6 @@ var versionCmd = &cobra.Command{ Use: "version", Short: "Print the version of minikube", Long: `Print the version of minikube.`, - PersistentPreRun: func(cmd *cobra.Command, args []string) { - // Explicitly disable update checking for the version command - enableUpdateNotification = false - }, Run: func(command *cobra.Command, args []string) { out.Ln("minikube version: %v", version.GetVersion()) gitCommitID := version.GetGitCommitID() diff --git a/pkg/minikube/extract/extract.go b/pkg/minikube/extract/extract.go index 55a8969724..8453d53ea5 100644 --- a/pkg/minikube/extract/extract.go +++ b/pkg/minikube/extract/extract.go @@ -385,7 +385,7 @@ func checkKeyValueExpression(kvp *ast.KeyValueExpr, e *state) { // Ok now this is just a mess if help, ok := kvp.Value.(*ast.BinaryExpr); ok { - s := checkBinaryExpression(help, e) + s := checkBinaryExpression(help) if s != "" { e.translations[s] = "" } @@ -394,7 +394,7 @@ func checkKeyValueExpression(kvp *ast.KeyValueExpr, e *state) { } // checkBinaryExpression checks binary expressions, stuff of the form x + y, for strings and concats them -func checkBinaryExpression(b *ast.BinaryExpr, e *state) string { +func checkBinaryExpression(b *ast.BinaryExpr) string { // Check the left side var s string if l, ok := b.X.(*ast.BasicLit); ok { @@ -410,7 +410,7 @@ func checkBinaryExpression(b *ast.BinaryExpr, e *state) string { } if b1, ok := b.X.(*ast.BinaryExpr); ok { - if x := checkBinaryExpression(b1, e); x != "" { + if x := checkBinaryExpression(b1); x != "" { s += x } } @@ -429,7 +429,7 @@ func checkBinaryExpression(b *ast.BinaryExpr, e *state) string { } if b1, ok := b.Y.(*ast.BinaryExpr); ok { - if x := checkBinaryExpression(b1, e); x != "" { + if x := checkBinaryExpression(b1); x != "" { s += x } } diff --git a/pkg/minikube/tunnel/tunnel_manager.go b/pkg/minikube/tunnel/tunnel_manager.go index 69f9e972b1..4c3ed6f4d9 100644 --- a/pkg/minikube/tunnel/tunnel_manager.go +++ b/pkg/minikube/tunnel/tunnel_manager.go @@ -122,8 +122,8 @@ func (mgr *Manager) run(ctx context.Context, t controller, ready, check, done ch } } -func (mgr *Manager) cleanup(t controller) *Status { - return t.cleanup() +func (mgr *Manager) cleanup(t controller) { + t.cleanup() } // CleanupNotRunningTunnels cleans up tunnels that are not running From 7834c83d9d576a4dcb28ea41249a1e6d415fa437 Mon Sep 17 00:00:00 2001 From: BlackHole1 <158blackhole@gmail.com> Date: Tue, 27 Aug 2019 09:40:55 +0800 Subject: [PATCH 069/106] optimizing Chinese translation (No.2) --- translations/zh-CN.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 6af65586d7..847c6e1e2c 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -151,10 +151,10 @@ "Failed to delete images from config": "", "Failed to download kubectl": "", "Failed to enable container runtime": "", - "Failed to generate config": "", - "Failed to get bootstrapper": "", + "Failed to generate config": "无法生成 config", + "Failed to get bootstrapper": "获取 bootstrapper 失败", "Failed to get command runner": "", - "Failed to get driver URL": "", + "Failed to get driver URL": "获取 driver URL 失败", "Failed to get image map": "", "Failed to get machine client": "", "Failed to get service URL: {{.error}}": "", From 910a69eec32c593ecd5304a3ed9952ae95997ba1 Mon Sep 17 00:00:00 2001 From: BlackHole1 <158blackhole@gmail.com> Date: Thu, 10 Oct 2019 09:47:03 +0800 Subject: [PATCH 070/106] refactor(i18n): add chinese translation --- translations/zh-CN.json | 274 ++++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/translations/zh-CN.json b/translations/zh-CN.json index 847c6e1e2c..777e14862a 100644 --- a/translations/zh-CN.json +++ b/translations/zh-CN.json @@ -1,155 +1,155 @@ { - "\"{{.minikube_addon}}\" was successfully disabled": "", - "\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "", + "\"{{.minikube_addon}}\" was successfully disabled": "已成功禁用 \"{{.minikube_addon}}\"", + "\"{{.name}}\" cluster does not exist. Proceeding ahead with cleanup.": "\"{{.name}}\" 集群不存在，将继续清理", "\"{{.name}}\" profile does not exist": "“{{.name}}”配置文件不存在", - "\"{{.profile_name}}\" VM does not exist, nothing to stop": "", - "\"{{.profile_name}}\" host does not exist, unable to show an IP": "", - "\"{{.profile_name}}\" stopped.": "", - "'none' driver does not support 'minikube docker-env' command": "", - "'none' driver does not support 'minikube mount' command": "", - "'none' driver does not support 'minikube ssh' command": "", - "A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "", - "A firewall is blocking Docker within the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "", - "A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "", - "A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "", - "A set of apiserver IP Addresses which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "", + "\"{{.profile_name}}\" VM does not exist, nothing to stop": "\"{{.profile_name}}\" 虚拟机不存在，没有什么可供停止的", + "\"{{.profile_name}}\" host does not exist, unable to show an IP": "\"{{.profile_name}}\" 主机不存在，无法显示其IP", + "\"{{.profile_name}}\" stopped.": "\"{{.profile_name}}\" 已停止", + "'none' driver does not support 'minikube docker-env' command": "'none' 驱动不支持 'minikube docker-env' 命令", + "'none' driver does not support 'minikube mount' command": "'none' 驱动不支持 'minikube mount' 命令", + "'none' driver does not support 'minikube ssh' command": "'none' 驱动不支持 'minikube ssh' 命令", + "A VPN or firewall is interfering with HTTP access to the minikube VM. Alternatively, try a different VM driver: https://minikube.sigs.k8s.io/docs/start/": "VPN 或者防火墙正在干扰对 minikube 虚拟机的 HTTP 访问。或者，您可以使用其它的虚拟机驱动：https://minikube.sigs.k8s.io/docs/start/", + "A firewall is blocking Docker within the minikube VM from reaching the internet. You may need to configure it to use a proxy.": "防火墙正在阻止 minikube 虚拟机中的 Docker 访问互联网，您可能需要对其进行配置为使用代理", + "A firewall is interfering with minikube's ability to make outgoing HTTPS requests. You may need to change the value of the HTTPS_PROXY environment variable.": "防火墙正在干扰 minikube 发送 HTTPS 请求的能力，您可能需要改变 HTTPS_PROXY 环境变量的值", + "A firewall is likely blocking minikube from reaching the internet. You may need to configure minikube to use a proxy.": "防火墙可能会阻止 minikube 访问互联网。您可能需要将 minikube 配置为使用", + "A set of apiserver IP Addresses which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "一组在为 kubernetes 生成的证书中使用的 apiserver IP 地址。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver IP 地址", "A set of apiserver IP Addresses which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "一组在为 kubernetes 生成的证书中使用的 apiserver IP 地址。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver IP 地址", - "A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "", + "A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "一组在为 kubernetes 生成的证书中使用的 apiserver 名称。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver 名称", "A set of apiserver names which are used in the generated certificate for kubernetes. This can be used if you want to make the apiserver available from outside the machine": "一组在为 kubernetes 生成的证书中使用的 apiserver 名称。如果您希望将此 apiserver 设置为可从机器外部访问，则可以使用这组 apiserver 名称", "A set of key=value pairs that describe configuration that may be passed to different components.\nThe key should be '.' separated, and the first part before the dot is the component to apply the configuration to.\nValid components are: kubelet, kubeadm, apiserver, controller-manager, etcd, proxy, scheduler\nValid kubeadm parameters:": "一组用于描述可传递给不同组件的配置的键值对。\n其中键应以英文句点“.”分隔，英文句点前面的第一个部分是应用该配置的组件。\n有效组件包括：kubelet、kubeadm、apiserver、controller-manager、etcd、proxy、scheduler\n有效 kubeadm 参数包括：", "A set of key=value pairs that describe feature gates for alpha/experimental features.": "一组用于描述 alpha 版功能/实验性功能的功能限制的键值对。", - "Access the kubernetes dashboard running within the minikube cluster": "", - "Add an image to local cache.": "", - "Add machine IP to NO_PROXY environment variable": "", - "Add or delete an image from the local cache.": "", - "Additional help topics": "", - "Additional mount options, such as cache=fscache": "", - "Advanced Commands:": "", - "Aliases": "", - "Allow user prompts for more information": "", + "Access the kubernetes dashboard running within the minikube cluster": "访问在 minikube 集群中运行的 kubernetes dashboard", + "Add an image to local cache.": "将 image 添加到本地缓存。", + "Add machine IP to NO_PROXY environment variable": "将机器IP添加到环境变量 NO_PROXY 中", + "Add or delete an image from the local cache.": "在本地缓存中添加或删除 image。", + "Additional help topics": "其他帮助", + "Additional mount options, such as cache=fscache": "其他挂载选项，例如：cache=fscache", + "Advanced Commands:": "高级命令：", + "Aliases": "别名", + "Allow user prompts for more information": "允许用户提示以获取更多信息", "Alternative image repository to pull docker images from. This can be used when you have limited access to gcr.io. Set it to \\\"auto\\\" to let minikube decide one for you. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers": "用于从中拉取 docker 映像的备选映像存储库。如果您对 gcr.io 的访问受到限制，则可以使用该映像存储库。将映像存储库设置为“auto”可让 minikube 为您选择一个存储库。对于中国大陆用户，您可以使用本地 gcr.io 镜像，例如 registry.cn-hangzhou.aliyuncs.com/google_containers", "Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "为 minikube 虚拟机分配的 RAM 容量（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）", - "Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "", - "Amount of time to wait for a service in seconds": "", - "Amount of time to wait for service in seconds": "", - "Available Commands": "", - "Basic Commands:": "", - "Cannot find directory {{.path}} for mount": "", - "Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "", - "Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "", - "Check that your apiserver flags are valid, or run 'minikube delete'": "", - "Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --vm-driver=none": "", - "Configuration and Management Commands:": "", - "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "", - "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "", + "Amount of RAM allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "为 minikube 虚拟机分配的 RAM 容量（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）。", + "Amount of time to wait for a service in seconds": "等待服务的时间（单位秒）", + "Amount of time to wait for service in seconds": "等待服务的时间（单位秒）", + "Available Commands": "可用命令", + "Basic Commands:": "基本命令：", + "Cannot find directory {{.path}} for mount": "找不到用来挂载的 {{.path}} 目录", + "Check that minikube is running and that you have specified the correct namespace (-n flag) if required.": "检测 minikube 是否正在运行，以及是否根据需要指定了正确的 namespace （-n 标志）", + "Check that your --kubernetes-version has a leading 'v'. For example: 'v1.1.14'": "检测您的 --kubernetes-version 前面是否有 'v'， 例如：'v1.1.14", + "Check that your apiserver flags are valid, or run 'minikube delete'": "请检查您的 apiserver 标志是否有效，或者允许 'minikube delete'", + "Check your firewall rules for interference, and run 'virt-host-validate' to check for KVM configuration issues. If you are running minikube within a VM, consider using --vm-driver=none": "检查您的防火墙规则是否存在干扰，然后运行 'virt-host-validate' 以检查 KVM 配置问题，如果在虚拟机中运行minikube，请考虑使用 --vm-driver=none", + "Configuration and Management Commands:": "配置和管理命令：", + "Configure an external network switch following the official documentation, then add `--hyperv-virtual-switch=\u003cswitch-name\u003e` to `minikube start`": "根据官方文档配置外部网络交换机，然后添加 `--hyperv-virtual-switch=\u003cswitch-name\u003e` 到 `minikube start`", + "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list": "在 minikube 中配置插件 w/ADDON_NAME（例如：minikube addons configure registry-creds）。查看相关可用的插件列表，请使用：minikube addons list", "Configuring environment for Kubernetes {{.k8sVersion}} on {{.runtime}} {{.runtimeVersion}}": "开始为Kubernetes {{.k8sVersion}}，{{.runtime}} {{.runtimeVersion}} 配置环境变量", - "Configuring local host environment ...": "", - "Confirm that you have a working internet connection and that your VM has not run out of resources by using: 'minikube logs'": "", - "Confirm that you have supplied the correct value to --hyperv-virtual-switch using the 'Get-VMSwitch' command": "", + "Configuring local host environment ...": "开始配置本地主机环境...", + "Confirm that you have a working internet connection and that your VM has not run out of resources by using: 'minikube logs'": "使用 'minikube logs' 确认您的互联网连接正常，并且您的虚拟机没有耗尽资源", + "Confirm that you have supplied the correct value to --hyperv-virtual-switch using the 'Get-VMSwitch' command": "使用 'Get-VMSwitch' 命令确认已经为 --hyperv-virtual-switch 提供了正确的值", "Country code of the image mirror to be used. Leave empty to use the global one. For Chinese mainland users, set it to cn.": "需要使用的映像镜像的国家/地区代码。留空以使用全球代码。对于中国大陆用户，请将其设置为 cn。", - "Created a new profile : {{.profile_name}}": "", - "Creating a new profile failed": "", + "Created a new profile : {{.profile_name}}": "创建了新的配置文件：{{.profile_name}}", + "Creating a new profile failed": "创建新的配置文件失败", "Creating mount {{.name}} ...": "正在创建装载 {{.name}}…", - "Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "", - "Default group id used for the mount": "", - "Default user id used for the mount": "", - "Delete an image from the local cache.": "", - "Deletes a local kubernetes cluster": "", - "Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "", + "Creating {{.driver_name}} VM (CPUs={{.number_of_cpus}}, Memory={{.memory_size}}MB, Disk={{.disk_size}}MB) ...": "正在创建 {{.driver_name}} 虚拟机（CPUs={{.number_of_cpus}}，Memory={{.memory_size}}MB, Disk={{.disk_size}}MB）...", + "Default group id used for the mount": "用于挂载默认的 group id", + "Default user id used for the mount": "用于挂载默认的 user id", + "Delete an image from the local cache.": "从本地缓存中删除 image。", + "Deletes a local kubernetes cluster": "删除本地的 kubernetes 集群", + "Deletes a local kubernetes cluster. This command deletes the VM, and removes all\nassociated files.": "删除本地的 kubernetes 集群。此命令还将删除虚拟机，并删除所有的\n相关文件", "Deletes a local kubernetes cluster. This command deletes the VM, and removes all associated files.": "删除本地 kubernetes 集群。此命令会删除虚拟机并移除所有关联的文件。", "Deleting \"{{.profile_name}}\" in {{.driver_name}} ...": "正在删除 {{.driver_name}} 中的“{{.profile_name}}”…", "Disable checking for the availability of hardware virtualization before the vm is started (virtualbox driver only)": "禁用在启动虚拟机之前检查硬件虚拟化的可用性（仅限 virtualbox 驱动程序）", - "Disable dynamic memory in your VM manager, or pass in a larger --memory value": "", - "Disables the addon w/ADDON_NAME within minikube (example: minikube addons disable dashboard). For a list of available addons use: minikube addons list": "", + "Disable dynamic memory in your VM manager, or pass in a larger --memory value": "禁用虚拟机管理器中的动态内存，或者使用 --memory 传入更大的值", + "Disables the addon w/ADDON_NAME within minikube (example: minikube addons disable dashboard). For a list of available addons use: minikube addons list": "在 minikube 中禁用插件 w/ADDON_NAME（例如：minikube addons disable dashboard）。查看相关可用的插件列表，请使用：minikube addons list", "Disables the filesystem mounts provided by the hypervisors": "停用由管理程序提供的文件系统装载", "Disk size allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g)": "分配给 minikube 虚拟机的磁盘大小（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）", - "Disk size allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "", - "Display dashboard URL instead of opening a browser": "", - "Display the kubernetes addons URL in the CLI instead of opening it in the default browser": "", - "Display the kubernetes service URL in the CLI instead of opening it in the default browser": "", - "Display values currently set in the minikube config file": "", - "Display values currently set in the minikube config file.": "", - "Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "", - "Docs have been saved at - {{.path}}": "", - "Documentation: {{.url}}": "", - "Done! kubectl is now configured to use \"{{.name}}\"": "", + "Disk size allocated to the minikube VM (format: \u003cnumber\u003e[\u003cunit\u003e], where unit = b, k, m or g).": "分配给 minikube 虚拟机的磁盘大小（格式：\u003c数字\u003e[\u003c单位\u003e]，其中单位 = b、k、m 或 g）。", + "Display dashboard URL instead of opening a browser": "显示 dashboard URL，而不是打开浏览器", + "Display the kubernetes addons URL in the CLI instead of opening it in the default browser": "在终端中显示 kubernetes addons URL，而不是在默认浏览器中打开它", + "Display the kubernetes service URL in the CLI instead of opening it in the default browser": "在终端中显示 kubernetes service URL，而不是在默认浏览器中打开它", + "Display values currently set in the minikube config file": "显示当前在 minikube 配置文件中设置的值", + "Display values currently set in the minikube config file.": "显示当前在 minikube 配置文件中设置的值。", + "Docker inside the VM is unavailable. Try running 'minikube delete' to reset the VM.": "虚拟机中的 Docker 不可用，尝试运行 'minikube delete' 来重置虚拟机。", + "Docs have been saved at - {{.path}}": "文档已保存在 - {{.path}}", + "Documentation: {{.url}}": "文档：{{.url}}", + "Done! kubectl is now configured to use \"{{.name}}\"": "完成！kubectl 已经配置至 \"{{.name}}\"", "Done! kubectl is now configured to use {{.name}}": "完成！kubectl已经配置至{{.name}}", "Download complete!": "下载完成！", - "Downloading VM boot image ...": "", - "Downloading driver {{.driver}}:": "", - "Downloading {{.name}} {{.version}}": "", - "ERROR creating `registry-creds-dpr` secret": "", - "ERROR creating `registry-creds-ecr` secret: {{.error}}": "", - "ERROR creating `registry-creds-gcr` secret: {{.error}}": "", - "Either systemctl is not installed, or Docker is broken. Run 'sudo systemctl start docker' and 'journalctl -u docker'": "", + "Downloading VM boot image ...": "正在下载 VM boot image...", + "Downloading driver {{.driver}}:": "正在下载驱动 {{.driver}}:", + "Downloading {{.name}} {{.version}}": "正在下载 {{.name}} {{.version}}", + "ERROR creating `registry-creds-dpr` secret": "创建 `registry-creds-dpr` secret 时出错", + "ERROR creating `registry-creds-ecr` secret: {{.error}}": "创建 `registry-creds-ecr` secret 时出错：{{.error}}", + "ERROR creating `registry-creds-gcr` secret: {{.error}}": "创建 `registry-creds-gcr` secret 时出错：{{.error}}", + "Either systemctl is not installed, or Docker is broken. Run 'sudo systemctl start docker' and 'journalctl -u docker'": "未安装 systemctl 或者 Docker 损坏。请运行 'sudo systemctl start docker' 和 'journalctl -u docker'", "Enable experimental NVIDIA GPU support in minikube": "在 minikube 中启用实验性 NVIDIA GPU 支持", "Enable host resolver for NAT DNS requests (virtualbox driver only)": "为 NAT DNS 请求启用主机解析器（仅限 virtualbox 驱动程序）", "Enable proxy for NAT DNS requests (virtualbox driver only)": "为 NAT DNS 请求启用代理（仅限 virtualbox 驱动程序）", "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\": "启用默认 CNI 插件 (/etc/cni/net.d/k8s.conf)。与“--network-plugin=cni”结合使用", - "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "", - "Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "", - "Enabling dashboard ...": "", + "Enable the default CNI plugin (/etc/cni/net.d/k8s.conf). Used in conjunction with \\\"--network-plugin=cni\\\".": "启用默认 CNI 插件 (/etc/cni/net.d/k8s.conf)。与“--network-plugin=cni”结合使用。", + "Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list": "启动 minikube 插件 w/ADDON_NAME（例如：minikube addons enable dashboard）。查看相关可用的插件列表，请使用：minikube addons list", + "Enabling dashboard ...": "正在开启 dashboard ...", "Environment variables to pass to the Docker daemon. (format: key=value)": "传递给 Docker 守护进程的环境变量。（格式：键值对）", "Error checking driver version: {{.error}}": "检查驱动程序版本时出错：{{.error}}", - "Error creating list template": "", - "Error creating minikube directory": "", - "Error creating status template": "", - "Error creating view template": "", - "Error executing list template": "", - "Error executing status template": "", - "Error executing template": "", - "Error executing view template": "", - "Error finding port for mount": "", - "Error getting IP": "", - "Error getting bootstrapper": "", - "Error getting client": "", - "Error getting client: {{.error}}": "", - "Error getting cluster": "", - "Error getting cluster bootstrapper": "", - "Error getting config": "", - "Error getting host": "", - "Error getting host status": "", - "Error getting machine logs": "", - "Error getting machine status": "", - "Error getting service status": "", - "Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "", - "Error getting the host IP address to use from within the VM": "", + "Error creating list template": "创建 list template 时出错", + "Error creating minikube directory": "创建 minikube 目录时出错", + "Error creating status template": "创建 status template 时出错", + "Error creating view template": "创建 view template 时出错", + "Error executing list template": "执行 list template 时出错", + "Error executing status template": "执行 status template 时出错", + "Error executing template": "执行 template 时出错", + "Error executing view template": "执行 view template 时出错", + "Error finding port for mount": "查找 mount 端口时出错", + "Error getting IP": "获取 IP 时出错", + "Error getting bootstrapper": "获取 bootstrapper 时出错", + "Error getting client": "获取 client 时出错", + "Error getting client: {{.error}}": "获取 client 时出错：{{.error}}", + "Error getting cluster": "获取 cluster 时出错", + "Error getting cluster bootstrapper": "获取 cluster bootstrapper 时出错", + "Error getting config": "获取 config 时出错", + "Error getting host": "获取 host 时出错", + "Error getting host status": "获取 host status 时出错", + "Error getting machine logs": "获取 machine logs 时出错", + "Error getting machine status": "获取 machine status 时出错", + "Error getting service status": "获取 service status 时出错", + "Error getting service with namespace: {{.namespace}} and labels {{.labelName}}:{{.addonName}}: {{.error}}": "使用 namespace: {{.namespace}} 和 labels {{.labelName}}:{{.addonName}} 获取 service 时出错：{{.error}}", + "Error getting the host IP address to use from within the VM": "从虚拟机中获取 host IP 地址时出错", "Error host driver ip status": "", - "Error killing mount process": "", - "Error loading api": "", - "Error loading profile config": "", - "Error loading profile config: {{.error}}": "", + "Error killing mount process": "杀死 mount 进程时出错", + "Error loading api": "加载 api 时出错", + "Error loading profile config": "加载配置文件的配置时出错", + "Error loading profile config: {{.error}}": "加载配置文件的配置时出错：{{.error}}", "Error loading profile {{.name}}: {{.error}}": "加载配置文件 {{.name}} 时出错：{{.error}}", - "Error opening service": "", + "Error opening service": "开启 service 时出错", "Error parsing minikube version: {{.error}}": "解析 minikube 版本时出错：{{.error}}", "Error parsing vmDriver version: {{.error}}": "解析 vmDriver 版本时出错：{{.error}}", - "Error reading {{.path}}: {{.error}}": "", - "Error restarting cluster": "", - "Error setting shell variables": "", - "Error starting cluster": "", - "Error starting mount": "", - "Error unsetting shell variables": "", - "Error while setting kubectl current context : {{.error}}": "", - "Error writing mount pid": "", - "Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "", + "Error reading {{.path}}: {{.error}}": "读取 {{.path}} 时出错：{{.error}}", + "Error restarting cluster": "重启 cluster 时出错", + "Error setting shell variables": "设置 shell 变量时出错", + "Error starting cluster": "开启 cluster 时出错", + "Error starting mount": "开启 mount 时出错", + "Error unsetting shell variables": "取消设置 shell 变量时出错", + "Error while setting kubectl current context : {{.error}}": "设置 kubectl 上下文时出错 ：{{.error}}", + "Error writing mount pid": "写入 mount pid 时出错", + "Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}\"": "错误：您已选择 Kubernetes v{{.new}}，但您的配置文件的现有集群正在运行 Kubernetes v{{.old}}。非破坏性降级不受支持，但若要继续操作，您可以执行以下选项之一：\n\n* 使用 Kubernetes v{{.new}} 重新创建现有集群：运行“minikube delete {{.profile}}”，然后运行“minikube start {{.profile}} --kubernetes-version={{.new}}”\n* 使用 Kubernetes v{{.new}} 再创建一个集群：运行“minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}”\n* 通过 Kubernetes v{{.old}} 或更高版本重复使用现有集群：运行“minikube start {{.profile}} --kubernetes-version={{.old}}”", "Error: You have selected Kubernetes v{{.new}}, but the existing cluster for your profile is running Kubernetes v{{.old}}. Non-destructive downgrades are not supported, but you can proceed by performing one of the following options:\n* Recreate the cluster using Kubernetes v{{.new}}: Run \"minikube delete {{.profile}}\", then \"minikube start {{.profile}} --kubernetes-version={{.new}}\"\n* Create a second cluster with Kubernetes v{{.new}}: Run \"minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}\"\n* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run \"minikube start {{.profile}} --kubernetes-version={{.old}}": "错误：您已选择 Kubernetes v{{.new}}，但您的配置文件的现有集群正在运行 Kubernetes v{{.old}}。非破坏性降级不受支持，但若要继续操作，您可以执行以下选项之一：\n* 使用 Kubernetes v{{.new}} 重新创建现有集群：运行“minikube delete {{.profile}}”，然后运行“minikube start {{.profile}} --kubernetes-version={{.new}}”\n* 使用 Kubernetes v{{.new}} 再创建一个集群：运行“minikube start -p \u003cnew name\u003e --kubernetes-version={{.new}}”\n* 通过 Kubernetes v{{.old}} 或更高版本重复使用现有集群：运行“minikube start {{.profile}} --kubernetes-version={{.old}}”", - "Error: [{{.id}}] {{.error}}": "", - "Examples": "", + "Error: [{{.id}}] {{.error}}": "错误：[{{.id}}] {{.error}}", + "Examples": "示例", "Exiting": "正在退出", - "Exiting due to driver incompatibility": "", + "Exiting due to driver incompatibility": "由于驱动程序不兼容而退出", "Failed runtime": "", - "Failed to cache ISO": "", - "Failed to cache and load images": "", - "Failed to cache binaries": "", - "Failed to cache images": "", + "Failed to cache ISO": "缓存ISO 时失败", + "Failed to cache and load images": "无法加载 cache 和 images", + "Failed to cache binaries": "缓存二进制文件失败", + "Failed to cache images": "缓存 images 时失败", "Failed to change permissions for {{.minikube_dir_path}}: {{.error}}": "未能更改 {{.minikube_dir_path}} 的权限：{{.error}}", - "Failed to check if machine exists": "", - "Failed to check main repository and mirrors for images for images": "", + "Failed to check if machine exists": "无法检测机器是否存在", + "Failed to check main repository and mirrors for images for images": "无法检测主 repository 和 mirrors images 中的 images", "Failed to delete cluster: {{.error}}": "未能删除集群：{{.error}}", "Failed to delete cluster: {{.error}}__1": "未能删除集群：{{.error}}", - "Failed to delete images": "", - "Failed to delete images from config": "", - "Failed to download kubectl": "", + "Failed to delete images": "删除 images 时失败", + "Failed to delete images from config": "无法从 config 里删除 images", + "Failed to download kubectl": "下载 kubectl 失败", "Failed to enable container runtime": "", "Failed to generate config": "无法生成 config", "Failed to get bootstrapper": "获取 bootstrapper 失败", @@ -157,32 +157,32 @@ "Failed to get driver URL": "获取 driver URL 失败", "Failed to get image map": "", "Failed to get machine client": "", - "Failed to get service URL: {{.error}}": "", + "Failed to get service URL: {{.error}}": "获取 service URL 失败：{{.error}}", "Failed to kill mount process: {{.error}}": "未能终止装载进程：{{.error}}", - "Failed to list cached images": "", - "Failed to remove profile": "", - "Failed to save config": "", + "Failed to list cached images": "无法列出缓存镜像", + "Failed to remove profile": "无法删除配置文件", + "Failed to save config": "无法保存配置", "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}": "未能设置 NO_PROXY 环境变量。请使用“export NO_PROXY=$NO_PROXY,{{.ip}}”", - "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "", - "Failed to setup certs": "", - "Failed to setup kubeconfig": "", - "Failed to update cluster": "", - "Failed to update config": "", - "Failed unmount: {{.error}}": "", - "File permissions used for the mount": "", - "Flags": "", - "Follow": "", + "Failed to set NO_PROXY Env. Please use `export NO_PROXY=$NO_PROXY,{{.ip}}`.": "未能设置 NO_PROXY 环境变量。请使用“export NO_PROXY=$NO_PROXY,{{.ip}}”。", + "Failed to setup certs": "设置 certs 失败", + "Failed to setup kubeconfig": "设置 kubeconfig 失败", + "Failed to update cluster": "更新 cluster 失败", + "Failed to update config": "更新 config 失败", + "Failed unmount: {{.error}}": "unmount 失败：{{.error}}", + "File permissions used for the mount": "用于 mount 的文件权限", + "Flags": "标志", + "Follow": "跟踪", "For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/", "For best results, install kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/__1": "为获得最佳结果，请安装 kubectl：https://kubernetes.io/docs/tasks/tools/install-kubectl/", "For more information, see:": "如需了解详情，请参阅：", - "Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "", + "Force environment to be configured for a specified shell: [fish, cmd, powershell, tcsh, bash, zsh], default is auto-detect": "强制为指定的 shell 配置环境：[fish, cmd, powershell, tcsh, bash, zsh]，默认为 auto-detect", "Force minikube to perform possibly dangerous operations": "强制 minikube 执行可能有风险的操作", "Found network options:": "找到的网络选项：", - "Found {{.number}} invalid profile(s) !": "", - "Gets the kubernetes URL(s) for the specified service in your local cluster": "", - "Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "", - "Gets the logs of the running instance, used for debugging minikube, not user code.": "", - "Gets the status of a local kubernetes cluster": "", + "Found {{.number}} invalid profile(s) !": "找到 {{.number}} 个无效的配置文件！", + "Gets the kubernetes URL(s) for the specified service in your local cluster": "获取本地集群中指定服务的 kubernetes URL", + "Gets the kubernetes URL(s) for the specified service in your local cluster. In the case of multiple URLs they will be printed one at a time.": "获取本地集群中指定服务的 kubernetes URL。如果有多个 URL，他们将一次打印一个", + "Gets the logs of the running instance, used for debugging minikube, not user code.": "获取正在运行的实例日志，用于调试 minikube，不是用户代码", + "Gets the status of a local kubernetes cluster": "获取本地 kubernetes 集群状态", "Gets the status of a local kubernetes cluster.\n\tExit status contains the status of minikube's VM, cluster and kubernetes encoded on it's bits in this order from right to left.\n\tEg: 7 meaning: 1 (for minikube NOK) + 2 (for cluster NOK) + 4 (for kubernetes NOK)": "", "Gets the value of PROPERTY_NAME from the minikube config file": "", "Global Flags": "", From c9c4a8fbb93fe3ee8bb00ecd6bffc055b52c297e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Reegn?= Date: Thu, 10 Oct 2019 12:08:11 +0200 Subject: [PATCH 071/106] Replace registry-creds addon ReplicationController with Deployment As the official k8s docs state: > Note: A Deployment that configures a ReplicaSet is now the recommended way to set up replication. https://kubernetes.io/docs/concepts/workloads/controllers/replicationcontroller/ --- .../registry-creds/registry-creds-rc.yaml.tmpl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl b/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl index 2dbc0b4e82..8d3c3f1fd4 100644 --- a/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl +++ b/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl @@ -1,27 +1,24 @@ -apiVersion: v1 -kind: ReplicationController +apiVersion: apps/v1 +kind: Deployment metadata: name: registry-creds namespace: kube-system labels: - version: v1.9 addonmanager.kubernetes.io/mode: Reconcile kubernetes.io/minikube-addons: registry-creds spec: replicas: 1 selector: - name: registry-creds - version: v1.9 - addonmanager.kubernetes.io/mode: Reconcile + matchLabels: + name: registry-creds template: metadata: labels: name: registry-creds - version: v1.9 addonmanager.kubernetes.io/mode: Reconcile spec: containers: - - image: registry.hub.docker.com/upmcenterprises/registry-creds:1.9 + - image: upmcenterprises/registry-creds:1.9 name: registry-creds imagePullPolicy: Always env: From dffa8ec7d899343f7d0dc6625de526ae3792c36a Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 10 Oct 2019 09:40:34 -0700 Subject: [PATCH 072/106] Disable interfacer lint check --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89ace1bfa0..a4ac1844cd 100755 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ GOLINT_GOGC ?= 8 # options for lint (golangci-lint) GOLINT_OPTIONS = --deadline 4m \ --build-tags "${MINIKUBE_INTEGRATION_BUILD_TAGS}" \ - --enable goimports,gocritic,golint,gocyclo,interfacer,misspell,nakedret,stylecheck,unconvert,unparam \ + --enable goimports,gocritic,golint,gocyclo,misspell,nakedret,stylecheck,unconvert,unparam \ --exclude 'variable on range scope.*in function literal|ifElseChain' From 5e71eba5f7916fda512d76fbad54f2f5d3f9fcb8 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 10 Oct 2019 11:30:08 -0700 Subject: [PATCH 073/106] Remove unused enableUpdateNotification variable --- cmd/minikube/cmd/start.go | 17 ++++++++--------- cmd/minikube/cmd/update-check.go | 4 ---- cmd/minikube/cmd/version.go | 4 ---- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index f313c94cc9..21b522eddb 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -120,15 +120,14 @@ const ( ) var ( - registryMirror []string - dockerEnv []string - dockerOpt []string - insecureRegistry []string - apiServerNames []string - addonList []string - apiServerIPs []net.IP - extraOptions cfg.ExtraOptionSlice - enableUpdateNotification = true + registryMirror []string + dockerEnv []string + dockerOpt []string + insecureRegistry []string + apiServerNames []string + addonList []string + apiServerIPs []net.IP + extraOptions cfg.ExtraOptionSlice ) func init() { diff --git a/cmd/minikube/cmd/update-check.go b/cmd/minikube/cmd/update-check.go index 5fab5cfe05..ec519cae35 100644 --- a/cmd/minikube/cmd/update-check.go +++ b/cmd/minikube/cmd/update-check.go @@ -28,10 +28,6 @@ var updateCheckCmd = &cobra.Command{ Use: "update-check", Short: "Print current and latest version number", Long: `Print current and latest version number`, - PersistentPreRun: func(cmd *cobra.Command, args []string) { - // Explicitly disable update checking for the version command - enableUpdateNotification = false - }, Run: func(command *cobra.Command, args []string) { url := notify.GithubMinikubeReleasesURL r, err := notify.GetAllVersionsFromURL(url) diff --git a/cmd/minikube/cmd/version.go b/cmd/minikube/cmd/version.go index a7cb944d0d..00c61efd88 100644 --- a/cmd/minikube/cmd/version.go +++ b/cmd/minikube/cmd/version.go @@ -26,10 +26,6 @@ var versionCmd = &cobra.Command{ Use: "version", Short: "Print the version of minikube", Long: `Print the version of minikube.`, - PersistentPreRun: func(cmd *cobra.Command, args []string) { - // Explicitly disable update checking for the version command - enableUpdateNotification = false - }, Run: func(command *cobra.Command, args []string) { out.Ln("minikube version: %v", version.GetVersion()) gitCommitID := version.GetGitCommitID() From a0c844e07eb8064c637f7a063c48971fb08394e7 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 10 Oct 2019 21:22:17 +0200 Subject: [PATCH 074/106] Refactor --- pkg/minikube/cluster/machine_test.go | 2 +- .../.minikube/machines/p1/config.json | 0 .../.minikube/machines/p2/config.json | 0 .../.minikube/machines/p3_empty_config/config.json | 0 .../.minikube/machines/p4_invalid_machine_config/config.json | 0 .../.minikube/machines/p5_partial_config/config.json | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename pkg/minikube/cluster/testdata/{machine => list-machines}/.minikube/machines/p1/config.json (100%) rename pkg/minikube/cluster/testdata/{machine => list-machines}/.minikube/machines/p2/config.json (100%) rename pkg/minikube/cluster/testdata/{machine => list-machines}/.minikube/machines/p3_empty_config/config.json (100%) rename pkg/minikube/cluster/testdata/{machine => list-machines}/.minikube/machines/p4_invalid_machine_config/config.json (100%) rename pkg/minikube/cluster/testdata/{machine => list-machines}/.minikube/machines/p5_partial_config/config.json (100%) diff --git a/pkg/minikube/cluster/machine_test.go b/pkg/minikube/cluster/machine_test.go index 4f5e253f49..a04f40aa8b 100644 --- a/pkg/minikube/cluster/machine_test.go +++ b/pkg/minikube/cluster/machine_test.go @@ -36,7 +36,7 @@ func TestListMachines(t *testing.T) { viper.Set(config.MachineProfile, "") - testMinikubeDir := "./testdata/machine/.minikube" + testMinikubeDir := "./testdata/list-machines/.minikube" miniDir, err := filepath.Abs(testMinikubeDir) if err != nil { diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json b/pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p1/config.json similarity index 100% rename from pkg/minikube/cluster/testdata/machine/.minikube/machines/p1/config.json rename to pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p1/config.json diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json b/pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p2/config.json similarity index 100% rename from pkg/minikube/cluster/testdata/machine/.minikube/machines/p2/config.json rename to pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p2/config.json diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p3_empty_config/config.json b/pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p3_empty_config/config.json similarity index 100% rename from pkg/minikube/cluster/testdata/machine/.minikube/machines/p3_empty_config/config.json rename to pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p3_empty_config/config.json diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json b/pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p4_invalid_machine_config/config.json similarity index 100% rename from pkg/minikube/cluster/testdata/machine/.minikube/machines/p4_invalid_machine_config/config.json rename to pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p4_invalid_machine_config/config.json diff --git a/pkg/minikube/cluster/testdata/machine/.minikube/machines/p5_partial_config/config.json b/pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p5_partial_config/config.json similarity index 100% rename from pkg/minikube/cluster/testdata/machine/.minikube/machines/p5_partial_config/config.json rename to pkg/minikube/cluster/testdata/list-machines/.minikube/machines/p5_partial_config/config.json From 09ce93faf06ec08c4b17ab302a20a34537daa075 Mon Sep 17 00:00:00 2001 From: Marek Schwarz Date: Thu, 10 Oct 2019 21:32:27 +0200 Subject: [PATCH 075/106] Added delete --all to common.sh Run delete --all after start_stop_delete_test --- hack/jenkins/common.sh | 2 ++ test/integration/start_stop_delete_test.go | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index e48f34e044..c02bdb2cd2 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -108,6 +108,8 @@ for entry in $(ls ${TEST_ROOT}); do sudo rm -Rf "${home}" done + ${MINIKUBE_BIN} delete --all || true + for kconfig in $(find ${entry} -name kubeconfig -type f); do sudo rm -f "${kconfig}" done diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index bf575baeee..1ed1f6b676 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -139,6 +139,11 @@ func TestStartStop(t *testing.T) { if err != nil { t.Errorf("%s failed: %v", rr.Args, err) } + + rr, err = Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) + if err != nil { + t.Errorf("%s failed: %v", rr.Args, err) + } }) } }) From 2cbe4f7b7144ab797798450c11813763c8cddafe Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 10 Oct 2019 13:01:02 -0700 Subject: [PATCH 076/106] Update default Kubernetes version to 1.16.1 --- pkg/minikube/constants/constants.go | 4 ++-- pkg/minikube/constants/constants_darwin.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 3f005e3516..1c61d75e06 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -92,10 +92,10 @@ var DefaultISOURL = fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.i var DefaultISOSHAURL = DefaultISOURL + SHASuffix // DefaultKubernetesVersion is the default kubernetes version -var DefaultKubernetesVersion = "v1.16.0" +var DefaultKubernetesVersion = "v1.16.1" // NewestKubernetesVersion is the newest Kubernetes version to test against -var NewestKubernetesVersion = "v1.16.0" +var NewestKubernetesVersion = "v1.16.1" // OldestKubernetesVersion is the oldest Kubernetes version to test against var OldestKubernetesVersion = "v1.11.10" diff --git a/pkg/minikube/constants/constants_darwin.go b/pkg/minikube/constants/constants_darwin.go index 707f5f9925..29821c8d31 100644 --- a/pkg/minikube/constants/constants_darwin.go +++ b/pkg/minikube/constants/constants_darwin.go @@ -18,6 +18,7 @@ limitations under the License. package constants +// DefaultMountDir is the default mounting directory for Darwin var DefaultMountDir = "/Users" // SupportedVMDrivers is a list of supported drivers on Darwin. From 18966680a604700ea226c538be9a8b33cb16250d Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Thu, 10 Oct 2019 13:25:51 -0700 Subject: [PATCH 077/106] update kubeadm_test with new k8s version --- pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go index 8a880dc49a..f6d696816d 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go @@ -66,7 +66,7 @@ Wants=crio.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.16.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.16.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=/var/run/crio/crio.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=/var/run/crio/crio.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] `, @@ -84,7 +84,7 @@ Wants=containerd.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.16.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.16.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] `, @@ -109,7 +109,7 @@ Wants=containerd.service [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.16.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m +ExecStart=/var/lib/minikube/binaries/v1.16.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --fail-swap-on=false --hostname-override=minikube --image-service-endpoint=unix:///run/containerd/containerd.sock --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.200 --pod-manifest-path=/etc/kubernetes/manifests --runtime-request-timeout=15m [Install] `, @@ -128,7 +128,7 @@ Wants=docker.socket [Service] ExecStart= -ExecStart=/var/lib/minikube/binaries/v1.16.0/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests +ExecStart=/var/lib/minikube/binaries/v1.16.1/kubelet --authorization-mode=Webhook --bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf --cgroup-driver=cgroupfs --client-ca-file=/var/lib/minikube/certs/ca.crt --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --container-runtime=docker --fail-swap-on=false --hostname-override=minikube --kubeconfig=/etc/kubernetes/kubelet.conf --node-ip=192.168.1.100 --pod-infra-container-image=docker-proxy-image.io/google_containers/pause:3.1 --pod-manifest-path=/etc/kubernetes/manifests [Install] `, From 96edacc0a905c6d9707373937142fff1fed43867 Mon Sep 17 00:00:00 2001 From: RickyRajinder Date: Mon, 7 Oct 2019 20:31:06 -0700 Subject: [PATCH 078/106] Changed command runner Fixed test Print error message Change minikube running check to after check if exists Updates Set and adds test for disabling Fix action for minikube not running Fix import order --- cmd/minikube/cmd/config/disable_test.go | 16 ++++++++++- cmd/minikube/cmd/config/enable_test.go | 16 ++++++++++- cmd/minikube/cmd/config/open.go | 5 +++- cmd/minikube/cmd/config/util.go | 37 ++++++++++++++++--------- cmd/minikube/cmd/config/util_test.go | 18 ++++++------ cmd/minikube/cmd/dashboard.go | 4 ++- cmd/minikube/cmd/service.go | 5 +++- go.mod | 1 + pkg/minikube/cluster/cluster.go | 7 +++-- 9 files changed, 79 insertions(+), 30 deletions(-) diff --git a/cmd/minikube/cmd/config/disable_test.go b/cmd/minikube/cmd/config/disable_test.go index 3141605972..dbde3850c7 100644 --- a/cmd/minikube/cmd/config/disable_test.go +++ b/cmd/minikube/cmd/config/disable_test.go @@ -16,10 +16,24 @@ limitations under the License. package config -import "testing" +import ( + "testing" + + "gotest.tools/assert" + pkgConfig "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/localpath" +) func TestDisableUnknownAddon(t *testing.T) { if err := Set("InvalidAddon", "false"); err == nil { t.Fatalf("Disable did not return error for unknown addon") } } + +func TestDisableAddon(t *testing.T) { + if err := Set("dashboard", "false"); err != nil { + t.Fatalf("Disable returned unexpected error: " + err.Error()) + } + config, _ := pkgConfig.ReadConfig(localpath.ConfigFile) + assert.Equal(t, config["dashboard"], false) +} diff --git a/cmd/minikube/cmd/config/enable_test.go b/cmd/minikube/cmd/config/enable_test.go index 007d59516d..28556dc1d8 100644 --- a/cmd/minikube/cmd/config/enable_test.go +++ b/cmd/minikube/cmd/config/enable_test.go @@ -16,10 +16,24 @@ limitations under the License. package config -import "testing" +import ( + "testing" + + "gotest.tools/assert" + pkgConfig "k8s.io/minikube/pkg/minikube/config" + "k8s.io/minikube/pkg/minikube/localpath" +) func TestEnableUnknownAddon(t *testing.T) { if err := Set("InvalidAddon", "false"); err == nil { t.Fatalf("Enable did not return error for unknown addon") } } + +func TestEnableAddon(t *testing.T) { + if err := Set("ingress", "true"); err != nil { + t.Fatalf("Enable returned unexpected error: " + err.Error()) + } + config, _ := pkgConfig.ReadConfig(localpath.ConfigFile) + assert.Equal(t, config["ingress"], true) +} diff --git a/cmd/minikube/cmd/config/open.go b/cmd/minikube/cmd/config/open.go index b8becfbfea..8a852729ce 100644 --- a/cmd/minikube/cmd/config/open.go +++ b/cmd/minikube/cmd/config/open.go @@ -17,6 +17,7 @@ limitations under the License. package config import ( + "os" "text/template" "github.com/spf13/cobra" @@ -62,7 +63,9 @@ var addonsOpenCmd = &cobra.Command{ } defer api.Close() - cluster.EnsureMinikubeRunningOrExit(api, 1) + if !cluster.IsMinikubeRunning(api) { + os.Exit(1) + } addon, ok := assets.Addons[addonName] // validate addon input if !ok { exit.WithCodeT(exit.Data, `addon '{{.name}}' is not a valid addon packaged with minikube. diff --git a/cmd/minikube/cmd/config/util.go b/cmd/minikube/cmd/config/util.go index d103ba36ea..e7e5134e46 100644 --- a/cmd/minikube/cmd/config/util.go +++ b/cmd/minikube/cmd/config/util.go @@ -111,6 +111,18 @@ func EnableOrDisableAddon(name string, val string) error { if err != nil { return errors.Wrapf(err, "parsing bool: %s", name) } + addon := assets.Addons[name] + + // check addon status before enabling/disabling it + alreadySet, err := isAddonAlreadySet(addon, enable) + if err != nil { + out.ErrT(out.Conflict, "{{.error}}", out.V{"error": err}) + return err + } + //if addon is already enabled or disabled, do nothing + if alreadySet { + return nil + } // TODO(r2d4): config package should not reference API, pull this out api, err := machine.NewAPIClient() @@ -118,13 +130,18 @@ func EnableOrDisableAddon(name string, val string) error { return errors.Wrap(err, "machine client") } defer api.Close() - cluster.EnsureMinikubeRunningOrExit(api, 0) - addon := assets.Addons[name] + //if minikube is not running, we return and simply update the value in the addon + //config and rewrite the file + if !cluster.IsMinikubeRunning(api) { + return nil + } + host, err := cluster.CheckIfHostExistsAndLoad(api, config.GetMachineName()) if err != nil { return errors.Wrap(err, "getting host") } + cmd, err := machine.CommandRunner(host) if err != nil { return errors.Wrap(err, "command runner") @@ -139,30 +156,24 @@ func EnableOrDisableAddon(name string, val string) error { return enableOrDisableAddonInternal(addon, cmd, data, enable) } -func isAddonAlreadySet(addon *assets.Addon, enable bool) error { - +func isAddonAlreadySet(addon *assets.Addon, enable bool) (bool, error) { addonStatus, err := addon.IsEnabled() if err != nil { - return errors.Wrap(err, "get the addon status") + return false, errors.Wrap(err, "get the addon status") } if addonStatus && enable { - return fmt.Errorf("addon %s was already enabled", addon.Name()) + return true, nil } else if !addonStatus && !enable { - return fmt.Errorf("addon %s was already disabled", addon.Name()) + return true, nil } - return nil + return false, nil } func enableOrDisableAddonInternal(addon *assets.Addon, cmd command.Runner, data interface{}, enable bool) error { var err error - // check addon status before enabling/disabling it - if err := isAddonAlreadySet(addon, enable); err != nil { - out.ErrT(out.Conflict, "{{.error}}", out.V{"error": err}) - os.Exit(0) - } if enable { for _, addon := range addon.Assets { diff --git a/cmd/minikube/cmd/config/util_test.go b/cmd/minikube/cmd/config/util_test.go index 3cbab76a38..ca1faa86d4 100644 --- a/cmd/minikube/cmd/config/util_test.go +++ b/cmd/minikube/cmd/config/util_test.go @@ -85,15 +85,12 @@ func TestSetBool(t *testing.T) { func TestIsAddonAlreadySet(t *testing.T) { testCases := []struct { addonName string - expectErr string }{ { addonName: "ingress", - expectErr: "addon ingress was already ", }, { addonName: "heapster", - expectErr: "addon heapster was already ", }, } @@ -101,13 +98,16 @@ func TestIsAddonAlreadySet(t *testing.T) { addon := assets.Addons[test.addonName] addonStatus, _ := addon.IsEnabled() - expectMsg := test.expectErr + "enabled" - if !addonStatus { - expectMsg = test.expectErr + "disabled" + alreadySet, err := isAddonAlreadySet(addon, addonStatus) + if !alreadySet { + if addonStatus { + t.Errorf("Did not get expected status, \n\n expected %+v already enabled", test.addonName) + } else { + t.Errorf("Did not get expected status, \n\n expected %+v already disabled", test.addonName) + } } - err := isAddonAlreadySet(addon, addonStatus) - if err.Error() != expectMsg { - t.Errorf("Did not get expected error, \n\n expected: %+v \n\n actual: %+v", expectMsg, err) + if err != nil { + t.Errorf("Got unexpected error: %+v", err) } } } diff --git a/cmd/minikube/cmd/dashboard.go b/cmd/minikube/cmd/dashboard.go index 4908e319f1..27a472d80b 100644 --- a/cmd/minikube/cmd/dashboard.go +++ b/cmd/minikube/cmd/dashboard.go @@ -93,7 +93,9 @@ var dashboardCmd = &cobra.Command{ exit.WithCodeT(exit.NoInput, "kubectl not found in PATH, but is required for the dashboard. Installation guide: https://kubernetes.io/docs/tasks/tools/install-kubectl/") } - cluster.EnsureMinikubeRunningOrExit(api, 1) + if !cluster.IsMinikubeRunning(api) { + os.Exit(1) + } // Check dashboard status before enabling it dashboardAddon := assets.Addons["dashboard"] diff --git a/cmd/minikube/cmd/service.go b/cmd/minikube/cmd/service.go index d550c736a7..d0068a23da 100644 --- a/cmd/minikube/cmd/service.go +++ b/cmd/minikube/cmd/service.go @@ -17,6 +17,7 @@ limitations under the License. package cmd import ( + "os" "text/template" "github.com/spf13/cobra" @@ -64,7 +65,9 @@ var serviceCmd = &cobra.Command{ } defer api.Close() - cluster.EnsureMinikubeRunningOrExit(api, 1) + if !cluster.IsMinikubeRunning(api) { + os.Exit(1) + } err = service.WaitAndMaybeOpenService(api, namespace, svc, serviceURLTemplate, serviceURLMode, https, wait, interval) if err != nil { diff --git a/go.mod b/go.mod index 80bd0d2055..77e516b0be 100644 --- a/go.mod +++ b/go.mod @@ -76,6 +76,7 @@ require ( gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect + gotest.tools v2.2.0+incompatible k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/client-go v0.0.0 diff --git a/pkg/minikube/cluster/cluster.go b/pkg/minikube/cluster/cluster.go index 96f8e45b7a..84e43632fa 100644 --- a/pkg/minikube/cluster/cluster.go +++ b/pkg/minikube/cluster/cluster.go @@ -604,12 +604,13 @@ func CreateSSHShell(api libmachine.API, args []string) error { // EnsureMinikubeRunningOrExit checks that minikube has a status available and that // the status is `Running`, otherwise it will exit -func EnsureMinikubeRunningOrExit(api libmachine.API, exitStatus int) { +func IsMinikubeRunning(api libmachine.API) bool { s, err := GetHostStatus(api) if err != nil { - exit.WithError("Error getting machine status", err) + return false } if s != state.Running.String() { - exit.WithCodeT(exit.Unavailable, "minikube is not running, so the service cannot be accessed") + return false } + return true } From f39ecda4cb1d589a22d03e1cbaff946d411351bc Mon Sep 17 00:00:00 2001 From: Josh Woodcock Date: Fri, 11 Oct 2019 09:43:00 -0500 Subject: [PATCH 079/106] Add tests for addons custom output format --- cmd/minikube/cmd/config/addons_list.go | 6 +++- test/integration/functional_test.go | 48 ++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/config/addons_list.go b/cmd/minikube/cmd/config/addons_list.go index ddc207ae08..3a3b50ac05 100644 --- a/cmd/minikube/cmd/config/addons_list.go +++ b/cmd/minikube/cmd/config/addons_list.go @@ -52,7 +52,11 @@ var addonsListCmd = &cobra.Command{ } func init() { - addonsListCmd.Flags().StringVar(&addonListFormat, "format", defaultAddonListFormat, + addonsListCmd.Flags().StringVarP( + &addonListFormat, + "format", + "f", + defaultAddonListFormat, `Go template format string for the addon list output. The format for Go templates can be found here: https://golang.org/pkg/text/template/ For the list of accessible variables for the template, see the struct values here: https://godoc.org/k8s.io/minikube/cmd/minikube/cmd/config#AddonListTemplate`) AddonsCmd.AddCommand(addonsListCmd) diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 69a8864e93..7db6a99411 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -29,6 +29,7 @@ import ( "os" "os/exec" "path/filepath" + "regexp" "strings" "testing" "time" @@ -87,6 +88,7 @@ func TestFunctional(t *testing.T) { {"MountCmd", validateMountCmd}, {"ProfileCmd", validateProfileCmd}, {"ServicesCmd", validateServicesCmd}, + {"AddonsCmd", validateAddonsCmd}, {"PersistentVolumeClaim", validatePersistentVolumeClaim}, {"TunnelCmd", validateTunnelCmd}, {"SSHCmd", validateSSHCmd}, @@ -314,6 +316,52 @@ func validateServicesCmd(ctx context.Context, t *testing.T, profile string) { } } +// validateAddonsCmd asserts basic "addon" command functionality +func validateAddonsCmd(ctx context.Context, t *testing.T, profile string) { + + // Default output + rr, err := Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list")) + if err != nil { + t.Errorf("%s failed: %v", rr.Args, err) + } + listLines := strings.Split(strings.TrimSpace(rr.Stdout.String()), "\n") + r := regexp.MustCompile(`-\s[a-z|-]+:\s(enabled|disabled)`) + for _, line := range listLines { + match := r.MatchString(line) + if !match { + t.Errorf("Plugin output did not match expected format. Got: %s", line) + } + } + + // Custom format + rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list", "--format", `"{{.AddonName}}":"{{.AddonStatus}}"`)) + if err != nil { + t.Errorf("%s failed: %v", rr.Args, err) + } + listLines = strings.Split(strings.TrimSpace(rr.Stdout.String()), "\n") + r = regexp.MustCompile(`"[a-z|-]+":"(enabled|disabled)"`) + for _, line := range listLines { + match := r.MatchString(line) + if !match { + t.Errorf("Plugin output did not match expected custom format. Got: %s", line) + } + } + + // Custom format shorthand + rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "list", "-f", `"{{.AddonName}}":"{{.AddonStatus}}"`)) + if err != nil { + t.Errorf("%s failed: %v", rr.Args, err) + } + listLines = strings.Split(strings.TrimSpace(rr.Stdout.String()), "\n") + r = regexp.MustCompile(`"[a-z|-]+":"(enabled|disabled)"`) + for _, line := range listLines { + match := r.MatchString(line) + if !match { + t.Errorf("Plugin output did not match expected custom format. Got: %s", line) + } + } +} + // validateSSHCmd asserts basic "ssh" command functionality func validateSSHCmd(ctx context.Context, t *testing.T, profile string) { if NoneDriver() { From 45bae85cdbcfcc74420e173a5f0eec518d6bb4b8 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 11 Oct 2019 12:45:33 -0700 Subject: [PATCH 080/106] Update Makefile for version 1.4.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 42bfe174ee..fcbd24ce16 100755 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # Bump these on release - and please check ISO_VERSION for correctness. VERSION_MAJOR ?= 1 VERSION_MINOR ?= 4 -VERSION_BUILD ?= 0 +VERSION_BUILD ?= 1 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).${VERSION_BUILD} VERSION ?= v$(RAW_VERSION) From b237471a172c17c323c53802e00a1f00b848e684 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Sat, 12 Oct 2019 12:25:53 +1100 Subject: [PATCH 081/106] add some tests to translate pkg --- pkg/minikube/translate/translate_test.go | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/pkg/minikube/translate/translate_test.go b/pkg/minikube/translate/translate_test.go index 00c4411810..fd7a73cf64 100644 --- a/pkg/minikube/translate/translate_test.go +++ b/pkg/minikube/translate/translate_test.go @@ -51,3 +51,53 @@ func TestSetPreferredLanguage(t *testing.T) { } } + +func TestT(t *testing.T) { + var tests = []struct { + description, input, expected string + langDef, langPref language.Tag + translations map[string]interface{} + }{ + { + description: "empty string not default language", + input: "", + expected: "", + langPref: language.English, + langDef: language.Lithuanian, + }, + { + description: "empty string and default language", + input: "", + expected: "", + langPref: language.English, + langDef: language.English, + }, + { + description: "existing translation", + input: "cat", + expected: "kot", + langPref: language.Lithuanian, + langDef: language.English, + translations: map[string]interface{}{"cat": "kot"}, + }, + { + description: "not existing translation", + input: "cat", + expected: "cat", + langPref: language.Lithuanian, + langDef: language.English, + translations: map[string]interface{}{"dog": "pies"}, + }, + } + for _, test := range tests { + t.Run(test.description, func(t *testing.T) { + defaultLanguage = test.langDef + preferredLanguage = test.langPref + Translations = test.translations + got := T(test.input) + if test.expected != got { + t.Errorf("T(%v) shoud return %v, but got: %v", test.input, test.expected, got) + } + }) + } +} From 3dff822e8bd956b92d008096273d393e91e08f40 Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Sat, 12 Oct 2019 12:43:59 +1100 Subject: [PATCH 082/106] remove single test due to discussion on GH --- pkg/minikube/machine/cache_binaries_test.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkg/minikube/machine/cache_binaries_test.go b/pkg/minikube/machine/cache_binaries_test.go index b522de6976..6ccaf2e3f7 100644 --- a/pkg/minikube/machine/cache_binaries_test.go +++ b/pkg/minikube/machine/cache_binaries_test.go @@ -128,11 +128,6 @@ func TestCacheBinary(t *testing.T) { t.Fatalf("error (%v) during changing permissions of dir %v", err, noWritePermDir) } - // noPermsDir is directory owned by root. Regular user is not able to write to it. - noPermsDir := "/etc" - if runtime.GOOS == "windows" { - noPermsDir = "C:\\Windows\\System32" - } var tc = []struct { desc, version, osName, archName string minikubeHome, binary, description string @@ -147,15 +142,6 @@ func TestCacheBinary(t *testing.T) { err: false, minikubeHome: minikubeHome, }, - { - desc: "minikube home is pointing to dir without perms", - version: "v1.16.0", - osName: runtime.GOOS, - archName: "arm", - binary: "kubectl", - err: true, - minikubeHome: noPermsDir, - }, { desc: "minikube home in dir without perms and arm runtime", version: "v1.16.0", From 95436360bde6fbfbcec4ef83331adcb3dc3ecce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 13 Oct 2019 13:46:58 +0200 Subject: [PATCH 083/106] Add docker-init binary to package, bundled tini --- deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk index 4b43ce0c68..c212f07b85 100644 --- a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk +++ b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk @@ -27,6 +27,10 @@ define DOCKER_BIN_INSTALL_TARGET_CMDS $(@D)/dockerd \ $(TARGET_DIR)/bin/dockerd + $(INSTALL) -D -m 0755 \ + $(@D)/docker-init \ + $(TARGET_DIR)/bin/docker-init + $(INSTALL) -D -m 0755 \ $(@D)/docker-proxy \ $(TARGET_DIR)/bin/docker-proxy From e824b714c0788b9689101203b5a3ad26283d37b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 13 Oct 2019 15:01:03 +0200 Subject: [PATCH 084/106] Disable go modules for containerd, for newer go It worked for go1.10, but not really for go1.11 --- deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk index 9a8072fb81..85ec682257 100644 --- a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk +++ b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk @@ -11,6 +11,7 @@ CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme CONTAINERD_BIN_GOPATH = $(@D)/_output CONTAINERD_BIN_ENV = \ CGO_ENABLED=1 \ + GO111MODULE=off \ GOPATH="$(CONTAINERD_BIN_GOPATH)" \ GOBIN="$(CONTAINERD_BIN_GOPATH)/bin" \ PATH=$(CONTAINERD_BIN_GOPATH)/bin:$(BR_PATH) From 2e20dddc4aab3ac8c6f7ff09f8a200bfa9c70ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 13 Oct 2019 15:06:33 +0200 Subject: [PATCH 085/106] Upgrade Buildroot to 2019.02 and VirtualBox to 5.2 New major version of Buildroot, with new Linux kernel. Both are LTS versions, and are supported until 2020. Buildroot is upgraded from 2018.05 to 2019.02 LTS, and Linux from 4.15 to 4.19 LTS as included in BR2. Also upgrade VirtualBox to the supported 5.2 version of the older branch, so that it will work everywhere. Need to remove the legacy symlink for crio.sock from the image, since it was causing build time issues... --- Makefile | 4 ++-- .../board/coreos/minikube/rootfs-overlay/var/run/crio.sock | 1 - .../coreos/minikube/rootfs-overlay/var/run/crio/.empty | 0 deploy/iso/minikube-iso/configs/minikube_defconfig | 4 +--- .../minikube-iso/package/hyperv-daemons/hyperv-daemons.mk | 4 ++-- deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash | 3 +++ deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) delete mode 120000 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock delete mode 100644 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty diff --git a/Makefile b/Makefile index fcbd24ce16..f4efa1dfdb 100755 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ RPM_VERSION ?= $(DEB_VERSION) GO_VERSION ?= 1.12.9 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) -BUILDROOT_BRANCH ?= 2018.05.3 +BUILDROOT_BRANCH ?= 2019.02.6 REGISTRY?=gcr.io/k8s-minikube # Get git commit id @@ -49,7 +49,7 @@ MINIKUBE_BUCKET ?= minikube/releases MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET} MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download -KERNEL_VERSION ?= 4.15 +KERNEL_VERSION ?= 4.19.76 # latest from https://github.com/golangci/golangci-lint/releases GOLINT_VERSION ?= v1.20.0 # Limit number of default jobs, to avoid the CI builds running out of memory diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock deleted file mode 120000 index 2c31ff8a45..0000000000 --- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio.sock +++ /dev/null @@ -1 +0,0 @@ -crio/crio.sock \ No newline at end of file diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/run/crio/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/deploy/iso/minikube-iso/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig index 01010e85da..abcb1c8491 100644 --- a/deploy/iso/minikube-iso/configs/minikube_defconfig +++ b/deploy/iso/minikube-iso/configs/minikube_defconfig @@ -3,7 +3,7 @@ BR2_CCACHE=y BR2_OPTIMIZE_2=y BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube" BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_BINUTILS_VERSION_2_30_X=y BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y @@ -18,8 +18,6 @@ BR2_SYSTEM_BIN_SH_BASH=y BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/users" BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/rootfs-overlay" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_MINIKUBE_PATH)/board/coreos/minikube/linux_defconfig" BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y diff --git a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk index a069741c65..c6f87675be 100644 --- a/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk +++ b/deploy/iso/minikube-iso/package/hyperv-daemons/hyperv-daemons.mk @@ -4,8 +4,8 @@ # ################################################################################ -HYPERV_DAEMONS_VERSION = 4.15.1 -HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v${HYPERV_DAEMONS_VERSION%%.*}.x +HYPERV_DAEMONS_VERSION = 4.19.76 +HYPERV_DAEMONS_SITE = https://www.kernel.org/pub/linux/kernel/v4.x HYPERV_DAEMONS_SOURCE = linux-$(HYPERV_DAEMONS_VERSION).tar.xz define HYPERV_DAEMONS_BUILD_CMDS diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash index 191a7c833d..f8dd11fe31 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash @@ -1,3 +1,6 @@ # From http://download.virtualbox.org/virtualbox/5.1.30/SHA256SUMS sha256 96cab2296fb014ce0a16b7b9603b52208b9403c10c1524b44201d3c274e8a821 VirtualBox-5.1.38.tar.bz2 sha256 0e7ee2c78ebf7cd0d3a933d51148bef04a64f64fb27ccf70d59cddf9ca1e517a VBoxGuestAdditions_5.1.38.iso +# From http://download.virtualbox.org/virtualbox/5.2.32/SHA256SUMS +sha256 ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958 VirtualBox-5.2.32.tar.bz2 +sha256 4311c7408a3410e6a33264a9062347d9eec04f58339a49f0a60488c0cabc8996 VBoxGuestAdditions_5.2.32.iso diff --git a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk index 63b9bcea5a..7b092b8695 100644 --- a/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk +++ b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk @@ -4,7 +4,7 @@ # ################################################################################ -VBOX_GUEST_VERSION = 5.1.38 +VBOX_GUEST_VERSION = 5.2.32 VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION) VBOX_GUEST_LICENSE = GPLv2 VBOX_GUEST_LICENSE_FILES = COPYING @@ -12,7 +12,7 @@ VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2 VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso define VBOX_GUEST_EXPORT_MODULES - ( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz ) + ( cd $(@D)/src/VBox/Additions/linux; ./export_modules.sh modules.tar.gz ) mkdir -p $(@D)/vbox-modules tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz endef @@ -20,7 +20,7 @@ endef VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES VBOX_GUEST_MODULE_SUBDIRS = vbox-modules/ -VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) +VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) KERN_DIR=$(LINUX_DIR) define VBOX_GUEST_USERS - -1 vboxsf -1 - - - - - From 8bf56f0d6cd0e458fb6b6e6448cb0c97d00661dd Mon Sep 17 00:00:00 2001 From: Alexandre Fiori Date: Sun, 13 Oct 2019 18:57:17 +0100 Subject: [PATCH 086/106] Add docs for using registry on macOS --- .../en/docs/Tasks/Registry/insecure.md | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/site/content/en/docs/Tasks/Registry/insecure.md b/site/content/en/docs/Tasks/Registry/insecure.md index aceba59e66..0ccf967899 100644 --- a/site/content/en/docs/Tasks/Registry/insecure.md +++ b/site/content/en/docs/Tasks/Registry/insecure.md @@ -15,3 +15,30 @@ You can use the `--insecure-registry` flag on the One nifty hack is to allow the kubelet running in minikube to talk to registries deployed inside a pod in the cluster without backing them with TLS certificates. Because the default service cluster IP is known to be available at 10.0.0.1, users can pull images from registries deployed inside the cluster by creating the cluster with `minikube start --insecure-registry "10.0.0.0/24"`. + +### docker on macOS + +Quick guide for configuring minikube and docker on macOS, enabling docker to push images to minikube's registry. + +The first step is to enable the registry addon: + +``` +minikube addons enable registry +``` + +When enabled, the registry addon exposes its port 5000 on the minikube's virtual machine. + +In order to make docker accept pushing images to this registry, we have to redirect port 5000 on the docker virtual machine over to port 5000 on the minikube machine. We can (ab)use docker's network configuration to instantiate a container on the docker's host, and run socat there: + +``` +docker run --rm -it --network=host alpine ash -c "apk add socat && socat TCP-LISTEN:5000,reuseaddr,fork TCP:$(minikube ip):5000" +``` + +Once socat is running it's possible to push images to the minikube registry: + +``` +docker tag my/image localhost:5000/myimage +docker push localhost:5000/myimage +``` + +After the image is pushed, refer to it by `localhost:5000/{name}` in kubectl specs. From 88ea55df49c0d7309536fce300a4df6fff2c25dc Mon Sep 17 00:00:00 2001 From: Josh Woodcock Date: Sun, 13 Oct 2019 18:04:06 -0500 Subject: [PATCH 087/106] Performance and security enhancment for ingress-dns addon --- .../ingress-dns/ingress-dns-configmap.yaml | 51 ---- .../ingress-dns-nginx-pod.yaml.tmpl | 229 ------------------ ...s-server-pod.yaml => ingress-dns-pod.yaml} | 31 +-- .../addons/ingress-dns/ingress-dns-svc.yaml | 37 --- pkg/minikube/assets/addons.go | 22 +- 5 files changed, 13 insertions(+), 357 deletions(-) delete mode 100644 deploy/addons/ingress-dns/ingress-dns-configmap.yaml delete mode 100644 deploy/addons/ingress-dns/ingress-dns-nginx-pod.yaml.tmpl rename deploy/addons/ingress-dns/{ingress-dns-dns-server-pod.yaml => ingress-dns-pod.yaml} (81%) delete mode 100644 deploy/addons/ingress-dns/ingress-dns-svc.yaml diff --git a/deploy/addons/ingress-dns/ingress-dns-configmap.yaml b/deploy/addons/ingress-dns/ingress-dns-configmap.yaml deleted file mode 100644 index 4e2fb5a6e1..0000000000 --- a/deploy/addons/ingress-dns/ingress-dns-configmap.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# 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. - ---- -apiVersion: v1 -data: - map-hash-bucket-size: "128" - hsts: "false" -kind: ConfigMap -metadata: - name: minikube-ingress-dns-nginx-load-balancer-conf - namespace: kube-system - labels: - app: minikube-ingress-dns - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: minikube-ingress-dns-tcp-services - namespace: kube-system - labels: - app: minikube-ingress-dns - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -data: - 53: "kube-system/kube-ingress-dns-minikube:5353" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: minikube-ingress-dns-udp-services - namespace: kube-system - labels: - app: minikube-ingress-dns - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -data: - 53: "kube-system/kube-ingress-dns-minikube:5353" \ No newline at end of file diff --git a/deploy/addons/ingress-dns/ingress-dns-nginx-pod.yaml.tmpl b/deploy/addons/ingress-dns/ingress-dns-nginx-pod.yaml.tmpl deleted file mode 100644 index 33900b6198..0000000000 --- a/deploy/addons/ingress-dns/ingress-dns-nginx-pod.yaml.tmpl +++ /dev/null @@ -1,229 +0,0 @@ -# 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. - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: minikube-ingress-dns-nginx-ingress - namespace: kube-system - labels: - kubernetes.io/bootstrapping: rbac-defaults - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: Reconcile ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRole -metadata: - name: system:minikube-ingress-dns-nginx-ingress - labels: - kubernetes.io/bootstrapping: rbac-defaults - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: Reconcile -rules: - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - nodes - - pods - - secrets - verbs: - - list - - watch - - apiGroups: - - "" - resources: - - nodes - verbs: - - get - - apiGroups: - - "" - resources: - - services - verbs: - - get - - list - - watch - - apiGroups: - - "extensions" - - "networking.k8s.io" - resources: - - ingresses - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - - apiGroups: - - "extensions" - - "networking.k8s.io" - resources: - - ingresses/status - verbs: - - update ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: Role -metadata: - name: system::minikube-ingress-dns-nginx-ingress-role - namespace: kube-system - labels: - kubernetes.io/bootstrapping: rbac-defaults - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: Reconcile -rules: - - apiGroups: - - "" - resources: - - configmaps - - pods - - secrets - - namespaces - verbs: - - get - - apiGroups: - - "" - resources: - - configmaps - resourceNames: - # Defaults to "-" - # Here: "-" - # This has to be adapted if you change either parameter - # when launching the nginx-ingress-controller. - - ingress-controller-leader-nginx - verbs: - - get - - update - - apiGroups: - - "" - resources: - - configmaps - verbs: - - create - - apiGroups: - - "" - resources: - - endpoints - verbs: - - get ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: RoleBinding -metadata: - name: system::minikube-ingress-dns-nginx-ingress-role-binding - namespace: kube-system - labels: - kubernetes.io/bootstrapping: rbac-defaults - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: system::minikube-ingress-dns-nginx-ingress-role -subjects: - - kind: ServiceAccount - name: minikube-ingress-dns-nginx-ingress - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1beta1 -kind: ClusterRoleBinding -metadata: - name: system:minikube-ingress-dns-nginx-ingress - labels: - kubernetes.io/bootstrapping: rbac-defaults - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: system:minikube-ingress-dns-nginx-ingress -subjects: - - kind: ServiceAccount - name: minikube-ingress-dns-nginx-ingress - namespace: kube-system ---- -apiVersion: v1 -kind: Pod -metadata: - name: minikube-ingress-dns-nginx-ingress-controller - namespace: kube-system - labels: - app: minikube-ingress-dns-nginx-ingress-controller - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -spec: - serviceAccountName: minikube-ingress-dns-nginx-ingress - terminationGracePeriodSeconds: 60 - hostNetwork: true - containers: - - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller{{.ExoticArch}}:0.26.1 - name: nginx-ingress-controller - imagePullPolicy: IfNotPresent - readinessProbe: - httpGet: - path: /healthz - port: 10254 - scheme: HTTP - livenessProbe: - httpGet: - path: /healthz - port: 10254 - scheme: HTTP - initialDelaySeconds: 10 - timeoutSeconds: 1 - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - ports: - - containerPort: 53 - hostPort: 53 - - containerPort: 8008 - - containerPort: 4333 - args: - - /nginx-ingress-controller - - --configmap=$(POD_NAMESPACE)/minikube-ingress-dns-nginx-load-balancer-conf - - --tcp-services-configmap=$(POD_NAMESPACE)/minikube-ingress-dns-tcp-services - - --udp-services-configmap=$(POD_NAMESPACE)/minikube-ingress-dns-udp-services - - --annotations-prefix=nginx.ingress.kubernetes.io - - --http-port=8008 - - --https-port=4333 - # use minikube IP address in ingress status field - - --report-node-internal-ip-address - securityContext: - capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - # www-data -> 33 - runAsUser: 33 \ No newline at end of file diff --git a/deploy/addons/ingress-dns/ingress-dns-dns-server-pod.yaml b/deploy/addons/ingress-dns/ingress-dns-pod.yaml similarity index 81% rename from deploy/addons/ingress-dns/ingress-dns-dns-server-pod.yaml rename to deploy/addons/ingress-dns/ingress-dns-pod.yaml index aaaea7425b..5c16e12c01 100644 --- a/deploy/addons/ingress-dns/ingress-dns-dns-server-pod.yaml +++ b/deploy/addons/ingress-dns/ingress-dns-pod.yaml @@ -35,16 +35,6 @@ metadata: app.kubernetes.io/part-of: kube-system addonmanager.kubernetes.io/mode: Reconcile rules: - - apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - patch - resourceNames: - - tcp-services - - udp-services - apiGroups: - "" - "extensions" @@ -65,11 +55,11 @@ metadata: app: minikube-ingress-dns kubernetes.io/bootstrapping: rbac-defaults app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists + addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: cluster-admin + name: minikube-ingress-dns subjects: - kind: ServiceAccount name: minikube-ingress-dns @@ -83,20 +73,21 @@ metadata: labels: app: minikube-ingress-dns app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists + addonmanager.kubernetes.io/mode: Reconcile spec: serviceAccountName: minikube-ingress-dns + hostNetwork: true containers: - name: minikube-ingress-dns - image: "cryptexlabs/minikube-ingress-dns:0.1.1" + image: "cryptexlabs/minikube-ingress-dns:0.2.0" imagePullPolicy: IfNotPresent ports: - - containerPort: 5353 - hostPort: 5353 - protocol: TCP - - containerPort: 5353 - hostPort: 5353 + - containerPort: 53 protocol: UDP env: - name: DNS_PORT - value: "5353" \ No newline at end of file + value: "53" + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP \ No newline at end of file diff --git a/deploy/addons/ingress-dns/ingress-dns-svc.yaml b/deploy/addons/ingress-dns/ingress-dns-svc.yaml deleted file mode 100644 index 41187d95d8..0000000000 --- a/deploy/addons/ingress-dns/ingress-dns-svc.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# 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. - ---- -apiVersion: v1 -kind: Service -metadata: - name: kube-ingress-dns-minikube - namespace: kube-system - labels: - app: minikube-ingress-dns - app.kubernetes.io/part-of: kube-system - addonmanager.kubernetes.io/mode: EnsureExists -spec: - selector: - app: minikube-ingress-dns - clusterIP: None - ports: - - name: tcp-port - port: 5353 - targetPort: 5353 - protocol: TCP - - name: udp-port - port: 5353 - targetPort: 5353 - protocol: UDP \ No newline at end of file diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index f2c73b9813..18cfd22251 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -350,27 +350,9 @@ var Addons = map[string]*Addon{ }, false, "helm-tiller"), "ingress-dns": NewAddon([]*BinAsset{ MustBinAsset( - "deploy/addons/ingress-dns/ingress-dns-configmap.yaml", + "deploy/addons/ingress-dns/ingress-dns-pod.yaml", vmpath.GuestAddonsDir, - "ingress-dns-configmap.yaml", - "0640", - false), - MustBinAsset( - "deploy/addons/ingress-dns/ingress-dns-dns-server-pod.yaml", - vmpath.GuestAddonsDir, - "ingress-dns-dns-server-pod.yaml", - "0640", - false), - MustBinAsset( - "deploy/addons/ingress-dns/ingress-dns-nginx-pod.yaml.tmpl", - vmpath.GuestAddonsDir, - "ingress-dns-nginx-pod.yaml", - "0640", - true), - MustBinAsset( - "deploy/addons/ingress-dns/ingress-dns-svc.yaml", - vmpath.GuestAddonsDir, - "ingress-dns-svc.yaml", + "ingress-dns-pod.yaml", "0640", false), }, false, "ingress-dns"), From 47d558123da4efeec3eed9a8ba1521a4c04bcd6b Mon Sep 17 00:00:00 2001 From: tstromberg Date: Mon, 14 Oct 2019 09:06:31 -0700 Subject: [PATCH 088/106] gsutil: Remove trailing slashes, rsync instead of cp --- hack/jenkins/minikube_cross_build_and_upload.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index eb510d578a..8137cf5934 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -63,4 +63,9 @@ cp -r test/integration/testdata out/ # Don't upload the buildroot artifacts if they exist rm -r out/buildroot || true -gsutil -m cp -r out/ "gs://${bucket}/${ghprbPullId}/" +# At this point, the out directory contains the jenkins scripts (populated by jenkins), +# testdata, and our build output. Push the changes to GCS so that worker nodes can re-use them. + +# -d: delete remote files that don't exist (removed test files, for instance) +# -J: gzip compression +gsutil -m rsync -dJ out "gs://${bucket}/${ghprbPullId}" From 2a5174ad4140390847d0c166383154ba0985923d Mon Sep 17 00:00:00 2001 From: tstromberg Date: Mon, 14 Oct 2019 12:12:48 -0700 Subject: [PATCH 089/106] rsync needs -R, add version output --- hack/jenkins/common.sh | 1 + hack/jenkins/minikube_cross_build_and_upload.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 25c12d8b40..fc20c22cb2 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -82,6 +82,7 @@ gsutil -qm cp "gs://minikube-builds/${MINIKUBE_LOCATION}/gvisor-addon" testdata/ export MINIKUBE_BIN="out/minikube-${OS_ARCH}" export E2E_BIN="out/e2e-${OS_ARCH}" chmod +x "${MINIKUBE_BIN}" "${E2E_BIN}" out/docker-machine-driver-* +"${MINIKUBE_BIN}" version procs=$(pgrep "minikube-${OS_ARCH}|e2e-${OS_ARCH}" || true) if [[ "${procs}" != "" ]]; then diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index 8137cf5934..f95e9b0eae 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -40,6 +40,7 @@ declare -rx TAG="${ghprbActualCommit}" docker kill $(docker ps -q) || true docker rm $(docker ps -aq) || true make -j 16 all && failed=$? || failed=$? +"out/minikube-${OS_ARCH}" version gsutil cp "gs://${bucket}/logs/index.html" \ "gs://${bucket}/logs/${ghprbPullId}/index.html" @@ -58,6 +59,7 @@ if [[ "${rebuild}" -eq 1 ]]; then make release-iso fi + cp -r test/integration/testdata out/ # Don't upload the buildroot artifacts if they exist @@ -68,4 +70,5 @@ rm -r out/buildroot || true # -d: delete remote files that don't exist (removed test files, for instance) # -J: gzip compression -gsutil -m rsync -dJ out "gs://${bucket}/${ghprbPullId}" +# -R: recursive. strangely, this is not the default for sync. +gsutil -m rsync -dJR out "gs://${bucket}/${ghprbPullId}" From 7ef46540874e636a09bc3f07f4f3d620aebb05bf Mon Sep 17 00:00:00 2001 From: Cornelius Weig Date: Mon, 14 Oct 2019 23:16:01 +0200 Subject: [PATCH 090/106] Delegate release notes to external tool --- hack/.gitignore | 1 + hack/release_notes.sh | 18 ++++- hack/release_notes/listpullreqs.go | 109 ----------------------------- 3 files changed, 18 insertions(+), 110 deletions(-) create mode 100644 hack/.gitignore delete mode 100644 hack/release_notes/listpullreqs.go diff --git a/hack/.gitignore b/hack/.gitignore new file mode 100644 index 0000000000..6168f032c4 --- /dev/null +++ b/hack/.gitignore @@ -0,0 +1 @@ +release-notes diff --git a/hack/release_notes.sh b/hack/release_notes.sh index 0cc0733243..ca0acc9fc4 100755 --- a/hack/release_notes.sh +++ b/hack/release_notes.sh @@ -18,7 +18,23 @@ set -eux -o pipefail DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -go run "${DIR}/release_notes/listpullreqs.go" +install_release_notes_helper() { + release_notes_workdir="$(mktemp -d)" + trap 'rm -rf -- ${release_notes_workdir}' RETURN + + # See https://stackoverflow.com/questions/56842385/using-go-get-to-download-binaries-without-adding-them-to-go-mod for this workaround + cd "${release_notes_workdir}" + go mod init release-notes + GOBIN="$DIR" go get github.com/corneliusweig/release-notes + cd - +} + +if ! [[ -x "${DIR}/release-notes" ]]; then + echo >&2 'Installing release-notes' + install_release_notes_helper +fi + +"${DIR}/release-notes" kubernetes minikube echo "Huge thank you for this release towards our contributors: " git log "$(git describe --abbrev=0)".. --format="%aN" --reverse | sort | uniq | awk '{printf "- %s\n", $0 }' diff --git a/hack/release_notes/listpullreqs.go b/hack/release_notes/listpullreqs.go deleted file mode 100644 index 64ea8fc3d9..0000000000 --- a/hack/release_notes/listpullreqs.go +++ /dev/null @@ -1,109 +0,0 @@ -/* -Copyright 2018 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. -*/ - -// listpullreqs.go lists pull requests since the last release. -package main - -import ( - "context" - "fmt" - - "github.com/golang/glog" - "github.com/google/go-github/v25/github" - "github.com/spf13/cobra" - "golang.org/x/oauth2" -) - -var ( - token string - fromTag string - toTag string -) - -var rootCmd = &cobra.Command{ - Use: "listpullreqs fromTag toTag", - Short: "Lists pull requests between two versions in our changelog markdown format", - ArgAliases: []string{"fromTag", "toTag"}, - Run: func(cmd *cobra.Command, args []string) { - printPullRequests() - }, -} - -const org = "kubernetes" -const repo = "minikube" - -func main() { - rootCmd.Flags().StringVar(&token, "token", "", "Specify personal Github Token if you are hitting a rate limit anonymously. https://github.com/settings/tokens") - rootCmd.Flags().StringVar(&fromTag, "fromTag", "", "comparison of commits is based on this tag (defaults to the latest tag in the repo)") - rootCmd.Flags().StringVar(&toTag, "toTag", "master", "this is the commit that is compared with fromTag") - if err := rootCmd.Execute(); err != nil { - glog.Fatalf("Failed to execute: %v", err) - } -} - -func printPullRequests() { - client := getClient() - - releases, _, err := client.Repositories.ListReleases(context.Background(), org, repo, &github.ListOptions{}) - if err != nil { - glog.Fatalf("Failed to list releases: %v", err) - } - lastReleaseTime := *releases[0].PublishedAt - fmt.Println(fmt.Sprintf("Collecting pull request that were merged since the last release: %s (%s)", *releases[0].TagName, lastReleaseTime)) - - listSize := 1 - for page := 1; listSize > 0; page++ { - pullRequests, _, err := client.PullRequests.List(context.Background(), org, repo, &github.PullRequestListOptions{ - State: "closed", - Sort: "updated", - Direction: "desc", - ListOptions: github.ListOptions{ - PerPage: 100, - Page: page, - }, - }) - if err != nil { - glog.Fatalf("Failed to list pull requests: %v", err) - } - - seen := 0 - for idx := range pullRequests { - pr := pullRequests[idx] - if pr.MergedAt != nil { - if pr.GetMergedAt().After(lastReleaseTime.Time) { - fmt.Printf("* %s [#%d](https://github.com/%s/%s/pull/%d)\n", pr.GetTitle(), *pr.Number, org, repo, *pr.Number) - seen++ - } - } - } - if seen == 0 { - break - } - listSize = len(pullRequests) - } -} - -func getClient() *github.Client { - if len(token) == 0 { - return github.NewClient(nil) - } - ctx := context.Background() - ts := oauth2.StaticTokenSource( - &oauth2.Token{AccessToken: token}, - ) - tc := oauth2.NewClient(ctx, ts) - return github.NewClient(tc) -} From a4e8b63de9d884ecdcdf198ed2dbaa0cc0bfb74c Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 14 Oct 2019 14:37:03 -0700 Subject: [PATCH 091/106] Calculate OS_ARCH, as the variable doesn't exist in this context --- hack/jenkins/minikube_cross_build_and_upload.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh index f95e9b0eae..382adacea7 100755 --- a/hack/jenkins/minikube_cross_build_and_upload.sh +++ b/hack/jenkins/minikube_cross_build_and_upload.sh @@ -40,7 +40,8 @@ declare -rx TAG="${ghprbActualCommit}" docker kill $(docker ps -q) || true docker rm $(docker ps -aq) || true make -j 16 all && failed=$? || failed=$? -"out/minikube-${OS_ARCH}" version + +"out/minikube-$(go env GOOS)-$(go env GOARCH)" version gsutil cp "gs://${bucket}/logs/index.html" \ "gs://${bucket}/logs/${ghprbPullId}/index.html" From d2557e688c54e9b38b3450f173e32fe82d88b191 Mon Sep 17 00:00:00 2001 From: Kenta Iso Date: Tue, 15 Oct 2019 22:41:59 +0900 Subject: [PATCH 092/106] fix kubeconfig.UpdateIP() argument order --- cmd/minikube/cmd/update-context.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/minikube/cmd/update-context.go b/cmd/minikube/cmd/update-context.go index 3a6eeda815..9474bf7ab5 100644 --- a/cmd/minikube/cmd/update-context.go +++ b/cmd/minikube/cmd/update-context.go @@ -44,7 +44,7 @@ var updateContextCmd = &cobra.Command{ if err != nil { exit.WithError("Error host driver ip status", err) } - updated, err := kubeconfig.UpdateIP(ip, constants.KubeconfigPath, machineName) + updated, err := kubeconfig.UpdateIP(ip, machineName, constants.KubeconfigPath) if err != nil { exit.WithError("update config", err) } From 3f6d9bbf18ee9cece5494334485fd1e9d7855c35 Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 16 Oct 2019 10:22:38 -0700 Subject: [PATCH 093/106] Use sudo to get kubelet logs: required by permissions on v1.5 ISO --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index ebc0ec8f96..95c35a087c 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -177,7 +177,7 @@ func (k *Bootstrapper) GetAPIServerStatus(ip net.IP, apiserverPort int) (string, // LogCommands returns a map of log type to a command which will display that log. func (k *Bootstrapper) LogCommands(o bootstrapper.LogOptions) map[string]string { var kubelet strings.Builder - kubelet.WriteString("journalctl -u kubelet") + kubelet.WriteString("sudo journalctl -u kubelet") if o.Lines > 0 { kubelet.WriteString(fmt.Sprintf(" -n %d", o.Lines)) } From d2f987adffca6b14087a3ce1eea50b21699fa9e1 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 16 Oct 2019 10:53:14 -0700 Subject: [PATCH 094/106] Speed up RNG initialization on hyperkit --- pkg/minikube/drivers/hyperkit/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/drivers/hyperkit/driver.go b/pkg/minikube/drivers/hyperkit/driver.go index 0db642f25b..fe44da80ea 100644 --- a/pkg/minikube/drivers/hyperkit/driver.go +++ b/pkg/minikube/drivers/hyperkit/driver.go @@ -61,6 +61,6 @@ func createHyperkitHost(config cfg.MachineConfig) interface{} { UUID: uuID, VpnKitSock: config.HyperkitVpnKitSock, VSockPorts: config.HyperkitVSockPorts, - Cmdline: "loglevel=3 user=docker console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes base host=" + cfg.GetMachineName(), + Cmdline: "loglevel=3 console=ttyS0 console=tty0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes random.trust_cpu=on hw_rng_model=virtio base host=" + cfg.GetMachineName(), } } From ed20dec45661a6ce7da2f3090d9348b101a5d18c Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 16 Oct 2019 10:59:01 -0700 Subject: [PATCH 095/106] Propagate hyperkit changes to main ISO --- deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg b/deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg index ecb2f1d708..9857e0bb2a 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg +++ b/deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg @@ -2,4 +2,4 @@ default 1 label 1 kernel /boot/bzImage initrd /boot/initrd - append root=/dev/sr0 loglevel=3 console=ttyS0 noembed nomodeset norestore waitusb=10 systemd.legacy_systemd_cgroup_controller=yes + append root=/dev/sr0 loglevel=3 console=ttyS0 noembed nomodeset norestore waitusb=10 random.trust_cpu=on hw_rng_model=virtio systemd.legacy_systemd_cgroup_controller=yes From 5c1647f6e7daf46d5ee88fcb19090b79672ae438 Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 16 Oct 2019 16:00:13 -0700 Subject: [PATCH 096/106] Use more stable gluster mirror? --- deploy/iso/minikube-iso/package/gluster/gluster.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/gluster/gluster.mk b/deploy/iso/minikube-iso/package/gluster/gluster.mk index aedf078124..c2d73f1853 100644 --- a/deploy/iso/minikube-iso/package/gluster/gluster.mk +++ b/deploy/iso/minikube-iso/package/gluster/gluster.mk @@ -5,7 +5,10 @@ ################################################################################ GLUSTER_VERSION = 4.1.5 -GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/4.1/$(GLUSTER_VERSION) +# Official gluster site has SSL problems +# https://bugzilla.redhat.com/show_bug.cgi?id=1572944 +# GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/4.1/$(GLUSTER_VERSION) +GLUSTER_SITE = http://download.openpkg.org/components/cache/glusterfs/ GLUSTER_SOURCE = glusterfs-$(GLUSTER_VERSION).tar.gz GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs --disable-glupy --disable-gnfs --disable-cmocka --without-server GLUSTER_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install From 1f6e72427f6ea14b3f0f4cdd2965f25bccd49b95 Mon Sep 17 00:00:00 2001 From: tstromberg Date: Wed, 16 Oct 2019 16:18:28 -0700 Subject: [PATCH 097/106] Remove trailing slash --- deploy/iso/minikube-iso/package/gluster/gluster.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/iso/minikube-iso/package/gluster/gluster.mk b/deploy/iso/minikube-iso/package/gluster/gluster.mk index c2d73f1853..35a761afd1 100644 --- a/deploy/iso/minikube-iso/package/gluster/gluster.mk +++ b/deploy/iso/minikube-iso/package/gluster/gluster.mk @@ -8,7 +8,7 @@ GLUSTER_VERSION = 4.1.5 # Official gluster site has SSL problems # https://bugzilla.redhat.com/show_bug.cgi?id=1572944 # GLUSTER_SITE = https://download.gluster.org/pub/gluster/glusterfs/4.1/$(GLUSTER_VERSION) -GLUSTER_SITE = http://download.openpkg.org/components/cache/glusterfs/ +GLUSTER_SITE = http://download.openpkg.org/components/cache/glusterfs GLUSTER_SOURCE = glusterfs-$(GLUSTER_VERSION).tar.gz GLUSTER_CONF_OPTS = --disable-tiering --disable-ec-dynamic --disable-xmltest --disable-crypt-xlator --disable-georeplication --disable-ibverbs --disable-glupy --disable-gnfs --disable-cmocka --without-server GLUSTER_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install From 53136c8bb64e18d2a75e6fcd1b0e5bfbc3af23f0 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 11:23:55 -0700 Subject: [PATCH 098/106] Add load warning, fix profile deletion, make vbox iface cleanup less noisy --- hack/jenkins/common.sh | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 96a6658b37..034874d1ee 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -37,10 +37,20 @@ echo "job: ${JOB_NAME}" echo "test home: ${TEST_HOME}" echo "sudo: ${SUDO_PREFIX}" echo "kernel: $(uname -v)" +echo "uptime: $(uptime)" # Setting KUBECONFIG prevents the version ceck from erroring out due to permission issues echo "kubectl: $(env KUBECONFIG=${TEST_HOME} kubectl version --client --short=true)" echo "docker: $(docker version --format '{{ .Client.Version }}')" +readonly LOAD=$(uptime | egrep -o "load average.*: [0-9]" | cut -d" " -f3) +if [[ "${LOAD}" -gt 2 ]]; then + echo "" + echo "******************************* LOAD WARNING **************************" + echo "Load average is very high (${LOAD}), which may cause failures" + echo "******************************* LOAD WARNING **************************" + echo "" +fi + case "${VM_DRIVER}" in kvm2) echo "virsh: $(virsh --version)" @@ -100,17 +110,15 @@ echo "" echo ">> Cleaning up after previous test runs ..." for entry in $(ls ${TEST_ROOT}); do echo "* Cleaning stale test path: ${entry}" - for tunnel in $(find ${entry} -name tunnels.json -type f); do + for tunnel in $(find ${TEST_ROOT}/${entry} -name tunnels.json -type f); do env MINIKUBE_HOME="$(dirname ${tunnel})" ${MINIKUBE_BIN} tunnel --cleanup || true done - for home in $(find ${entry} -name .minikube -type d); do - env MINIKUBE_HOME="$(dirname ${home})" ${MINIKUBE_BIN} delete || true + for home in $(find ${TEST_ROOT}/${entry} -name .minikube -type d); do + env MINIKUBE_HOME="$(dirname ${home})" ${MINIKUBE_BIN} delete --all || true sudo rm -Rf "${home}" done - ${MINIKUBE_BIN} delete --all || true - for kconfig in $(find ${entry} -name kubeconfig -type f); do sudo rm -f "${kconfig}" done @@ -143,19 +151,21 @@ if type -P virsh; then fi if type -P vboxmanage; then - for guid in $(vboxmanage list vms | egrep -Eo '\{[-a-Z0-9]+\}'); do + for guid in $(vboxmanage list vms | grep -Eo '\{[-a-Z0-9]+\}'); do echo "- Removing stale VirtualBox VM: $guid" - vboxmanage startvm $guid --type emergencystop || true - vboxmanage unregistervm $guid || true + vboxmanage startvm "${guid}" --type emergencystop || true + vboxmanage unregistervm "${guid}" || true done - vboxmanage list hostonlyifs \ - | grep "^Name:" \ - | awk '{ print $2 }' \ - | xargs -n1 vboxmanage hostonlyif remove || true + ifaces=$(vboxmanage list hostonlyifs | grep -E "^Name:" | awk '{ printf $2 }') + for if in $ifaces; do + vboxmanage hostonlyif remove "${if}" || true + done echo ">> VirtualBox VM list after clean up (should be empty):" vboxmanage list vms || true + echo ">> VirtualBox interface list after clean up (should be empty):" + vboxmanage list hostonlyifs || true fi From 23e94a3257d0a9054e18e300211e2e1a710bdb20 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 11:37:14 -0700 Subject: [PATCH 099/106] Use full paths consistently in cleanup --- hack/jenkins/common.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 034874d1ee..0061b3ba7f 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -109,27 +109,29 @@ mkdir -p "${TEST_ROOT}" echo "" echo ">> Cleaning up after previous test runs ..." for entry in $(ls ${TEST_ROOT}); do - echo "* Cleaning stale test path: ${entry}" - for tunnel in $(find ${TEST_ROOT}/${entry} -name tunnels.json -type f); do + test_path="${TEST_ROOT}/${entry}" + ls -lad "${test_path}" || continue + + echo "* Cleaning stale test path: ${test_path}" + for tunnel in $(find ${test_path} -name tunnels.json -type f); do env MINIKUBE_HOME="$(dirname ${tunnel})" ${MINIKUBE_BIN} tunnel --cleanup || true done - for home in $(find ${TEST_ROOT}/${entry} -name .minikube -type d); do + for home in $(find ${test_path} -name .minikube -type d); do env MINIKUBE_HOME="$(dirname ${home})" ${MINIKUBE_BIN} delete --all || true sudo rm -Rf "${home}" done - for kconfig in $(find ${entry} -name kubeconfig -type f); do + for kconfig in $(find ${test_path} -name kubeconfig -type f); do sudo rm -f "${kconfig}" done # Be very specific to avoid accidentally deleting other items, like wildcards or devices - if [[ -d "${entry}" ]]; then - rm -Rf "${entry}" || true - elif [[ -f "${entry}" ]]; then - rm -f "${entry}" || true + if [[ -d "${test_path}" ]]; then + rm -Rf "${test_path}" || true + elif [[ -f "${test_path}" ]]; then + rm -f "${test_path}" || true fi - done # sometimes tests left over zombie procs that won't exit From 554f553c9ee2fcaf64f3ae0d76ed35607555b55b Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 11:54:52 -0700 Subject: [PATCH 100/106] Include top output with load warning --- hack/jenkins/common.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 0061b3ba7f..3ca3b6d84f 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -45,9 +45,15 @@ echo "docker: $(docker version --format '{{ .Client.Version }}')" readonly LOAD=$(uptime | egrep -o "load average.*: [0-9]" | cut -d" " -f3) if [[ "${LOAD}" -gt 2 ]]; then echo "" - echo "******************************* LOAD WARNING **************************" - echo "Load average is very high (${LOAD}), which may cause failures" - echo "******************************* LOAD WARNING **************************" + echo "********************** LOAD WARNING ********************************" + echo "Load average is very high (${LOAD}), which may cause failures. Top:" + if [[ "$(uname)" == "Darwin" ]]; then + # Two samples, macOS does not calculate CPU usage on the first one + top -l 2 -o cpu -n 5 | tail -n 15 + else + top -b -n1 | head -n 15 + fi + echo "********************** LOAD WARNING ********************************" echo "" fi From a0a5b685f9d0b82d407d132b6c7997c24d1cfc84 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 12:38:02 -0700 Subject: [PATCH 101/106] Move delete --all test so that it is run in serial --- test/integration/a_download_only_test.go | 14 ++++++++++---- test/integration/start_stop_delete_test.go | 5 ----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/test/integration/a_download_only_test.go b/test/integration/a_download_only_test.go index 8e311b9d52..ff8869f23f 100644 --- a/test/integration/a_download_only_test.go +++ b/test/integration/a_download_only_test.go @@ -34,10 +34,8 @@ import ( "k8s.io/minikube/pkg/minikube/localpath" ) -// Note this test runs before all because filename is alphabetically first -// is used to cache images and binaries used by other parallel tests to avoid redownloading. -// TestDownloadOnly tests the --download-only option -func TestDownloadOnly(t *testing.T) { +// This test runs before others due to filename order. +func TestDownloadAndDeleteAll(t *testing.T) { profile := UniqueProfileName("download") ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute) defer Cleanup(t, profile, cancel) @@ -79,5 +77,13 @@ func TestDownloadOnly(t *testing.T) { } }) } + t.Run("DeleteAll", func(t *testing.T) { + // This is a weird place to test profile deletion, but this test is serial, and we have an unneccesary profile to delete! + rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) + if err != nil { + t.Errorf("%s failed: %v", rr.Args, err) + } + }) }) + } diff --git a/test/integration/start_stop_delete_test.go b/test/integration/start_stop_delete_test.go index 1ed1f6b676..bf575baeee 100644 --- a/test/integration/start_stop_delete_test.go +++ b/test/integration/start_stop_delete_test.go @@ -139,11 +139,6 @@ func TestStartStop(t *testing.T) { if err != nil { t.Errorf("%s failed: %v", rr.Args, err) } - - rr, err = Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) - if err != nil { - t.Errorf("%s failed: %v", rr.Args, err) - } }) } }) From f75c26e31e63c1bb88c378cf9c6c108ba8290ede Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 12:40:52 -0700 Subject: [PATCH 102/106] Rename serial tests file --- test/integration/Untitled-1 | 0 test/integration/{a_download_only_test.go => a_serial_tests.go} | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/integration/Untitled-1 rename test/integration/{a_download_only_test.go => a_serial_tests.go} (100%) diff --git a/test/integration/Untitled-1 b/test/integration/Untitled-1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/a_download_only_test.go b/test/integration/a_serial_tests.go similarity index 100% rename from test/integration/a_download_only_test.go rename to test/integration/a_serial_tests.go From 21aeec60eacf85d827ca0afc3aaf5b50bb489c67 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 12:41:27 -0700 Subject: [PATCH 103/106] Remove obsolete comment --- test/integration/a_serial_tests.go | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/a_serial_tests.go b/test/integration/a_serial_tests.go index ff8869f23f..6a45960241 100644 --- a/test/integration/a_serial_tests.go +++ b/test/integration/a_serial_tests.go @@ -16,7 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// a_download_only_test.go filename starts with a, for the purpose that it runs before all parallel tests and downloads the images and caches them. package integration import ( From e00868823947c0090aaaad860bf01100b5b6a373 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 12:55:56 -0700 Subject: [PATCH 104/106] Fix comments --- test/integration/a_serial_tests.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/integration/a_serial_tests.go b/test/integration/a_serial_tests.go index 6a45960241..78dd736525 100644 --- a/test/integration/a_serial_tests.go +++ b/test/integration/a_serial_tests.go @@ -33,7 +33,6 @@ import ( "k8s.io/minikube/pkg/minikube/localpath" ) -// This test runs before others due to filename order. func TestDownloadAndDeleteAll(t *testing.T) { profile := UniqueProfileName("download") ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute) @@ -76,8 +75,8 @@ func TestDownloadAndDeleteAll(t *testing.T) { } }) } + // This is a weird place to test profile deletion, but this test is serial, and we have a profile to delete! t.Run("DeleteAll", func(t *testing.T) { - // This is a weird place to test profile deletion, but this test is serial, and we have an unneccesary profile to delete! rr, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "--all")) if err != nil { t.Errorf("%s failed: %v", rr.Args, err) From b5f071d67fe23b9781789848623e5eafd4cb1a26 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 13:09:05 -0700 Subject: [PATCH 105/106] Fix 'grep: invalid character range' error on macOS --- hack/jenkins/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 3ca3b6d84f..ccd9216160 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -159,7 +159,7 @@ if type -P virsh; then fi if type -P vboxmanage; then - for guid in $(vboxmanage list vms | grep -Eo '\{[-a-Z0-9]+\}'); do + for guid in $(vboxmanage list vms | grep -Eo '\{[a-zA-Z0-9-]+\}'); do echo "- Removing stale VirtualBox VM: $guid" vboxmanage startvm "${guid}" --type emergencystop || true vboxmanage unregistervm "${guid}" || true From e1f49c277bba71ac88fd0f567816fb881dcf92a2 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 17 Oct 2019 13:53:36 -0700 Subject: [PATCH 106/106] Allow more time for gvisor to complete on slower machines --- test/integration/gvisor_addon_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/gvisor_addon_test.go b/test/integration/gvisor_addon_test.go index 7a4baec3c1..c5e2790bb6 100644 --- a/test/integration/gvisor_addon_test.go +++ b/test/integration/gvisor_addon_test.go @@ -33,7 +33,7 @@ func TestGvisorAddon(t *testing.T) { MaybeSlowParallel(t) profile := UniqueProfileName("gvisor") - ctx, cancel := context.WithTimeout(context.Background(), 20*time.Minute) + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute) defer func() { CleanupWithLogs(t, profile, cancel) }()