Skip to content

Commit 7e9b53b

Browse files
spowelljrspowelljr
authored
Merge pull request #14521 from siddhant-khisty/update-addon-files
Update addon files to use fully qualified name
2 parents 83bfa6b + 3796810 commit 7e9b53b

File tree

2 files changed

+55
-26
lines changed

2 files changed

+55
-26
lines changed

‎deploy/addons/aliyun_mirror.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard",
3-
"kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper",
2+
"docker.io/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard",
3+
"docker.io/kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper",
44
"gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook",
55
"quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm",
66
"quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators",
77
"k8s.gcr.io/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy",
8-
"upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds",
8+
"docker.io/upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds",
99
"quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher",
10-
"nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin",
11-
"ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer",
12-
"cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns",
10+
"docker.io/nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin",
11+
"docker.io/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer",
12+
"docker.io/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns",
1313
"quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator",
14-
"jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen",
14+
"docker.io/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen",
1515
"gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook",
1616
"k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller",
1717
"k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher",
@@ -23,11 +23,11 @@
2323
"k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer",
2424
"k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter",
2525
"k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner",
26-
"registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry",
26+
"docker.io/registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry",
2727
"docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server",
28-
"heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi",
29-
"coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns",
30-
"kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd",
28+
"docker.io/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi",
29+
"docker.io/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns",
30+
"docker.io/kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd",
3131
"k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller",
3232
"gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher",
3333
"gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod",
@@ -99,4 +99,4 @@
9999
"gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause",
100100
"k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server",
101101
"gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy"
102-
}
102+
}

‎pkg/minikube/assets/addons.go

+43-14
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ var Addons = map[string]*Addon{
140140
}, false, "dashboard", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{
141141
"Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3",
142142
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c",
143-
}, nil),
143+
}, map[string]string{
144+
"Dashboard": "docker.io",
145+
"MetricsScraper": "docker.io",
146+
}),
144147
"default-storageclass": NewAddon([]*BinAsset{
145148
MustBinAsset(addons.DefaultStorageClassAssets,
146149
"storageclass/storageclass.yaml.tmpl",
@@ -191,7 +194,11 @@ var Addons = map[string]*Addon{
191194
"Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8",
192195
"GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223",
193196
"GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908",
194-
}, nil),
197+
}, map[string]string{
198+
"Heketi": "docker.io",
199+
"GlusterfsServer": "docker.io",
200+
"GlusterfileProvisioner": "docker.io",
201+
}),
195202
"efk": NewAddon([]*BinAsset{
196203
MustBinAsset(addons.EfkAssets,
197204
"efk/elasticsearch-rc.yaml.tmpl",
@@ -232,6 +239,7 @@ var Addons = map[string]*Addon{
232239
"Elasticsearch": "k8s.gcr.io",
233240
"FluentdElasticsearch": "k8s.gcr.io",
234241
"Kibana": "docker.elastic.co",
242+
"Alpine": "docker.io",
235243
}),
236244
"ingress": NewAddon([]*BinAsset{
237245
MustBinAsset(addons.IngressAssets,
@@ -243,11 +251,13 @@ var Addons = map[string]*Addon{
243251
// https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834
244252
"IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8",
245253
// https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621
246-
"KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
254+
"KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
247255
// https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L673
248-
"KubeWebhookCertgenPatch": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
256+
"KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
249257
}, map[string]string{
250-
"IngressController": "k8s.gcr.io",
258+
"IngressController": "k8s.gcr.io",
259+
"KubeWebhookCertgenCreate": "k8s.gcr.io",
260+
"KubeWebhookCertgenPatch": "k8s.gcr.io",
251261
}),
252262
"istio-provisioner": NewAddon([]*BinAsset{
253263
MustBinAsset(addons.IstioProvisionerAssets,
@@ -257,7 +267,9 @@ var Addons = map[string]*Addon{
257267
"0640"),
258268
}, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{
259269
"IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08",
260-
}, nil),
270+
}, map[string]string{
271+
"IstioOperator": "docker.io",
272+
}),
261273
"istio": NewAddon([]*BinAsset{
262274
MustBinAsset(addons.IstioAssets,
263275
"istio/istio-default-profile.yaml.tmpl",
@@ -274,7 +286,10 @@ var Addons = map[string]*Addon{
274286
}, false, "kong", "3rd party (Kong HQ)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{
275287
"Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335",
276288
"KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8",
277-
}, nil),
289+
}, map[string]string{
290+
"Kong": "docker.io",
291+
"KongIngress": "docker.io",
292+
}),
278293
"kubevirt": NewAddon([]*BinAsset{
279294
MustBinAsset(addons.KubevirtAssets,
280295
"kubevirt/pod.yaml.tmpl",
@@ -283,7 +298,9 @@ var Addons = map[string]*Addon{
283298
"0640"),
284299
}, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{
285300
"Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887",
286-
}, nil),
301+
}, map[string]string{
302+
"Kubectl": "docker.io",
303+
}),
287304
"metrics-server": NewAddon([]*BinAsset{
288305
MustBinAsset(addons.MetricsServerAssets,
289306
"metrics-server/metrics-apiservice.yaml.tmpl",
@@ -350,6 +367,7 @@ var Addons = map[string]*Addon{
350367
"KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da",
351368
}, map[string]string{
352369
"KubeRegistryProxy": "gcr.io",
370+
"Registry": "docker.io",
353371
}),
354372
"registry-creds": NewAddon([]*BinAsset{
355373
MustBinAsset(addons.RegistryCredsAssets,
@@ -359,7 +377,9 @@ var Addons = map[string]*Addon{
359377
"0640"),
360378
}, false, "registry-creds", "3rd party (UPMC Enterprises)", "", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{
361379
"RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605",
362-
}, nil),
380+
}, map[string]string{
381+
"RegistryCreds": "docker.io",
382+
}),
363383
"registry-aliases": NewAddon([]*BinAsset{
364384
MustBinAsset(addons.RegistryAliasesAssets,
365385
"registry-aliases/registry-aliases-sa.tmpl",
@@ -393,6 +413,7 @@ var Addons = map[string]*Addon{
393413
}, map[string]string{
394414
"CoreDNSPatcher": "quay.io",
395415
"Pause": "gcr.io",
416+
"Alpine": "docker.io",
396417
}),
397418
"freshpod": NewAddon([]*BinAsset{
398419
MustBinAsset(addons.FreshpodAssets,
@@ -442,7 +463,9 @@ var Addons = map[string]*Addon{
442463
"0640"),
443464
}, false, "logviewer", "3rd party (unknown)", "", "", map[string]string{
444465
"LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405",
445-
}, nil),
466+
}, map[string]string{
467+
"LogViewer": "docker.io",
468+
}),
446469
"gvisor": NewAddon([]*BinAsset{
447470
MustBinAsset(addons.GvisorAssets,
448471
"gvisor/gvisor-pod.yaml.tmpl",
@@ -512,7 +535,10 @@ var Addons = map[string]*Addon{
512535
}, false, "metallb", "3rd party (MetalLB)", "", "", map[string]string{
513536
"Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991",
514537
"Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502",
515-
}, nil),
538+
}, map[string]string{
539+
"Speaker": "docker.io",
540+
"Controller": "docker.io",
541+
}),
516542
"ambassador": NewAddon([]*BinAsset{
517543
MustBinAsset(addons.AmbassadorAssets,
518544
"ambassador/ambassador-operator-crds.yaml.tmpl",
@@ -551,10 +577,11 @@ var Addons = map[string]*Addon{
551577
"gcp-auth-webhook.yaml",
552578
"0640"),
553579
}, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{
554-
"KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
580+
"KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
555581
"GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.10@sha256:1ce1510da2a4af923e678d487ec0a78f4a8f2a65206a3aa8de659a196ae98d0f",
556582
}, map[string]string{
557-
"GCPAuthWebhook": "gcr.io",
583+
"GCPAuthWebhook": "gcr.io",
584+
"KubeWebhookCertgen": "k8s.gcr.io",
558585
}),
559586
"volumesnapshots": NewAddon([]*BinAsset{
560587
// make sure the order of apply. `csi-hostpath-snapshotclass` must be the first position, because it depends on `snapshot.storage.k8s.io_volumesnapshotclasses`
@@ -689,7 +716,9 @@ var Addons = map[string]*Addon{
689716
"0640"),
690717
}, false, "portainer", "3rd party (Portainer.io)", "", "", map[string]string{
691718
"Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498",
692-
}, nil),
719+
}, map[string]string{
720+
"Portainer": "docker.io",
721+
}),
693722
"inaccel": NewAddon([]*BinAsset{
694723
MustBinAsset(addons.InAccelAssets,
695724
"inaccel/fpga-operator.yaml.tmpl",

0 commit comments

Comments
 (0)