Skip to content

Commit

Permalink
making addonConfigFile private
Browse files Browse the repository at this point in the history
  • Loading branch information
panyam committed Jan 22, 2025
1 parent 1485c75 commit f5776e7
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions cmd/minikube/cmd/config/configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"k8s.io/minikube/pkg/minikube/sysinit"
)

var AddonConfigFile = ""
var addonConfigFile = ""
var posResponses = []string{"yes", "y"}
var negResponses = []string{"no", "n"}

Expand All @@ -57,7 +57,7 @@ var addonsConfigureCmd = &cobra.Command{

profile := ClusterFlagValue()
addon := args[0]
addonConfig, err := loadAddonConfigFile(addon, AddonConfigFile)
addonConfig, err := loadAddonConfigFile(addon, addonConfigFile)
if err != nil {
return
}
Expand Down Expand Up @@ -123,7 +123,7 @@ func unpauseWholeCluster(co mustload.ClusterController) {
}

func init() {
addonsConfigureCmd.Flags().StringVarP(&AddonConfigFile, "config-file", "f", "", "An optional configuration file to read addon specific configs from instead of being prompted each time.")
addonsConfigureCmd.Flags().StringVarP(&addonConfigFile, "config-file", "f", "", "An optional configuration file to read addon specific configs from instead of being prompted each time.")
AddonsCmd.AddCommand(addonsConfigureCmd)
}

Expand Down Expand Up @@ -327,7 +327,7 @@ func processRegistryCredsConfig(profile string, configFileData map[string]any) {
awsRole = AskForStaticValueOptional("-- (Optional) Enter ARN of AWS role to assume: ")
}
} else if awsEcrAction == "enable" {
out.Ln("Loading AWS ECR configs from: %s", AddonConfigFile)
out.Ln("Loading AWS ECR configs from: %s", addonConfigFile)
// Then read the configs
awsAccessID = getNestedJSONString(configFileData, "awsEcrConfigs", "awsAccessID")
awsAccessKey = getNestedJSONString(configFileData, "awsEcrConfigs", "awsAccessKey")
Expand All @@ -354,7 +354,7 @@ func processRegistryCredsConfig(profile string, configFileData map[string]any) {
}
}
} else if gcrAction == "enable" {
out.Ln("Loading GCR configs from: %s", AddonConfigFile)
out.Ln("Loading GCR configs from: %s", addonConfigFile)
// Then read the configs
gcrPath = getNestedJSONString(configFileData, "gcrConfigs", "gcrPath")
gcrURL = getNestedJSONString(configFileData, "gcrConfigs", "gcrURL")
Expand Down Expand Up @@ -384,7 +384,7 @@ func processRegistryCredsConfig(profile string, configFileData map[string]any) {
dockerPass = AskForPasswordValue("-- Enter docker registry password: ")
}
} else if dockerRegistryAction == "enable" {
out.Ln("Loading Docker Registry configs from: %s", AddonConfigFile)
out.Ln("Loading Docker Registry configs from: %s", addonConfigFile)
dockerServer = getNestedJSONString(configFileData, "dockerConfigs", "dockerServer")
dockerUser = getNestedJSONString(configFileData, "dockerConfigs", "dockerUser")
dockerPass = getNestedJSONString(configFileData, "dockerConfigs", "dockerPass")
Expand All @@ -403,7 +403,7 @@ func processRegistryCredsConfig(profile string, configFileData map[string]any) {
acrPassword = AskForPasswordValue("-- Enter service principal password to access Azure Container Registry: ")
}
} else if configFileData == nil || acrAction == "enable" {
out.Ln("Loading ACR configs from: ", AddonConfigFile)
out.Ln("Loading ACR configs from: ", addonConfigFile)
acrURL = getNestedJSONString(configFileData, "acrConfigs", "acrURL")
acrClientID = getNestedJSONString(configFileData, "acrConfigs", "acrClientID")
acrPassword = getNestedJSONString(configFileData, "acrConfigs", "acrPassword")
Expand Down

0 comments on commit f5776e7

Please sign in to comment.