kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

honor --image-repository even if --image-mirror-country is set

pull/8249/head
SataQiu 2020-05-22 15:11:02 +08:00
parent ad437c2c9c
commit 98b0258565
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/minikube/cmd/start_flags.go
View File

@ -211,7 +211,7 @@ func ClusterFlagValue() string {
// generateClusterConfig generate a config.ClusterConfig based on flags or existing cluster config
func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k8sVersion string, drvName string) (config.ClusterConfig, config.Node, error) {
cc := config.ClusterConfig{}
var cc config.ClusterConfig
if existing != nil { // create profile config first time
cc = updateExistingConfigFromFlags(cmd, existing)
} else {
@ -242,10 +242,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
return cc, config.Node{}, errors.Wrap(err, "new runtime manager")
}
if cmd.Flags().Changed(imageRepository) {
cc.KubernetesConfig.ImageRepository = viper.GetString(imageRepository)
}
// Pick good default values for --network-plugin and --enable-default-cni based on runtime.
selectedEnableDefaultCNI := viper.GetBool(enableDefaultCNI)
selectedNetworkPlugin := viper.GetString(networkPlugin)
@ -258,7 +254,7 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
repository := viper.GetString(imageRepository)
mirrorCountry := strings.ToLower(viper.GetString(imageMirrorCountry))
if strings.ToLower(repository) == "auto" || mirrorCountry != "" {
if strings.ToLower(repository) == "auto" || (mirrorCountry != "" && repository == "") {
found, autoSelectedRepository, err := selectImageRepository(mirrorCountry, semver.MustParse(strings.TrimPrefix(k8sVersion, version.VersionPrefix)))
if err != nil {
exit.WithError("Failed to check main repository and mirrors for images", err)

15
cmd/minikube/cmd/start_test.go
View File

@ -97,6 +97,11 @@ func TestMirrorCountry(t *testing.T) {
imageRepository: "",
mirrorCountry: "",
},
{
description: "image-repository none, image-mirror-country china",
imageRepository: "",
mirrorCountry: "cn",
},
{
description: "image-repository auto, image-mirror-country none",
imageRepository: "auto",
@ -107,6 +112,16 @@ func TestMirrorCountry(t *testing.T) {
imageRepository: "auto",
mirrorCountry: "cn",
},
{
description: "image-repository registry.test.com, image-mirror-country none",
imageRepository: "registry.test.com",
mirrorCountry: "",
},
{
description: "image-repository registry.test.com, image-mirror-country china",
imageRepository: "registry.test.com",
mirrorCountry: "cn",
},
}
for _, test := range tests {