kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14518 from nixpanic/issue/14469 

storage-provisioner-gluster: use the Gluster project's container-image
pull/14529/head
Steven Powell 2022-07-06 17:53:37 -07:00 committed by GitHub
parent 381d0f1d10 08dbe304af
commit da058687b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/addons/aliyun_mirror.json
View File

@ -24,7 +24,7 @@
"k8s.gcr.io/sig-storage/csi-snapshotter": "registry.cn-hangzhou.aliyuncs.com/google_containers/csi-snapshotter", "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", "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", "registry": "registry.cn-hangzhou.aliyuncs.com/google_containers/registry",
"quay.io/nixpanic/glusterfs-server": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server", "docker.io/gluster/gluster-centos": "registry.cn-hangzhou.aliyuncs.com/google_containers/glusterfs-server",
"heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi", "heketi/heketi": "registry.cn-hangzhou.aliyuncs.com/google_containers/heketi",
"coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns", "coredns/coredns": "registry.cn-hangzhou.aliyuncs.com/google_containers/coredns",
"kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd", "kindest/kindnetd": "registry.cn-hangzhou.aliyuncs.com/google_containers/kindnetd",
@ -99,4 +99,4 @@
"gcr.io/google_containers/pause": "registry.cn-hangzhou.aliyuncs.com/google_containers/pause", "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", "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" "gcr.io/google_containers/kube-registry-proxy": "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-registry-proxy"
} }

6
pkg/minikube/assets/addons.go
View File

@ -188,10 +188,8 @@ var Addons = map[string]*Addon{
}, false, "storage-provisioner-gluster", "", "", map[string]string{ }, false, "storage-provisioner-gluster", "", "", map[string]string{
"Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8", "Heketi": "heketi/heketi:10@sha256:76d5a6a3b7cf083d1e99efa1c15abedbc5c8b73bef3ade299ce9a4c16c9660f8",
"GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223", "GlusterfileProvisioner": "gluster/glusterfile-provisioner:latest@sha256:9961a35cb3f06701958e202324141c30024b195579e5eb1704599659ddea5223",
"GlusterfsServer": "nixpanic/glusterfs-server:pr_fake-disk@sha256:3c58ae9d4e2007758954879d3f4095533831eb757c64ca6a0e32d1fc53fb6034", "GlusterfsServer": "gluster/gluster-centos:latest@sha256:8167034b9abf2d16581f3f4571507ce7d716fb58b927d7627ef72264f802e908",
}, map[string]string{ }, nil),
"GlusterfsServer": "quay.io",
}),
"efk": NewAddon([]*BinAsset{ "efk": NewAddon([]*BinAsset{
MustBinAsset(addons.EfkAssets, MustBinAsset(addons.EfkAssets,
"efk/elasticsearch-rc.yaml.tmpl", "efk/elasticsearch-rc.yaml.tmpl",