Merge pull request #14690 from spowelljr/fixCustomImage

Fix registry when custom images provided

Author: spowelljr

pkg/addons/addons.go

@@ -221,7 +221,7 @@ func EnableOrDisableAddon(cc *config.ClusterConfig, name string, val string) err
 		out.WarningT("At least needs control plane nodes to enable addon")
 	}
 
-	data := assets.GenerateTemplateData(addon, cc.KubernetesConfig, networkInfo, images, customRegistries, enable)
+	data := assets.GenerateTemplateData(addon, cc, networkInfo, images, customRegistries, enable)
 	return enableOrDisableAddonInternal(cc, addon, runner, data, enable)
 }
 

pkg/minikube/assets/addons.go

@@ -786,7 +786,7 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus
 		// Use newly configured custom images.
 		images = overrideDefaults(addonDefaultImages, newImages)
 		// Store custom addon images to be written.
-		cc.CustomAddonImages = mergeMaps(cc.CustomAddonImages, images)
+		cc.CustomAddonImages = mergeMaps(cc.CustomAddonImages, newImages)
 	}
 
 	// Use previously configured custom registries.
@@ -819,8 +819,8 @@ func SelectAndPersistImages(addon *Addon, cc *config.ClusterConfig) (images, cus
 }
 
 // GenerateTemplateData generates template data for template assets
-func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo NetworkInfo, images, customRegistries map[string]string, enable bool) interface{} {
-
+func GenerateTemplateData(addon *Addon, cc *config.ClusterConfig, netInfo NetworkInfo, images, customRegistries map[string]string, enable bool) interface{} {
+	cfg := cc.KubernetesConfig
 	a := runtime.GOARCH
 	// Some legacy docker images still need the -arch suffix
 	// for  less common architectures blank suffix for amd64
@@ -902,6 +902,15 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig, netInfo Net
 			opts.Registries[name] = "" // Avoid nil access when rendering
 		}
 
+		// tl;dr If the user specified a custom image remove the default registry
+		// Without the line below, if you try to overwrite an image the default registry is still used in the templating
+		// Example - image name: MetricsScraper, default registry: docker.io, default image: kubernetesui/metrics-scraper
+		// Passed on addon enable: --images=MetricsScraper=k8s.gcr.io/echoserver:1.4
+		// Without this line the resulting image would be docker.io/k8s.gcr.io/echoserver:1.4
+		if _, ok := cc.CustomAddonImages[name]; ok {
+			opts.Registries[name] = ""
+		}
+
 		if enable {
 			if override, ok := opts.CustomRegistries[name]; ok {
 				out.Infof("Using image {{.registry}}{{.image}}", out.V{