diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index e46d7360..5e2264ef 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -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"), }, } ) diff --git a/image/mirror.go b/image/mirror.go index 77f60cec..0e6eae80 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -4,6 +4,27 @@ import "strings" var Mirrors = map[string]string{} +var ( + ManifestList = []string{ + "quay.io/coreos/etcd:v3.2.24", + "gcr.io/google_containers/k8s-dns-kube-dns:1.15.0", + "gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0", + "gcr.io/google_containers/k8s-dns-sidecar:1.15.0", + "gcr.io/google_containers/k8s-dns-kube-dns:1.14.13", + "gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13", + "gcr.io/google_containers/k8s-dns-sidecar:1.14.13", + "gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0", + "quay.io/coreos/flannel:v0.10.0", + "gcr.io/google_containers/pause:3.1", + "gcr.io/google_containers/metrics-server:v0.3.1", + "k8s.gcr.io/defaultbackend:1.4", + } + ArchitectureList = []string{ + "amd64", + "arm64", + } +) + func Mirror(image string) string { orig := image if strings.HasPrefix(image, "weaveworks") {