From 76833fd2fabfd95c49421520a705999a762116ff Mon Sep 17 00:00:00 2001
From: Ling Samuel <lingsamuelgrace@gmail.com>
Date: Mon, 11 Jan 2021 23:33:42 +0800
Subject: [PATCH] Make registry configurable

Signed-off-by: Ling Samuel <lingsamuelgrace@gmail.com>
---
 deploy/addons/ambassador/ambassador-operator.yaml.tmpl    | 2 +-
 .../deploy/csi-hostpath-attacher.yaml.tmpl                | 2 +-
 .../deploy/csi-hostpath-plugin.yaml.tmpl                  | 6 +++---
 .../deploy/csi-hostpath-provisioner.yaml.tmpl             | 2 +-
 .../deploy/csi-hostpath-resizer.yaml.tmpl                 | 2 +-
 .../deploy/csi-hostpath-snapshotter.yaml.tmpl             | 2 +-
 deploy/addons/dashboard/dashboard-dp.yaml.tmpl            | 4 ++--
 deploy/addons/efk/elasticsearch-rc.yaml.tmpl              | 4 ++--
 deploy/addons/efk/fluentd-es-rc.yaml.tmpl                 | 2 +-
 deploy/addons/efk/kibana-rc.yaml.tmpl                     | 2 +-
 deploy/addons/freshpod/freshpod-rc.yaml.tmpl              | 2 +-
 deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl    | 6 +++---
 deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl       | 2 +-
 deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl      | 2 +-
 deploy/addons/gvisor/gvisor-pod.yaml.tmpl                 | 2 +-
 deploy/addons/helm-tiller/helm-tiller-dp.tmpl             | 2 +-
 deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl       | 2 +-
 deploy/addons/ingress/ingress-dp.yaml.tmpl                | 6 +++---
 deploy/addons/istio-provisioner/istio-operator.yaml.tmpl  | 2 +-
 deploy/addons/kubevirt/pod.yaml.tmpl                      | 2 +-
 deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl    | 2 +-
 deploy/addons/metallb/metallb.yaml.tmpl                   | 4 ++--
 .../metrics-server/metrics-server-deployment.yaml.tmpl    | 2 +-
 deploy/addons/olm/olm.yaml.tmpl                           | 8 ++++----
 deploy/addons/registry-aliases/node-etc-hosts-update.tmpl | 4 ++--
 deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl  | 2 +-
 deploy/addons/registry/registry-proxy.yaml.tmpl           | 2 +-
 deploy/addons/registry/registry-rc.yaml.tmpl              | 2 +-
 .../glusterfs-daemonset.yaml.tmpl                         | 2 +-
 .../heketi-deployment.yaml.tmpl                           | 2 +-
 .../storage-provisioner-glusterfile.yaml.tmpl             | 2 +-
 .../storage-provisioner/storage-provisioner.yaml.tmpl     | 2 +-
 .../volume-snapshot-controller-deployment.yaml.tmpl       | 2 +-
 pkg/minikube/assets/addons.go                             | 2 ++
 34 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/deploy/addons/ambassador/ambassador-operator.yaml.tmpl b/deploy/addons/ambassador/ambassador-operator.yaml.tmpl
index 5cb0ae21aa..57e67d24e1 100644
--- a/deploy/addons/ambassador/ambassador-operator.yaml.tmpl
+++ b/deploy/addons/ambassador/ambassador-operator.yaml.tmpl
@@ -180,7 +180,7 @@ spec:
       containers:
         - name: ambassador-operator
           # Replace this with the built image name
-          image: {{default "quay.io/" .ImageRepository}}/{{.Images.AmbassadorOperator}}
+          image: {{default .Registries.AmbassadorOperator .ImageRepository}}/{{.Images.AmbassadorOperator}}
           command:
           - ambassador-operator
           imagePullPolicy: Always
diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl
index 73bb94c5ff..371ac65845 100644
--- a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl
+++ b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-attacher.yaml.tmpl
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.Attacher}}
+          image: {{default .Registries.Attacher .ImageRepository}}/{{.Images.Attacher}}
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl
index 4bf5d8957e..ff9ea1b9b0 100644
--- a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl
+++ b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-plugin.yaml.tmpl
@@ -53,7 +53,7 @@ spec:
     spec:
       containers:
         - name: node-driver-registrar
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.NodeDriverRegistrar}}
+          image: {{default .Registries.NodeDriverRegistrar .ImageRepository}}/{{.Images.NodeDriverRegistrar}}
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
@@ -78,7 +78,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.HostPathPlugin}}
+          image: {{default .Registries.HostPathPlugin .ImageRepository}}/{{.Images.HostPathPlugin}}
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"
@@ -123,7 +123,7 @@ spec:
           volumeMounts:
           - mountPath: /csi
             name: socket-dir
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.LivenessProbe}}
+          image: {{default .Registries.LivenessProbe .ImageRepository}}/{{.Images.LivenessProbe}}
           args:
           - --csi-address=/csi/csi.sock
           - --health-port=9898
diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl
index 493fbc9a76..0afc654b9a 100644
--- a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl
+++ b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-provisioner.yaml.tmpl
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: {{default "gcr.io" .ImageRepository}}/{{.Images.Provisioner}}
+          image: {{default .Registries.Provisioner .ImageRepository}}/{{.Images.Provisioner}}
           args:
             - -v=5
             - --csi-address=/csi/csi.sock
diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl
index 2499935da8..6b6d18709d 100644
--- a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl
+++ b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-resizer.yaml.tmpl
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-resizer
       containers:
         - name: csi-resizer
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.Resizer}}
+          image: {{default .Registries.Resizer .ImageRepository}}/{{.Images.Resizer}}
           args:
             - -v=5
             - -csi-address=/csi/csi.sock
diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl
index d14a6e8d34..98d736d418 100644
--- a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl
+++ b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-snapshotter.yaml.tmpl
@@ -57,7 +57,7 @@ spec:
       serviceAccount: csi-snapshotter
       containers:
         - name: csi-snapshotter
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.Snapshotter}}
+          image: {{default .Registries.Snapshotter .ImageRepository}}/{{.Images.Snapshotter}}
           args:
             - -v=5
             - --csi-address=/csi/csi.sock
diff --git a/deploy/addons/dashboard/dashboard-dp.yaml.tmpl b/deploy/addons/dashboard/dashboard-dp.yaml.tmpl
index a4d38f2934..73fe1a9149 100644
--- a/deploy/addons/dashboard/dashboard-dp.yaml.tmpl
+++ b/deploy/addons/dashboard/dashboard-dp.yaml.tmpl
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
         - name: dashboard-metrics-scraper
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.MetricsScraper}}
+          image: {{default .Registries.MetricsScraper .ImageRepository}}/{{.Images.MetricsScraper}}
           ports:
             - containerPort: 8000
               protocol: TCP
@@ -91,7 +91,7 @@ spec:
       containers:
         - name: kubernetes-dashboard
           # WARNING: This must match pkg/minikube/bootstrapper/images/images.go
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.Dashboard}}
+          image: {{default .Registries.Dashboard .ImageRepository}}/{{.Images.Dashboard}}
           ports:
             - containerPort: 9090
               protocol: TCP
diff --git a/deploy/addons/efk/elasticsearch-rc.yaml.tmpl b/deploy/addons/efk/elasticsearch-rc.yaml.tmpl
index 2b54101b45..d407ef9ed5 100644
--- a/deploy/addons/efk/elasticsearch-rc.yaml.tmpl
+++ b/deploy/addons/efk/elasticsearch-rc.yaml.tmpl
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: elasticsearch-logging
-        image: {{default "k8s.gcr.io" .ImageRepository}}/{{.Images.Elasticsearch}}
+        image: {{default .Registries.Elasticsearch .ImageRepository}}/{{.Images.Elasticsearch}}
         resources:
           limits:
             cpu: 500m
@@ -62,7 +62,7 @@ spec:
         - name: ES_JAVA_OPTS
           value: "-Xms1024m -Xmx1024m"
       initContainers:
-      - image: {{default "docker.io" .ImageRepository}}/{{.Images.Alpine}}
+      - image: {{default .Registries.Alpine .ImageRepository}}/{{.Images.Alpine}}
         command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
         name: elasticsearch-logging-init
         securityContext:
diff --git a/deploy/addons/efk/fluentd-es-rc.yaml.tmpl b/deploy/addons/efk/fluentd-es-rc.yaml.tmpl
index 01b4fc3b53..5d196ff686 100644
--- a/deploy/addons/efk/fluentd-es-rc.yaml.tmpl
+++ b/deploy/addons/efk/fluentd-es-rc.yaml.tmpl
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: fluentd-es
-        image: {{default "k8s.gcr.io" .ImageRepository}}/{{.Images.FluentdElasticsearch}}
+        image: {{default .Registries.FluentdElasticsearch .ImageRepository}}/{{.Images.FluentdElasticsearch}}
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q
diff --git a/deploy/addons/efk/kibana-rc.yaml.tmpl b/deploy/addons/efk/kibana-rc.yaml.tmpl
index 0f87ec5213..356bf30dac 100644
--- a/deploy/addons/efk/kibana-rc.yaml.tmpl
+++ b/deploy/addons/efk/kibana-rc.yaml.tmpl
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: {{default "docker.elastic.co" .ImageRepository}}/{{.Images.Kibana}}
+        image: {{default .Registries.Kibana .ImageRepository}}/{{.Images.Kibana}}
         resources:
           limits:
             cpu: 500m
diff --git a/deploy/addons/freshpod/freshpod-rc.yaml.tmpl b/deploy/addons/freshpod/freshpod-rc.yaml.tmpl
index b9ceef20c6..502db2418c 100644
--- a/deploy/addons/freshpod/freshpod-rc.yaml.tmpl
+++ b/deploy/addons/freshpod/freshpod-rc.yaml.tmpl
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: freshpod
-        image: {{default "gcr.io" .ImageRepository}}/{{.Images.FreshPod}}
+        image: {{default .Registries.FreshPod .ImageRepository}}/{{.Images.FreshPod}}
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: docker
diff --git a/deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl b/deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl
index fe4b424952..5cf3f61ce2 100644
--- a/deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl
+++ b/deploy/addons/gcp-auth/gcp-auth-webhook.yaml.tmpl.tmpl
@@ -68,7 +68,7 @@ spec:
       serviceAccountName: minikube-gcp-auth-certs
       containers:
         - name: create
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.KubeWebhookCertgen}}
+          image: {{default .Registries.KubeWebhookCertgen .ImageRepository}}/{{.Images.KubeWebhookCertgen}}
           imagePullPolicy: IfNotPresent
           args:
             - create
@@ -94,7 +94,7 @@ spec:
     spec:
       containers:
         - name: gcp-auth
-          image: {{default "gcr.io" .ImageRepository}}/{{.Images.GCPAuthWebhook}}
+          image: {{default .Registries.GCPAuthWebhook .ImageRepository}}/{{.Images.GCPAuthWebhook}}
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8443
@@ -127,7 +127,7 @@ spec:
       serviceAccountName: minikube-gcp-auth-certs
       containers:
         - name: patch
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.KubeWebhookCertgen}}
+          image: {{default .Registries.KubeWebhookCertgen .ImageRepository}}/{{.Images.KubeWebhookCertgen}}
           imagePullPolicy: IfNotPresent
           args:
             - patch
diff --git a/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl b/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl
index e42e6df443..338abd7155 100644
--- a/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-driver-installer.yaml.tmpl
@@ -50,7 +50,7 @@ spec:
         hostPath:
           path: /
       initContainers:
-      - image: {{default "k8s.gcr.io" .ImageRepository}}/{{.Images.NvidiaDriverInstaller}}
+      - image: {{default .Registries.NvidiaDriverInstaller .ImageRepository}}/{{.Images.NvidiaDriverInstaller}}
         name: nvidia-driver-installer
         resources:
           requests:
diff --git a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
index 0ea169b631..62314b107e 100644
--- a/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
+++ b/deploy/addons/gpu/nvidia-gpu-device-plugin.yaml.tmpl
@@ -43,7 +43,7 @@ spec:
         hostPath:
           path: /var/lib/kubelet/device-plugins
       containers:
-      - image: {{default "docker.io" .ImageRepository}}/{{.Images.NvidiaDevicePlugin}}
+      - image: {{default .Registries.NvidiaDevicePlugin .ImageRepository}}/{{.Images.NvidiaDevicePlugin}}
         command: ["/usr/bin/nvidia-device-plugin", "-logtostderr"]
         name: nvidia-gpu-device-plugin
         resources:
diff --git a/deploy/addons/gvisor/gvisor-pod.yaml.tmpl b/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
index 01fe00fa74..a60ab37776 100644
--- a/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
+++ b/deploy/addons/gvisor/gvisor-pod.yaml.tmpl
@@ -25,7 +25,7 @@ spec:
   hostPID: true
   containers:
     - name: gvisor
-      image: {{default "gcr.io" .ImageRepository}}/{{.Images.GvisorAddon}}
+      image: {{default .Registries.GvisorAddon .ImageRepository}}/{{.Images.GvisorAddon}}
       securityContext:
         privileged: true
       volumeMounts:
diff --git a/deploy/addons/helm-tiller/helm-tiller-dp.tmpl b/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
index d8ddfea191..da06ae1c8b 100644
--- a/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
+++ b/deploy/addons/helm-tiller/helm-tiller-dp.tmpl
@@ -46,7 +46,7 @@ spec:
               value: kube-system
             - name: TILLER_HISTORY_MAX
               value: "0"
-          image: {{default "gcr.io" .ImageRepository}}/{{.Images.Tiller}}
+          image: {{default .Registries.Tiller .ImageRepository}}/{{.Images.Tiller}}
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3
diff --git a/deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl b/deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl
index 07e2be12b9..4d07f1b7ce 100644
--- a/deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl
+++ b/deploy/addons/ingress-dns/ingress-dns-pod.yaml.tmpl
@@ -80,7 +80,7 @@ spec:
   hostNetwork: true
   containers:
     - name: minikube-ingress-dns
-      image: {{default "docker.io" .ImageRepository}}/{{.Images.IngressDNS}}
+      image: {{default .Registries.IngressDNS .ImageRepository}}/{{.Images.IngressDNS}}
       imagePullPolicy: IfNotPresent
       ports:
         - containerPort: 53
diff --git a/deploy/addons/ingress/ingress-dp.yaml.tmpl b/deploy/addons/ingress/ingress-dp.yaml.tmpl
index d4868dceab..146025290e 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}}/{{.Images.IngressController}}
+          image: {{default .Registries.IngressController .ImageRepository}}/{{.Images.IngressController}}
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -220,7 +220,7 @@ spec:
     spec:
       containers:
         - name: create
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.KubeWebhookCertgenCreate}}
+          image: {{default .Registries.KubeWebhookCertgenCreate .ImageRepository}}/{{.Images.KubeWebhookCertgenCreate}}
           imagePullPolicy: IfNotPresent
           args:
             - create
@@ -255,7 +255,7 @@ spec:
     spec:
       containers:
         - name: patch
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.KubeWebhookCertgenPatch}}
+          image: {{default .Registries.KubeWebhookCertgenPatch .ImageRepository}}/{{.Images.KubeWebhookCertgenPatch}}
           imagePullPolicy:
           args:
             - patch
diff --git a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
index 2ba75b5379..8211d39331 100644
--- a/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
+++ b/deploy/addons/istio-provisioner/istio-operator.yaml.tmpl
@@ -218,7 +218,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.IstioOperator}}
+          image: {{default .Registries.IstioOperator .ImageRepository}}/{{.Images.IstioOperator}}
           command:
           - operator
           - server
diff --git a/deploy/addons/kubevirt/pod.yaml.tmpl b/deploy/addons/kubevirt/pod.yaml.tmpl
index 0c1bf988aa..d43502b5f9 100644
--- a/deploy/addons/kubevirt/pod.yaml.tmpl
+++ b/deploy/addons/kubevirt/pod.yaml.tmpl
@@ -50,7 +50,7 @@ spec:
     - /bin/bash
     - -c
     - /kubevirt-scripts/install.sh
-    image: {{default "docker.io" .ImageRepository}}/{{.Images.Kubectl}}
+    image: {{default .Registries.Kubectl .ImageRepository}}/{{.Images.Kubectl}}
     imagePullPolicy: IfNotPresent
     name: kubevirt-provisioner
     lifecycle:
diff --git a/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl b/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl
index f227d7c6fd..ac88a6e261 100644
--- a/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl
+++ b/deploy/addons/logviewer/logviewer-dp-and-svc.yaml.tmpl
@@ -42,7 +42,7 @@ spec:
       containers:
       - name: logviewer
         imagePullPolicy: Always
-        image: {{default "docker.io" .ImageRepository}}/{{.Images.LogViewer}}
+        image: {{default .Registries.LogViewer .ImageRepository}}/{{.Images.LogViewer}}
         volumeMounts:
          - name: logs
            mountPath: /var/log/containers/
diff --git a/deploy/addons/metallb/metallb.yaml.tmpl b/deploy/addons/metallb/metallb.yaml.tmpl
index 78128b83da..2dc0875468 100644
--- a/deploy/addons/metallb/metallb.yaml.tmpl
+++ b/deploy/addons/metallb/metallb.yaml.tmpl
@@ -212,7 +212,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.hostIP
-        image: {{default "docker.io" .ImageRepository}}/{{.Images.Speaker}}
+        image: {{default .Registries.Speaker .ImageRepository}}/{{.Images.Speaker}}
         imagePullPolicy: IfNotPresent
         name: speaker
         ports:
@@ -268,7 +268,7 @@ spec:
       - args:
         - --port=7472
         - --config=config
-        image: {{default "docker.io" .ImageRepository}}/{{.Images.Controller}}
+        image: {{default .Registries.Controller .ImageRepository}}/{{.Images.Controller}}
         imagePullPolicy: IfNotPresent
         name: controller
         ports:
diff --git a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl
index 6066ef475d..e553c08cd7 100644
--- a/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl
+++ b/deploy/addons/metrics-server/metrics-server-deployment.yaml.tmpl
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: metrics-server
-        image: {{default "k8s.gcr.io" .ImageRepository}}/{{.Images.MetricsServer}}
+        image: {{default .Registries.MetricsServer .ImageRepository}}/{{.Images.MetricsServer}}
         imagePullPolicy: IfNotPresent
         command:
         - /metrics-server
diff --git a/deploy/addons/olm/olm.yaml.tmpl b/deploy/addons/olm/olm.yaml.tmpl
index 4e28cc5f61..5d1c8673de 100644
--- a/deploy/addons/olm/olm.yaml.tmpl
+++ b/deploy/addons/olm/olm.yaml.tmpl
@@ -82,7 +82,7 @@ spec:
           - $(OPERATOR_NAMESPACE)
           - -writeStatusName
           - ""
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.OLM}}
+          image: {{default .Registries.OLM .ImageRepository}}/{{.Images.OLM}}
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -143,7 +143,7 @@ spec:
           - '-namespace'
           - olm
           - -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
-          image: {{default "quay.io" .ImageRepository}}/{{.Images.OLM}}
+          image: {{default .Registries.OLM .ImageRepository}}/{{.Images.OLM}}
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -307,7 +307,7 @@ spec:
                 - "5443"
                 - --global-namespace
                 - olm
-                image: {{default "quay.io" .ImageRepository}}/{{.Images.OLM}}
+                image: {{default .Registries.OLM .ImageRepository}}/{{.Images.OLM}}
                 imagePullPolicy: Always
                 ports:
                 - containerPort: 5443
@@ -346,6 +346,6 @@ metadata:
   namespace: olm
 spec:
   sourceType: grpc
-  image: {{default "quay.io" .ImageRepository}}/{{.Images.UpstreamCommunityOperators}}
+  image: {{default .Registries.UpstreamCommunityOperators .ImageRepository}}/{{.Images.UpstreamCommunityOperators}}
   displayName: Community Operators
   publisher: OperatorHub.io
\ No newline at end of file
diff --git a/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl b/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
index f4bb5ea002..e03d7d77f1 100644
--- a/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
+++ b/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl
@@ -17,7 +17,7 @@ spec:
     spec:
       initContainers:
         - name: update
-          image: {{default "docker.io" .ImageRepository}}/{{.Images.Alpine}}
+          image: {{default .Registries.Alpine .ImageRepository}}/{{.Images.Alpine}}
           volumeMounts:
             - name: etchosts
               mountPath: /host-etc/hosts
@@ -43,7 +43,7 @@ spec:
               echo "Done."
       containers:
         - name: pause-for-update
-          image: {{default "gcr.io" .ImageRepository}}/{{.Images.Pause}}
+          image: {{default .Registries.Pause .ImageRepository}}/{{.Images.Pause}}
       terminationGracePeriodSeconds: 30
       volumes:
         - name: etchosts
diff --git a/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl b/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl
index 891f5b2835..8ea8848a12 100644
--- a/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl
+++ b/deploy/addons/registry-creds/registry-creds-rc.yaml.tmpl
@@ -18,7 +18,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: {{default "docker.io" .ImageRepository}}/{{.Images.RegistryCreds}}
+      - image: {{default .Registries.RegistryCreds .ImageRepository}}/{{.Images.RegistryCreds}}
         name: registry-creds
         imagePullPolicy: Always
         env:
diff --git a/deploy/addons/registry/registry-proxy.yaml.tmpl b/deploy/addons/registry/registry-proxy.yaml.tmpl
index 80d5ebe25b..8842058adf 100644
--- a/deploy/addons/registry/registry-proxy.yaml.tmpl
+++ b/deploy/addons/registry/registry-proxy.yaml.tmpl
@@ -19,7 +19,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: {{default "gcr.io" .ImageRepository}}/{{.Images.KubeRegistryProxy}}
+      - image: {{default .Registries.KubeRegistryProxy .ImageRepository}}/{{.Images.KubeRegistryProxy}}
         imagePullPolicy: IfNotPresent
         name: registry-proxy
         ports:
diff --git a/deploy/addons/registry/registry-rc.yaml.tmpl b/deploy/addons/registry/registry-rc.yaml.tmpl
index 4a7165ed7d..7db20a49e5 100644
--- a/deploy/addons/registry/registry-rc.yaml.tmpl
+++ b/deploy/addons/registry/registry-rc.yaml.tmpl
@@ -18,7 +18,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: {{default "docker.io" .ImageRepository}}/{{.Images.Registry}}
+      - image: {{default .Registries.Registry .ImageRepository}}/{{.Images.Registry}}
         imagePullPolicy: IfNotPresent
         name: registry
         ports:
diff --git a/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl b/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl
index da629732e2..d94287e17c 100644
--- a/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl
+++ b/deploy/addons/storage-provisioner-gluster/glusterfs-daemonset.yaml.tmpl
@@ -31,7 +31,7 @@ spec:
       #  kubernetes.io/hostname: minikube
       hostNetwork: true
       containers:
-      - image: {{default "quay.io" .ImageRepository}}/{{.Images.GlusterfsServer}}
+      - image: {{default .Registries.GlusterfsServer .ImageRepository}}/{{.Images.GlusterfsServer}}
         imagePullPolicy: IfNotPresent
         name: glusterfs
         env:
diff --git a/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl b/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl
index fdc7fbd270..da4e3341d2 100644
--- a/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl
+++ b/deploy/addons/storage-provisioner-gluster/heketi-deployment.yaml.tmpl
@@ -116,7 +116,7 @@ spec:
     spec:
       serviceAccountName: heketi-service-account
       containers:
-      - image: {{default "docker.io" .ImageRepository}}/{{.Images.Heketi}}
+      - image: {{default .Registries.Heketi .ImageRepository}}/{{.Images.Heketi}}
         imagePullPolicy: IfNotPresent
         name: heketi
         env:
diff --git a/deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl b/deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl
index ebefe5557d..af0ddc53ef 100644
--- a/deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl
+++ b/deploy/addons/storage-provisioner-gluster/storage-provisioner-glusterfile.yaml.tmpl
@@ -106,7 +106,7 @@ spec:
       serviceAccountName: glusterfile-provisioner
       containers:
       - name: glusterfile-provisioner
-        image: {{default "docker.io" .ImageRepository}}/{{.Images.GlusterfileProvisioner}}
+        image: {{default .Registries.GlusterfileProvisioner .ImageRepository}}/{{.Images.GlusterfileProvisioner}}
         imagePullPolicy: Always
         env:
         - name: PROVISIONER_NAME
diff --git a/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl b/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
index 9910e536f8..1ec47136f7 100644
--- a/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
+++ b/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
@@ -100,7 +100,7 @@ spec:
   hostNetwork: true
   containers:
   - name: storage-provisioner
-    image: {{default "gcr.io" .ImageRepository}}/{{.Images.StorageProvisioner}}
+    image: {{default .Registries.StorageProvisioner .ImageRepository}}/{{.Images.StorageProvisioner}}
     command: ["/storage-provisioner"]
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl b/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl
index 1dcfd77e6f..b0d44980bb 100644
--- a/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl
+++ b/deploy/addons/volumesnapshots/volume-snapshot-controller-deployment.yaml.tmpl
@@ -23,7 +23,7 @@ spec:
       containers:
         - name: volume-snapshot-controller
           # TODO(xyang): Replace with an official image when it is released
-          image: {{default "gcr.io" .ImageRepository}}/{{.Images.SnapshotController}}
+          image: {{default .Registries.SnapshotController .ImageRepository}}/{{.Images.SnapshotController}}
           args:
             - "--v=5"
           imagePullPolicy: Always
diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go
index bcc9cf8848..de71517250 100644
--- a/pkg/minikube/assets/addons.go
+++ b/pkg/minikube/assets/addons.go
@@ -639,6 +639,7 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig) interface{}
 		LoadBalancerEndIP   string
 		CustomIngressCert   string
 		Images              map[string]string
+		Registries          map[string]string
 	}{
 		Arch:                a,
 		ExoticArch:          ea,
@@ -647,6 +648,7 @@ func GenerateTemplateData(addon *Addon, cfg config.KubernetesConfig) interface{}
 		LoadBalancerEndIP:   cfg.LoadBalancerEndIP,
 		CustomIngressCert:   cfg.CustomIngressCert,
 		Images:              addon.Images,
+		Registries:          addon.Registries,
 	}
 
 	if opts.Images == nil {