Fix docker.io/ prefix

Signed-off-by: Ling Samuel <[email protected]>
kubernetes · Jan 12, 2021 · dd66adb · dd66adb
1 parent f8682cd
commit dd66adb
Show file tree

Hide file tree

Showing 37 changed files with 117 additions and 94 deletions.
diff --git a/cmd/minikube/cmd/config/enable.go b/cmd/minikube/cmd/config/enable.go
@@ -31,9 +31,10 @@ import (
 )
 
 var addonsEnableCmd = &cobra.Command{
-	Use:   "enable ADDON_NAME",
-	Short: "Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list ",
-	Long:  "Enables the addon w/ADDON_NAME within minikube (example: minikube addons enable dashboard). For a list of available addons use: minikube addons list ",
+	Use:     "enable ADDON_NAME",
+	Short:   "Enables the addon w/ADDON_NAME within minikube. For a list of available addons use: minikube addons list ",
+	Long:    "Enables the addon w/ADDON_NAME within minikube. For a list of available addons use: minikube addons list ",
+	Example: "minikube addons enable dashboard",
 	Run: func(cmd *cobra.Command, args []string) {
 		if len(args) != 1 {
 			exit.Message(reason.Usage, "usage: minikube addons enable ADDON_NAME")
@@ -45,6 +46,7 @@ var addonsEnableCmd = &cobra.Command{
 			addon = "metrics-server"
 		}
 		viper.Set(config.AddonImages, images)
+		viper.Set(config.AddonRegistries, registries)
 		err := addons.SetAndSave(ClusterFlagValue(), addon, "true")
 		if err != nil {
 			exit.Error(reason.InternalEnable, "enable failed", err)
@@ -67,10 +69,12 @@ var addonsEnableCmd = &cobra.Command{
 }
 
 var (
-	images string
+	images     string
+	registries string
 )
 
 func init() {
-	addonsEnableCmd.Flags().StringVar(&images, "images", "", "Alpha feature. Image names used by this addon. Divided by comma.")
+	addonsEnableCmd.Flags().StringVar(&images, "images", "", "Images used by this addon. Divided by comma.")
+	addonsEnableCmd.Flags().StringVar(&registries, "registries", "", "Registries used by this addon. Divided by comma.")
 	AddonsCmd.AddCommand(addonsEnableCmd)
 }
diff --git 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 .Registries.AmbassadorOperator .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
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: {{default .Registries.Attacher .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
@@ -53,7 +53,7 @@ spec:
     spec:
       containers:
         - name: node-driver-registrar
-          image: {{default .Registries.NodeDriverRegistrar .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 .Registries.HostPathPlugin .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 .Registries.LivenessProbe .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
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: {{default .Registries.Provisioner .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
@@ -57,7 +57,7 @@ spec:
       serviceAccountName: csi-resizer
       containers:
         - name: csi-resizer
-          image: {{default .Registries.Resizer .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
@@ -57,7 +57,7 @@ spec:
       serviceAccount: csi-snapshotter
       containers:
         - name: csi-snapshotter
-          image: {{default .Registries.Snapshotter .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
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
         - name: dashboard-metrics-scraper
-          image: {{default .Registries.MetricsScraper .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 .Registries.Dashboard .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
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: elasticsearch-logging
-        image: {{default .Registries.Elasticsearch .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 .Registries.Alpine .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
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
       - name: fluentd-es
-        image: {{default .Registries.FluentdElasticsearch .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
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: {{default .Registries.Kibana .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
@@ -34,7 +34,7 @@ spec:
     spec:
       containers:
       - name: freshpod
-        image: {{default .Registries.FreshPod .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
@@ -68,7 +68,7 @@ spec:
       serviceAccountName: minikube-gcp-auth-certs
       containers:
         - name: create
-          image: {{default .Registries.KubeWebhookCertgen .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 .Registries.GCPAuthWebhook .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 .Registries.KubeWebhookCertgen .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
@@ -50,7 +50,7 @@ spec:
         hostPath:
           path: /
       initContainers:
-      - image: {{default .Registries.NvidiaDriverInstaller .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
@@ -43,7 +43,7 @@ spec:
         hostPath:
           path: /var/lib/kubelet/device-plugins
       containers:
-      - image: {{default .Registries.NvidiaDevicePlugin .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
@@ -25,7 +25,7 @@ spec:
   hostPID: true
   containers:
     - name: gvisor
-      image: {{default .Registries.GvisorAddon .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
@@ -46,7 +46,7 @@ spec:
               value: kube-system
             - name: TILLER_HISTORY_MAX
               value: "0"
-          image: {{default .Registries.Tiller .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
@@ -80,7 +80,7 @@ spec:
   hostNetwork: true
   containers:
     - name: minikube-ingress-dns
-      image: {{default .Registries.IngressDNS .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
@@ -49,7 +49,7 @@ spec:
       serviceAccountName: ingress-nginx
       containers:
         - name: controller
-          image: {{default .Registries.IngressController .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 .Registries.KubeWebhookCertgenCreate .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 .Registries.KubeWebhookCertgenPatch .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
@@ -218,7 +218,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: {{default .Registries.IstioOperator .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
@@ -50,7 +50,7 @@ spec:
     - /bin/bash
     - -c
     - /kubevirt-scripts/install.sh
-    image: {{default .Registries.Kubectl .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
@@ -42,7 +42,7 @@ spec:
       containers:
       - name: logviewer
         imagePullPolicy: Always
-        image: {{default .Registries.LogViewer .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
@@ -212,7 +212,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.hostIP
-        image: {{default .Registries.Speaker .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 .Registries.Controller .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
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: metrics-server
-        image: {{default .Registries.MetricsServer .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
@@ -82,7 +82,7 @@ spec:
           - $(OPERATOR_NAMESPACE)
           - -writeStatusName
           - ""
-          image: {{default .Registries.OLM .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 .Registries.OLM .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 .Registries.OLM .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 .Registries.UpstreamCommunityOperators .ImageRepository}}/{{.Images.UpstreamCommunityOperators}}
+  image: {{default .Registries.UpstreamCommunityOperators .ImageRepository}}{{.Images.UpstreamCommunityOperators}}
   displayName: Community Operators
   publisher: OperatorHub.io
diff --git 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 .Registries.Alpine .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 .Registries.Pause .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
@@ -18,7 +18,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: {{default .Registries.RegistryCreds .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
@@ -19,7 +19,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: {{default .Registries.KubeRegistryProxy .ImageRepository}}/{{.Images.KubeRegistryProxy}}
+      - image: {{default .Registries.KubeRegistryProxy .ImageRepository}}{{.Images.KubeRegistryProxy}}
         imagePullPolicy: IfNotPresent
         name: registry-proxy
         ports: