From 5a3843b07419317ec5e2f0ba43dd54fe4078ba5d Mon Sep 17 00:00:00 2001 From: Utkarsh Srivastava Date: Thu, 20 May 2021 21:39:07 +0530 Subject: [PATCH 1/3] replace addonList variable with viper provided data Signed-off-by: Utkarsh Srivastava --- cmd/minikube/cmd/start_flags.go | 2 +- pkg/addons/validations.go | 4 +++- pkg/minikube/config/config.go | 4 ++-- pkg/minikube/node/start.go | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 4bed46dc26..e2c90541c8 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -147,7 +147,7 @@ func initMinikubeFlags() { startCmd.Flags().String(containerRuntime, constants.DefaultContainerRuntime, fmt.Sprintf("The container runtime to be used (%s).", strings.Join(cruntime.ValidRuntimes(), ", "))) startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.") startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.") - startCmd.Flags().StringSliceVar(&config.AddonList, "addons", nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") + startCmd.Flags().StringSlice(config.AddonListName, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") startCmd.Flags().String(criSocket, "", "The cri socket path to be used.") startCmd.Flags().String(networkPlugin, "", "Kubelet network plug-in to use (default: auto)") startCmd.Flags().Bool(enableDefaultCNI, false, "DEPRECATED: Replaced by --cni=bridge") diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go index aad44e3cf0..ed4dd9016a 100644 --- a/pkg/addons/validations.go +++ b/pkg/addons/validations.go @@ -20,6 +20,7 @@ import ( "fmt" "strconv" + "github.com/spf13/viper" "k8s.io/minikube/pkg/minikube/assets" "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/cruntime" @@ -63,7 +64,8 @@ func IsVolumesnapshotsEnabled(cc *config.ClusterConfig, _, value string) error { isCsiDriverEnabled, _ := strconv.ParseBool(value) // assets.Addons[].IsEnabled() returns the current status of the addon or default value. // config.AddonList contains list of addons to be enabled. - isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || contains(config.AddonList, volumesnapshotsAddon) + addonList := viper.GetStringSlice(config.AddonListName) + isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || contains(addonList, volumesnapshotsAddon) if isCsiDriverEnabled && !isVolumesnapshotsEnabled { // just print out a warning directly, we don't want to return any errors since // that would prevent the addon from being enabled (callbacks wouldn't be run) diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go index c359087740..d6e6b28712 100644 --- a/pkg/minikube/config/config.go +++ b/pkg/minikube/config/config.go @@ -56,6 +56,8 @@ const ( AddonImages = "addon-images" // AddonRegistries stores custom addon images config AddonRegistries = "addon-registries" + // AddonListName represents the key for addons parameter + AddonListName = "addons" ) var ( @@ -67,8 +69,6 @@ var ( DockerOpt []string // ExtraOptions contains extra options (if any) ExtraOptions ExtraOptionSlice - // AddonList contains the list of addons - AddonList []string ) // ErrNotExist is the error returned when a config does not exist diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 7a9f1e304f..9c2ed21ea7 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -171,12 +171,13 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { }() // enable addons, both old and new! + addonList := viper.GetStringSlice(config.AddonListName) if starter.ExistingAddons != nil { if viper.GetBool("force") { addons.Force = true } wg.Add(1) - go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, config.AddonList) + go addons.Start(&wg, starter.Cfg, starter.ExistingAddons, addonList) } if apiServer { From 69b30c06df60500a6dc96dca36c5c247c446f334 Mon Sep 17 00:00:00 2001 From: Utkarsh Srivastava Date: Thu, 20 May 2021 22:25:38 +0530 Subject: [PATCH 2/3] change variable name from addonListName to addonList Signed-off-by: Utkarsh Srivastava --- cmd/minikube/cmd/start_flags.go | 2 +- pkg/addons/validations.go | 2 +- pkg/minikube/config/config.go | 4 ++-- pkg/minikube/node/start.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index e2c90541c8..88e6ab5c6a 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -147,7 +147,7 @@ func initMinikubeFlags() { startCmd.Flags().String(containerRuntime, constants.DefaultContainerRuntime, fmt.Sprintf("The container runtime to be used (%s).", strings.Join(cruntime.ValidRuntimes(), ", "))) startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.") startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.") - startCmd.Flags().StringSlice(config.AddonListName, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") + startCmd.Flags().StringSlice(config.AddonList, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") startCmd.Flags().String(criSocket, "", "The cri socket path to be used.") startCmd.Flags().String(networkPlugin, "", "Kubelet network plug-in to use (default: auto)") startCmd.Flags().Bool(enableDefaultCNI, false, "DEPRECATED: Replaced by --cni=bridge") diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go index ed4dd9016a..c1f1058e21 100644 --- a/pkg/addons/validations.go +++ b/pkg/addons/validations.go @@ -64,7 +64,7 @@ func IsVolumesnapshotsEnabled(cc *config.ClusterConfig, _, value string) error { isCsiDriverEnabled, _ := strconv.ParseBool(value) // assets.Addons[].IsEnabled() returns the current status of the addon or default value. // config.AddonList contains list of addons to be enabled. - addonList := viper.GetStringSlice(config.AddonListName) + addonList := viper.GetStringSlice(config.AddonList) isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || contains(addonList, volumesnapshotsAddon) if isCsiDriverEnabled && !isVolumesnapshotsEnabled { // just print out a warning directly, we don't want to return any errors since diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go index d6e6b28712..0a96488b2f 100644 --- a/pkg/minikube/config/config.go +++ b/pkg/minikube/config/config.go @@ -56,8 +56,8 @@ const ( AddonImages = "addon-images" // AddonRegistries stores custom addon images config AddonRegistries = "addon-registries" - // AddonListName represents the key for addons parameter - AddonListName = "addons" + // AddonList represents the key for addons parameter + AddonList = "addons" ) var ( diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 9c2ed21ea7..51abda0ef1 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -171,7 +171,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { }() // enable addons, both old and new! - addonList := viper.GetStringSlice(config.AddonListName) + addonList := viper.GetStringSlice(config.AddonList) if starter.ExistingAddons != nil { if viper.GetBool("force") { addons.Force = true From aa99526399ac54f1c96f9bbf4d038020b5590ada Mon Sep 17 00:00:00 2001 From: Utkarsh Srivastava Date: Fri, 21 May 2021 13:39:05 +0530 Subject: [PATCH 3/3] change variable name from addonList to addonListFlag Signed-off-by: Utkarsh Srivastava --- cmd/minikube/cmd/start_flags.go | 2 +- pkg/addons/validations.go | 2 +- pkg/minikube/config/config.go | 4 ++-- pkg/minikube/node/start.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/minikube/cmd/start_flags.go b/cmd/minikube/cmd/start_flags.go index 88e6ab5c6a..770d605cca 100644 --- a/cmd/minikube/cmd/start_flags.go +++ b/cmd/minikube/cmd/start_flags.go @@ -147,7 +147,7 @@ func initMinikubeFlags() { startCmd.Flags().String(containerRuntime, constants.DefaultContainerRuntime, fmt.Sprintf("The container runtime to be used (%s).", strings.Join(cruntime.ValidRuntimes(), ", "))) startCmd.Flags().Bool(createMount, false, "This will start the mount daemon and automatically mount files into minikube.") startCmd.Flags().String(mountString, constants.DefaultMountDir+":/minikube-host", "The argument to pass the minikube mount command on start.") - startCmd.Flags().StringSlice(config.AddonList, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") + startCmd.Flags().StringSlice(config.AddonListFlag, nil, "Enable addons. see `minikube addons list` for a list of valid addon names.") startCmd.Flags().String(criSocket, "", "The cri socket path to be used.") startCmd.Flags().String(networkPlugin, "", "Kubelet network plug-in to use (default: auto)") startCmd.Flags().Bool(enableDefaultCNI, false, "DEPRECATED: Replaced by --cni=bridge") diff --git a/pkg/addons/validations.go b/pkg/addons/validations.go index c1f1058e21..9cefbe321f 100644 --- a/pkg/addons/validations.go +++ b/pkg/addons/validations.go @@ -64,7 +64,7 @@ func IsVolumesnapshotsEnabled(cc *config.ClusterConfig, _, value string) error { isCsiDriverEnabled, _ := strconv.ParseBool(value) // assets.Addons[].IsEnabled() returns the current status of the addon or default value. // config.AddonList contains list of addons to be enabled. - addonList := viper.GetStringSlice(config.AddonList) + addonList := viper.GetStringSlice(config.AddonListFlag) isVolumesnapshotsEnabled := assets.Addons[volumesnapshotsAddon].IsEnabled(cc) || contains(addonList, volumesnapshotsAddon) if isCsiDriverEnabled && !isVolumesnapshotsEnabled { // just print out a warning directly, we don't want to return any errors since diff --git a/pkg/minikube/config/config.go b/pkg/minikube/config/config.go index 0a96488b2f..f194099266 100644 --- a/pkg/minikube/config/config.go +++ b/pkg/minikube/config/config.go @@ -56,8 +56,8 @@ const ( AddonImages = "addon-images" // AddonRegistries stores custom addon images config AddonRegistries = "addon-registries" - // AddonList represents the key for addons parameter - AddonList = "addons" + // AddonListFlag represents the key for addons parameter + AddonListFlag = "addons" ) var ( diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go index 51abda0ef1..9e3f59e9ed 100644 --- a/pkg/minikube/node/start.go +++ b/pkg/minikube/node/start.go @@ -171,7 +171,7 @@ func Start(starter Starter, apiServer bool) (*kubeconfig.Settings, error) { }() // enable addons, both old and new! - addonList := viper.GetStringSlice(config.AddonList) + addonList := viper.GetStringSlice(config.AddonListFlag) if starter.ExistingAddons != nil { if viper.GetBool("force") { addons.Force = true