rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-08 16:39:00 +00:00
Code Issues Releases Wiki Activity

Add multiarch support

Browse Source 
1. Update default images to use docker manifest
2. Add manifest image list and architecture list for generating the images mirrorscript
This commit is contained in:
jianghang8421
2019-02-28 15:15:03 +08:00
parent ecff93ee1e
commit 2a6bf4bcf2
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -823,10 +823,10 @@ var (
NginxProxy: m("rancher/rke-tools:v0.1.25"),
CertDownloader: m("rancher/rke-tools:v0.1.25"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.25"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.14.13"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.14.13"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
CalicoNode: m("quay.io/calico/node:v3.1.3"),
@@ -837,12 +837,12 @@ var (
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
"v1.13.1-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -960,10 +960,10 @@ var (
NginxProxy: m("rancher/rke-tools:v0.1.25"),
CertDownloader: m("rancher/rke-tools:v0.1.25"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.25"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
CalicoNode: m("quay.io/calico/node:v3.4.0"),
@@ -974,12 +974,12 @@ var (
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
}
)