From a3d51c1bcc9025f7baabf8e2014b74deaab4264c Mon Sep 17 00:00:00 2001 From: jianghang8421 Date: Thu, 28 Feb 2019 15:15:03 +0800 Subject: [PATCH] Add multiarch support Update default images to use docker manifest --- apis/management.cattle.io/v3/k8s_defaults.go | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 908b47c6..e957446b 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -817,18 +817,18 @@ var ( CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.12.6-rancher1-2": { - Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), Kubernetes: m("rancher/hyperkube:v1.12.6-rancher1"), Alpine: m("rancher/rke-tools:v0.1.27"), NginxProxy: m("rancher/rke-tools:v0.1.27"), CertDownloader: m("rancher/rke-tools:v0.1.27"), KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"), - 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"), - Flannel: m("quay.io/coreos/flannel:v0.10.0"), - FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.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-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), CalicoNode: m("quay.io/calico/node:v3.1.3"), CalicoCNI: m("quay.io/calico/cni:v3.1.3"), CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), @@ -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"), - 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"), + PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), + 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"), @@ -873,18 +873,18 @@ var ( CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), }, "v1.13.4-rancher1-2": { - Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"), Alpine: m("rancher/rke-tools:v0.1.27"), NginxProxy: m("rancher/rke-tools:v0.1.27"), CertDownloader: m("rancher/rke-tools:v0.1.27"), KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"), - 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"), - Flannel: m("quay.io/coreos/flannel:v0.10.0"), - FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.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-rancher1"), + FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), CalicoNode: m("quay.io/calico/node:v3.4.0"), CalicoCNI: m("quay.io/calico/cni:v3.4.0"), CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), @@ -893,12 +893,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"), - 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"), + PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), + 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"), }, // k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters // without all clusters being restarted