From 7b2d1a6838957b119ac2608be4121be1553a34f7 Mon Sep 17 00:00:00 2001
From: Ling Samuel <lingsamuelgrace@gmail.com>
Date: Fri, 8 Jan 2021 14:51:52 +0800
Subject: [PATCH] Remove default image from yaml, fix empty images warning

Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
---
 deploy/addons/ingress/ingress-dp.yaml.tmpl |  6 +++---
 pkg/minikube/assets/addons.go              | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/deploy/addons/ingress/ingress-dp.yaml.tmpl b/deploy/addons/ingress/ingress-dp.yaml.tmpl
index 81d02d23ec..8d184dd130 100644
--- a/deploy/addons/ingress/ingress-dp.yaml.tmpl
+++ b/deploy/addons/ingress/ingress-dp.yaml.tmpl
@@ -49,7 +49,7 @@ spec:
       serviceAccountName: ingress-nginx
       containers:
         - name: controller
-          image: {{default "us.gcr.io/k8s-artifacts-prod" .ImageRepository}}/{{default "ingress-nginx/controller:v0.40.2" .Images.IngressController}}
+          image: {{default "us.gcr.io/k8s-artifacts-prod" .ImageRepository}}/{{.Images.IngressController}}
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -220,7 +220,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{default "jettech" .ImageRepository}}/{{default "kube-webhook-certgen:v1.2.2" .Images.KubeWebhookCertgenCreate}}
+          image: {{default "jettech" .ImageRepository}}/{{.Images.KubeWebhookCertgenCreate}}
           imagePullPolicy: IfNotPresent
           args:
             - create
@@ -255,7 +255,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{default "jettech" .ImageRepository}}/{{default "kube-webhook-certgen:v1.3.0" .Images.KubeWebhookCertgenPatch}}
+          image: {{default "jettech" .ImageRepository}}/{{.Images.KubeWebhookCertgenPatch}}
           imagePullPolicy:
           args:
             - patch
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index ebb7f6878e..e0c99bfefe 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -521,16 +521,18 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig) interface{}
 	}
 
 	images := viper.GetString(config.AddonImages)
-	for _, image := range strings.Split(images, ",") {
-		vals := strings.Split(image, "=")
-		if len(vals) != 2 {
-			out.WarningT("Ignoring invalid custom image {{.conf}}", out.V{"conf": image})
-			continue
+	if images != "" {
+		for _, image := range strings.Split(images, ",") {
+			vals := strings.Split(image, "=")
+			if len(vals) != 2 {
+				out.WarningT("Ignoring invalid custom image {{.conf}}", out.V{"conf": image})
+				continue
+			}
+			if defaultImage, ok := opts.Images[vals[0]]; ok {
+				out.Infof("Using {{.image}} instead default image {{.default}}", out.V{"image": vals[1], "name": defaultImage})
+			}
+			opts.Images[vals[0]] = vals[1]
 		}
-		if defaultImage, ok := opts.Images[vals[0]]; ok {
-			out.Infof("Using {{.image}} instead default image {{.default}}", out.V{"image": vals[1], "name": defaultImage})
-		}
-		opts.Images[vals[0]] = vals[1]
 	}
 
 	return opts