Skip to content

Remove viper from minikube and driver packages - part 1 #21683

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
+658 −419
Draft

Remove viper from minikube and driver packages - part 1 #21683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1209f08
run: Introduce minikube/run and cmd/flags packages
nirs Oct 19, 2025
9cf8d33
run: Pass options to drivers
nirs Oct 19, 2025
453ab4b
vment: Remove viper interactive check
nirs Oct 7, 2025
0193f55
firewall: Remove viper interactive check
nirs Oct 7, 2025
15e00dc
notify: Remove viper interactive checks
nirs Oct 7, 2025
1b58c48
run: Remove viper.GetBool("download-only") checks
nirs Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions cmd/minikube/cmd/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/spf13/viper"
"k8s.io/klog/v2"
cmdConfig "k8s.io/minikube/cmd/minikube/cmd/config"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/exit"
"k8s.io/minikube/pkg/minikube/image"
Expand Down Expand Up @@ -49,8 +50,9 @@ var addCacheCmd = &cobra.Command{
Long: "Add an image to local cache.",
Run: func(_ *cobra.Command, args []string) {
out.WarningT("\"minikube cache\" will be deprecated in upcoming versions, please switch to \"minikube image load\"")
options := flags.Options()
// Cache and load images into docker daemon
if err := machine.CacheAndLoadImages(args, cacheAddProfiles(), false); err != nil {
if err := machine.CacheAndLoadImages(args, cacheAddProfiles(), false, options); err != nil {
exit.Error(reason.InternalCacheLoad, "Failed to cache and load images", err)
}
// Add images to config file
Expand Down Expand Up @@ -103,7 +105,8 @@ var reloadCacheCmd = &cobra.Command{
Short: "reload cached images.",
Long: "reloads images previously added using the 'cache add' subcommand",
Run: func(_ *cobra.Command, _ []string) {
err := node.CacheAndLoadImagesInConfig(cacheAddProfiles())
options := flags.Options()
err := node.CacheAndLoadImagesInConfig(cacheAddProfiles(), options)
if err != nil {
exit.Error(reason.GuestCacheLoad, "Failed to reload cached images", err)
}
Expand Down
4 changes: 3 additions & 1 deletion cmd/minikube/cmd/config/addons_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/olekukonko/tablewriter/tw"
"github.com/spf13/cobra"
"k8s.io/klog/v2"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/exit"
Expand Down Expand Up @@ -55,9 +56,10 @@ var addonsListCmd = &cobra.Command{
exit.Message(reason.Usage, "usage: minikube addons list")
}

options := flags.Options()
var cc *config.ClusterConfig
if config.ProfileExists(ClusterFlagValue()) {
_, cc = mustload.Partial(ClusterFlagValue())
_, cc = mustload.Partial(ClusterFlagValue(), options)
}
switch strings.ToLower(addonListOutput) {
case "list":
Expand Down
35 changes: 19 additions & 16 deletions cmd/minikube/cmd/config/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/spf13/cobra"
"k8s.io/klog/v2"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/cluster"
Expand All @@ -37,6 +38,7 @@ import (
"k8s.io/minikube/pkg/minikube/mustload"
"k8s.io/minikube/pkg/minikube/out"
"k8s.io/minikube/pkg/minikube/reason"
"k8s.io/minikube/pkg/minikube/run"
"k8s.io/minikube/pkg/minikube/style"
"k8s.io/minikube/pkg/minikube/sysinit"
)
Expand All @@ -59,6 +61,7 @@ var addonsConfigureCmd = &cobra.Command{
exit.Message(reason.Usage, "usage: minikube addons configure ADDON_NAME")
}

options := flags.Options()
profile := ClusterFlagValue()
addon := args[0]
addonConfig := loadAddonConfigFile(addon, addonConfigFile)
Expand All @@ -69,16 +72,16 @@ var addonsConfigureCmd = &cobra.Command{
processRegistryCredsConfig(profile, addonConfig)

case "metallb":
processMetalLBConfig(profile, addonConfig)
processMetalLBConfig(profile, addonConfig, options)

case "ingress":
processIngressConfig(profile, addonConfig)
processIngressConfig(profile, addonConfig, options)

case "registry-aliases":
processRegistryAliasesConfig(profile, addonConfig)
processRegistryAliasesConfig(profile, addonConfig, options)

case "auto-pause":
processAutoPauseConfig(profile, addonConfig)
processAutoPauseConfig(profile, addonConfig, options)

default:
out.FailureT("{{.name}} has no available configuration options", out.V{"name": addon})
Expand Down Expand Up @@ -163,8 +166,8 @@ func loadAddonConfigFile(addon, configFilePath string) (ac *addonConfig) {
}

// Processes metallb addon config from configFile if it exists otherwise resorts to default behavior
func processMetalLBConfig(profile string, _ *addonConfig) {
_, cfg := mustload.Partial(profile)
func processMetalLBConfig(profile string, _ *addonConfig, options *run.Options) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be called CommandOptions or FlagOptions or CmdOptions

_, cfg := mustload.Partial(profile, options)

validator := func(s string) bool {
return net.ParseIP(s) != nil
Expand All @@ -179,14 +182,14 @@ func processMetalLBConfig(profile string, _ *addonConfig) {
}

// Re-enable metallb addon in order to generate template manifest files with Load Balancer Start/End IP
if err := addons.EnableOrDisableAddon(cfg, "metallb", "true"); err != nil {
if err := addons.EnableOrDisableAddon(cfg, "metallb", "true", options); err != nil {
out.ErrT(style.Fatal, "Failed to configure metallb IP {{.profile}}", out.V{"profile": profile})
}
}

// Processes ingress addon config from configFile if it exists otherwise resorts to default behavior
func processIngressConfig(profile string, _ *addonConfig) {
_, cfg := mustload.Partial(profile)
func processIngressConfig(profile string, _ *addonConfig, options *run.Options) {
_, cfg := mustload.Partial(profile, options)

validator := func(s string) bool {
format := regexp.MustCompile("^.+/.+$")
Expand All @@ -209,8 +212,8 @@ func processIngressConfig(profile string, _ *addonConfig) {
}

// Processes auto-pause addon config from configFile if it exists otherwise resorts to default behavior
func processAutoPauseConfig(profile string, _ *addonConfig) {
lapi, cfg := mustload.Partial(profile)
func processAutoPauseConfig(profile string, _ *addonConfig, options *run.Options) {
lapi, cfg := mustload.Partial(profile, options)
intervalInput := AskForStaticValue("-- Enter interval time of auto-pause-interval (ex. 1m0s): ")
intervalTime, err := time.ParseDuration(intervalInput)
if err != nil {
Expand All @@ -235,11 +238,11 @@ func processAutoPauseConfig(profile string, _ *addonConfig) {
out.ErrT(style.Fatal, "failed to load profile: {{.error}}", out.V{"error": err})
}
if profileStatus(p, lapi).StatusCode/100 == 2 { // 2xx code
co := mustload.Running(profile)
co := mustload.Running(profile, options)
// first unpause all nodes cluster immediately
unpauseWholeCluster(co)
// Re-enable auto-pause addon in order to update interval time
if err := addons.EnableOrDisableAddon(cfg, "auto-pause", "true"); err != nil {
if err := addons.EnableOrDisableAddon(cfg, "auto-pause", "true", options); err != nil {
out.ErrT(style.Fatal, "Failed to configure auto-pause {{.profile}}", out.V{"profile": profile})
}
// restart auto-pause service
Expand All @@ -251,8 +254,8 @@ func processAutoPauseConfig(profile string, _ *addonConfig) {
}

// Processes registry-aliases addon config from configFile if it exists otherwise resorts to default behavior
func processRegistryAliasesConfig(profile string, _ *addonConfig) {
_, cfg := mustload.Partial(profile)
func processRegistryAliasesConfig(profile string, _ *addonConfig, options *run.Options) {
_, cfg := mustload.Partial(profile, options)
validator := func(s string) bool {
format := regexp.MustCompile(`^([a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+)+(\ [a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+)*$`)
return format.MatchString(s)
Expand All @@ -267,7 +270,7 @@ func processRegistryAliasesConfig(profile string, _ *addonConfig) {
addon := assets.Addons["registry-aliases"]
if addon.IsEnabled(cfg) {
// Re-enable registry-aliases addon in order to generate template manifest files with custom hosts
if err := addons.EnableOrDisableAddon(cfg, "registry-aliases", "true"); err != nil {
if err := addons.EnableOrDisableAddon(cfg, "registry-aliases", "true", options); err != nil {
out.ErrT(style.Fatal, "Failed to configure registry-aliases {{.profile}}", out.V{"profile": profile})
}
}
Expand Down
9 changes: 6 additions & 3 deletions cmd/minikube/cmd/config/disable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package config

import (
"github.com/spf13/cobra"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/exit"
Expand All @@ -35,8 +36,10 @@ var addonsDisableCmd = &cobra.Command{
if len(args) != 1 {
exit.Message(reason.Usage, "usage: minikube addons disable ADDON_NAME")
}
_, cc := mustload.Partial(ClusterFlagValue())
err := addons.VerifyNotPaused(ClusterFlagValue(), false)

options := flags.Options()
_, cc := mustload.Partial(ClusterFlagValue(), options)
err := addons.VerifyNotPaused(ClusterFlagValue(), false, options)
if err != nil {
exit.Error(reason.InternalAddonDisablePaused, "disable failed", err)
}
Expand All @@ -49,7 +52,7 @@ var addonsDisableCmd = &cobra.Command{
exit.Message(reason.AddonUnsupported, `"'{{.minikube_addon}}' is not a valid minikube addon`, out.V{"minikube_addon": addon})
}
if validAddon.IsEnabled(cc) {
err = addons.SetAndSave(ClusterFlagValue(), addon, "false")
err = addons.SetAndSave(ClusterFlagValue(), addon, "false", options)
if err != nil {
exit.Error(reason.InternalAddonDisable, "disable failed", err)
}
Expand Down
9 changes: 6 additions & 3 deletions cmd/minikube/cmd/config/enable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/config"
Expand All @@ -41,12 +42,14 @@ var addonsEnableCmd = &cobra.Command{
if len(args) != 1 {
exit.Message(reason.Usage, "usage: minikube addons enable ADDON_NAME")
}
_, cc := mustload.Partial(ClusterFlagValue())

options := flags.Options()
_, cc := mustload.Partial(ClusterFlagValue(), options)
if cc.KubernetesConfig.KubernetesVersion == constants.NoKubernetesVersion {
exit.Message(reason.Usage, "You cannot enable addons on a cluster without Kubernetes, to enable Kubernetes on your cluster, run: minikube start --kubernetes-version=stable")
}

err := addons.VerifyNotPaused(ClusterFlagValue(), true)
err := addons.VerifyNotPaused(ClusterFlagValue(), true, options)
if err != nil {
exit.Error(reason.InternalAddonEnablePaused, "enabled failed", err)
}
Expand Down Expand Up @@ -83,7 +86,7 @@ You can view the list of minikube maintainers at: https://github.com/kubernetes/
if registries != "" {
viper.Set(config.AddonRegistries, registries)
}
err = addons.SetAndSave(ClusterFlagValue(), addon, "true")
err = addons.SetAndSave(ClusterFlagValue(), addon, "true", options)
if err != nil && !errors.Is(err, addons.ErrSkipThisAddon) {
exit.Error(reason.InternalAddonEnable, "enable failed", err)
}
Expand Down
5 changes: 4 additions & 1 deletion cmd/minikube/cmd/config/open.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"text/template"

"github.com/spf13/cobra"
"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/browser"
"k8s.io/minikube/pkg/minikube/exit"
Expand Down Expand Up @@ -57,10 +58,12 @@ var addonsOpenCmd = &cobra.Command{
if len(args) != 1 {
exit.Message(reason.Usage, "usage: minikube addons open ADDON_NAME")
}

options := flags.Options()
addonName := args[0]

cname := ClusterFlagValue()
co := mustload.Healthy(cname)
co := mustload.Healthy(cname, options)

addon, ok := assets.Addons[addonName] // validate addon input
if !ok {
Expand Down
21 changes: 12 additions & 9 deletions cmd/minikube/cmd/config/profile_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"strconv"
"strings"

"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/minikube/cluster"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
Expand All @@ -31,6 +32,7 @@ import (
"k8s.io/minikube/pkg/minikube/notify"
"k8s.io/minikube/pkg/minikube/out"
"k8s.io/minikube/pkg/minikube/reason"
"k8s.io/minikube/pkg/minikube/run"
"k8s.io/minikube/pkg/minikube/style"

"github.com/docker/machine/libmachine"
Expand All @@ -52,15 +54,16 @@ var profileListCmd = &cobra.Command{
Short: "Lists all minikube profiles.",
Long: "Lists all valid minikube profiles and detects all possible invalid profiles.",
Run: func(_ *cobra.Command, _ []string) {
options := flags.Options()
output := strings.ToLower(profileOutput)
out.SetJSON(output == "json")
go notify.MaybePrintUpdateTextFromGithub()
go notify.MaybePrintUpdateTextFromGithub(options)

switch output {
case "json":
printProfilesJSON()
printProfilesJSON(options)
case "table":
printProfilesTable()
printProfilesTable(options)
default:
exit.Message(reason.Usage, fmt.Sprintf("invalid output format: %s. Valid values: 'table', 'json'", profileOutput))
}
Expand All @@ -77,7 +80,7 @@ func listProfiles() (validProfiles, invalidProfiles []*config.Profile, err error
return validProfiles, invalidProfiles, err
}

func printProfilesTable() {
func printProfilesTable(options *run.Options) {
validProfiles, invalidProfiles, err := listProfiles()

if err != nil {
Expand All @@ -88,20 +91,20 @@ func printProfilesTable() {
exit.Message(reason.UsageNoProfileRunning, "No minikube profile was found.")
}

updateProfilesStatus(validProfiles)
updateProfilesStatus(validProfiles, options)
renderProfilesTable(profilesToTableData(validProfiles))
warnInvalidProfiles(invalidProfiles)
}

func updateProfilesStatus(profiles []*config.Profile) {
func updateProfilesStatus(profiles []*config.Profile, options *run.Options) {
if isLight {
for _, p := range profiles {
p.Status = "Skipped"
}
return
}

api, err := machine.NewAPIClient()
api, err := machine.NewAPIClient(options)
if err != nil {
klog.Errorf("failed to get machine api client %v", err)
}
Expand Down Expand Up @@ -205,9 +208,9 @@ func warnInvalidProfiles(invalidProfiles []*config.Profile) {
}
}

func printProfilesJSON() {
func printProfilesJSON(options *run.Options) {
validProfiles, invalidProfiles, err := listProfiles()
updateProfilesStatus(validProfiles)
updateProfilesStatus(validProfiles, options)

var body = map[string]interface{}{}
if err == nil || config.IsNotExist(err) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/config/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func Set(name string, value string) error {
return errors.Wrapf(err, "find settings for %q value of %q", name, value)
}
// Validate the new value
err = run(name, value, s.validations)
err = invoke(name, value, s.validations)
if err != nil {
return errors.Wrapf(err, "run validations for %q with value of %q", name, value)
}
Expand All @@ -72,7 +72,7 @@ func Set(name string, value string) error {
}

// Run any callbacks for this property
err = run(name, value, s.callbacks)
err = invoke(name, value, s.callbacks)
if err != nil {
return errors.Wrapf(err, "run callbacks for %q with value of %q", name, value)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/config/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/minikube/pkg/minikube/out"
)

// Runs all the validation or callback functions and collects errors
func run(name string, value string, fns []setFn) error {
// Invoke all the validation or callback functions and collects errors
func invoke(name string, value string, fns []setFn) error {
var errors []error
for _, fn := range fns {
err := fn(name, value)
Expand Down
6 changes: 4 additions & 2 deletions cmd/minikube/cmd/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
pt "path"
"strings"

"k8s.io/minikube/cmd/minikube/cmd/flags"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/exit"
Expand Down Expand Up @@ -54,17 +55,18 @@ Example Command : "minikube cp a.txt /home/docker/b.txt" +
"minikube cp minikube-m01:a.txt minikube-m02:/home/docker/b.txt"`,
Run: func(_ *cobra.Command, args []string) {
if len(args) != 2 {
exit.Message(reason.Usage, `Please specify the path to copy:
exit.Message(reason.Usage, `Please specify the path to copy:
minikube cp <source file path> <target file absolute path> (example: "minikube cp a/b.txt /copied.txt")`)
}

options := flags.Options()
srcPath := args[0]
dstPath := setDstFileNameFromSrc(args[1], srcPath)
src := newRemotePath(srcPath)
dst := newRemotePath(dstPath)
validateArgs(src, dst)

co := mustload.Running(ClusterFlagValue())
co := mustload.Running(ClusterFlagValue(), options)
var runner command.Runner

if dst.node != "" {
Expand Down
Loading
Loading