Skip to content

Update addon files to use fully qualified name #14521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Aug 12, 2022
+55 −26
Merged

Update addon files to use fully qualified name #14521

Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6338d6a
Kubernetes dashboard
siddhant-khisty Jul 7, 2022
fe356d5
k8s metrics-scraper
siddhant-khisty Jul 7, 2022
57e93f6
fixed broken link for kube-registry-proxy
siddhant-khisty Jul 7, 2022
6c2ea26
registry-creds
siddhant-khisty Jul 7, 2022
9d2f709
Nvidia k8s-device-plugin
siddhant-khisty Jul 7, 2022
55df5e7
minikube-log-viewer
siddhant-khisty Jul 7, 2022
f3ade07
minikube-ingress-dns
siddhant-khisty Jul 7, 2022
44d719d
kube-webhook-certgen
siddhant-khisty Jul 7, 2022
4a6dd34
gcp-auth-webhook
siddhant-khisty Jul 7, 2022
072e973
auto-pause-hook
siddhant-khisty Jul 7, 2022
176e5d5
updated all k8s.gcr addons
siddhant-khisty Jul 7, 2022
820acb0
google cloud registry
siddhant-khisty Jul 7, 2022
441d4ed
gluster-centos
siddhant-khisty Jul 7, 2022
598842d
heketi
siddhant-khisty Jul 7, 2022
90a7e70
coredns
siddhant-khisty Jul 7, 2022
f686234
kindnetd
siddhant-khisty Jul 7, 2022
0d21deb
grc.io
siddhant-khisty Jul 7, 2022
8858959
added docker.io to images.
siddhant-khisty Jul 7, 2022
971ffda
Merge branch 'update-addon-files' of https://github.com/SiddhantKhist…
siddhant-khisty Jul 7, 2022
a0a02d1
Merge branch 'kubernetes:master' into update-addon-files
siddhant-khisty Jul 15, 2022
4e3ae18
Added docker.io to a few files in addons.go
siddhant-khisty Jul 15, 2022
ffcd989
Added docker.io to registry
siddhant-khisty Jul 16, 2022
8ac93ce
Made requested changes
siddhant-khisty Jul 20, 2022
73f11ee
add missing registries
siddhant-khisty Jul 26, 2022
3558454
Merge branch 'master' into update-addon-files
spowelljr Jul 26, 2022
a166af4
Added Linters
siddhant-khisty Jul 26, 2022
99e1c4f
Merge branch 'master' into update-addon-files
spowelljr Jul 29, 2022
3796810
Merge branch 'kubernetes:master' into update-addon-files
siddhant-khisty Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions deploy/addons/aliyun_mirror.json
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard",
"kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper",
"docker.io/kubernetesui/dashboard": "registry.cn-hangzhou.aliyuncs.com/google_containers/dashboard",
"docker.io/kubernetesui/metrics-scraper": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-scraper",
"gcr.io/k8s-minikube/auto-pause-hook": "registry.cn-hangzhou.aliyuncs.com/google_containers/auto-pause-hook",
"quay.io/operator-framework/olm": "registry.cn-hangzhou.aliyuncs.com/google_containers/olm",
"quay.io/operator-framework/upstream-community-operators": "registry.cn-hangzhou.aliyuncs.com/google_containers/upstream-community-operators",
"k8s.gcr.io/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy",
"upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds",
"docker.io/upmcenterprises/registry-creds": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry-creds",
"quay.io/rhdevelopers/core-dns-patcher": "registry.cn-hangzhou.aliyuncs.com/google_containers/core-dns-patcher",
"nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin",
"ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer",
"cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns",
"docker.io/nvidia/k8s-device-plugin": "registry.cn-hangzhou.aliyuncs.com/google_containers/k8s-device-plugin",
"docker.io/ivans3/minikube-log-viewer": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-log-viewer",
"docker.io/cryptexlabs/minikube-ingress-dns": "registry.cn-hangzhou.aliyuncs.com/google_containers/minikube-ingress-dns",
"quay.io/datawire/ambassador-operator": "registry.cn-hangzhou.aliyuncs.com/google_containers/ambassador-operator",
"jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen",
"docker.io/jettech/kube-webhook-certgen": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-webhook-certgen",
"gcr.io/k8s-minikube/gcp-auth-webhook": "registry.cn-hangzhou.aliyuncs.com/google_containers/gcp-auth-webhook",
"k8s.gcr.io/sig-storage/snapshot-controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/snapshot-controller",
"k8s.gcr.io/sig-storage/csi-attacher": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-attacher",
@@ -23,11 +23,11 @@
"k8s.gcr.io/sig-storage/csi-resizer": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-resizer",
"k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter",
"k8s.gcr.io/sig-storage/csi-provisioner": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-provisioner",
"registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry",
"docker.io/registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry",
"docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server",
"heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi",
"coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns",
"kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd",
"docker.io/heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi",
"docker.io/coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns",
"docker.io/kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd",
"k8s.gcr.io/ingress-nginx/controller": "registry.cn-hangzhou.aliyuncs.com/google_containers/nginx-ingress-controller",
"gcr.io/cloud-builders/gcs-fetcher": "registry.cn-hangzhou.aliyuncs.com/cloud-builders/gcs-fetcher",
"gcr.io/google-samples/freshpod": "registry.cn-hangzhou.aliyuncs.com/google_containers/freshpod",
@@ -99,4 +99,4 @@
"gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause",
"k8s.gcr.io/metrics-server/metrics-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/metrics-server",
"gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy"
}
}
57 changes: 43 additions & 14 deletions pkg/minikube/assets/addons.go
View file
Original file line number Diff line number Diff line change
@@ -140,7 +140,10 @@ var Addons = map[string]*Addon{
}, false, "dashboard", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/handbook/dashboard/", map[string]string{
"Dashboard": "kubernetesui/dashboard:v2.6.0@sha256:4af9580485920635d888efe1eddbd67e12f9d5d84dba87100e93feb4e46636b3",
"MetricsScraper": "kubernetesui/metrics-scraper:v1.0.8@sha256:76049887f07a0476dc93efc2d3569b9529bf982b22d29f356092ce206e98765c",
}, nil),
}, map[string]string{
"Dashboard": "docker.io",
"MetricsScraper": "docker.io",
}),
"default-storageclass": NewAddon([]*BinAsset{
MustBinAsset(addons.DefaultStorageClassAssets,
"storageclass/storageclass.yaml.tmpl",
@@ -191,7 +194,11 @@ var Addons = map[string]*Addon{
"Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8",
"GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223",
"GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908",
}, nil),
}, map[string]string{
"Heketi": "docker.io",
"GlusterfsServer": "docker.io",
"GlusterfileProvisioner": "docker.io",
}),
"efk": NewAddon([]*BinAsset{
MustBinAsset(addons.EfkAssets,
"efk/elasticsearch-rc.yaml.tmpl",
@@ -232,6 +239,7 @@ var Addons = map[string]*Addon{
"Elasticsearch": "k8s.gcr.io",
"FluentdElasticsearch": "k8s.gcr.io",
"Kibana": "docker.elastic.co",
"Alpine": "docker.io",
}),
"ingress": NewAddon([]*BinAsset{
MustBinAsset(addons.IngressAssets,
@@ -243,11 +251,13 @@ var Addons = map[string]*Addon{
// https://github.com/kubernetes/ingress-nginx/blob/c32f9a43279425920c41ba2e54dfcb1a54c0daf7/deploy/static/provider/kind/deploy.yaml#L834
"IngressController": "ingress-nginx/controller:v1.2.1@sha256:5516d103a9c2ecc4f026efbd4b40662ce22dc1f824fb129ed121460aaa5c47f8",
// https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L621
"KubeWebhookCertgenCreate": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
"KubeWebhookCertgenCreate": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
// https://github.com/kubernetes/ingress-nginx/blob/fc38b9f2aa2d68ee00c417cf97e727b77a00c175/deploy/static/provider/kind/deploy.yaml#L673
"KubeWebhookCertgenPatch": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
"KubeWebhookCertgenPatch": "ingress-nginx/kube-webhook-certgen:v1.1.1@sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660",
}, map[string]string{
"IngressController": "k8s.gcr.io",
"IngressController": "k8s.gcr.io",
"KubeWebhookCertgenCreate": "k8s.gcr.io",
"KubeWebhookCertgenPatch": "k8s.gcr.io",
}),
"istio-provisioner": NewAddon([]*BinAsset{
MustBinAsset(addons.IstioProvisionerAssets,
@@ -257,7 +267,9 @@ var Addons = map[string]*Addon{
"0640"),
}, false, "istio-provisioner", "3rd party (Istio)", "", "https://istio.io/latest/docs/setup/platform-setup/minikube/", map[string]string{
"IstioOperator": "istio/operator:1.12.2@sha256:42c7609872882cb88728a1592561b4046dac6d05b6002cbdc815b84c86a24f08",
}, nil),
}, map[string]string{
"IstioOperator": "docker.io",
}),
"istio": NewAddon([]*BinAsset{
MustBinAsset(addons.IstioAssets,
"istio/istio-default-profile.yaml.tmpl",
@@ -274,7 +286,10 @@ var Addons = map[string]*Addon{
}, false, "kong", "3rd party (Kong HQ)", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/kong-ingress/", map[string]string{
"Kong": "kong:2.7@sha256:4d3e93207305ace881fe9e95ac27717b6fbdd9e0ec1873c34e94908a4f4c9335",
"KongIngress": "kong/kubernetes-ingress-controller:2.1.1@sha256:60e4102ab2da7f61e9c478747f0762d06a6166b5f300526b237ed7354c3cb4c8",
}, nil),
}, map[string]string{
"Kong": "docker.io",
"KongIngress": "docker.io",
}),
"kubevirt": NewAddon([]*BinAsset{
MustBinAsset(addons.KubevirtAssets,
"kubevirt/pod.yaml.tmpl",
@@ -283,7 +298,9 @@ var Addons = map[string]*Addon{
"0640"),
}, false, "kubevirt", "3rd party (KubeVirt)", "", "https://minikube.sigs.k8s.io/docs/tutorials/kubevirt/", map[string]string{
"Kubectl": "bitnami/kubectl:1.17@sha256:de642e973d3d0ef60e4d0a1f92286a9fdae245535c5990d4762bbe86fcf95887",
}, nil),
}, map[string]string{
"Kubectl": "docker.io",
}),
"metrics-server": NewAddon([]*BinAsset{
MustBinAsset(addons.MetricsServerAssets,
"metrics-server/metrics-apiservice.yaml.tmpl",
@@ -350,6 +367,7 @@ var Addons = map[string]*Addon{
"KubeRegistryProxy": "google_containers/kube-registry-proxy:0.4@sha256:1040f25a5273de0d72c54865a8efd47e3292de9fb8e5353e3fa76736b854f2da",
}, map[string]string{
"KubeRegistryProxy": "gcr.io",
"Registry": "docker.io",
}),
"registry-creds": NewAddon([]*BinAsset{
MustBinAsset(addons.RegistryCredsAssets,
@@ -359,7 +377,9 @@ var Addons = map[string]*Addon{
"0640"),
}, false, "registry-creds", "3rd party (UPMC Enterprises)", "", "https://minikube.sigs.k8s.io/docs/handbook/registry/", map[string]string{
"RegistryCreds": "upmcenterprises/registry-creds:1.10@sha256:93a633d4f2b76a1c66bf19c664dbddc56093a543de6d54320f19f585ccd7d605",
}, nil),
}, map[string]string{
"RegistryCreds": "docker.io",
}),
"registry-aliases": NewAddon([]*BinAsset{
MustBinAsset(addons.RegistryAliasesAssets,
"registry-aliases/registry-aliases-sa.tmpl",
@@ -393,6 +413,7 @@ var Addons = map[string]*Addon{
}, map[string]string{
"CoreDNSPatcher": "quay.io",
"Pause": "gcr.io",
"Alpine": "docker.io",
}),
"freshpod": NewAddon([]*BinAsset{
MustBinAsset(addons.FreshpodAssets,
@@ -442,7 +463,9 @@ var Addons = map[string]*Addon{
"0640"),
}, false, "logviewer", "3rd party (unknown)", "", "", map[string]string{
"LogViewer": "ivans3/minikube-log-viewer:latest@sha256:75854f45305cc47d17b04c6c588fa60777391761f951e3a34161ddf1f1b06405",
}, nil),
}, map[string]string{
"LogViewer": "docker.io",
}),
"gvisor": NewAddon([]*BinAsset{
MustBinAsset(addons.GvisorAssets,
"gvisor/gvisor-pod.yaml.tmpl",
@@ -512,7 +535,10 @@ var Addons = map[string]*Addon{
}, false, "metallb", "3rd party (MetalLB)", "", "", map[string]string{
"Speaker": "metallb/speaker:v0.9.6@sha256:c66585a805bed1a3b829d8fb4a4aab9d87233497244ebff96f1b88f1e7f8f991",
"Controller": "metallb/controller:v0.9.6@sha256:fbfdb9d3f55976b0ee38f3309d83a4ca703efcf15d6ca7889cd8189142286502",
}, nil),
}, map[string]string{
"Speaker": "docker.io",
"Controller": "docker.io",
}),
"ambassador": NewAddon([]*BinAsset{
MustBinAsset(addons.AmbassadorAssets,
"ambassador/ambassador-operator-crds.yaml.tmpl",
@@ -551,10 +577,11 @@ var Addons = map[string]*Addon{
"gcp-auth-webhook.yaml",
"0640"),
}, false, "gcp-auth", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/gcp-auth/", map[string]string{
"KubeWebhookCertgen": "k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
"KubeWebhookCertgen": "ingress-nginx/kube-webhook-certgen:v1.0@sha256:f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068",
"GCPAuthWebhook": "k8s-minikube/gcp-auth-webhook:v0.0.10@sha256:1ce1510da2a4af923e678d487ec0a78f4a8f2a65206a3aa8de659a196ae98d0f",
}, map[string]string{
"GCPAuthWebhook": "gcr.io",
"GCPAuthWebhook": "gcr.io",
"KubeWebhookCertgen": "k8s.gcr.io",
}),
"volumesnapshots": NewAddon([]*BinAsset{
// 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{
"0640"),
}, false, "portainer", "3rd party (Portainer.io)", "", "", map[string]string{
"Portainer": "portainer/portainer-ce:latest@sha256:4f126c5114b63e9d1bceb4b368944d14323329a9a0d4e7bb7eb53c9b7435d498",
}, nil),
}, map[string]string{
"Portainer": "docker.io",
}),
"inaccel": NewAddon([]*BinAsset{
MustBinAsset(addons.InAccelAssets,
"inaccel/fpga-operator.yaml.tmpl",