diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 67601152..6a9583c2 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -7,18 +7,17 @@ const ( ) var ( - m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.7") + m = image.Mirror // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ "v1.8.10-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), Kubernetes: m("rancher/hyperkube:v1.8.10-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), @@ -40,10 +39,10 @@ var ( "v1.8.11-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), @@ -62,16 +61,16 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, - "v1.9.7-rancher1": { - Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + "v1.8.11-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.0.17"), + Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), Flannel: m("quay.io/coreos/flannel:v0.9.1"), FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), @@ -90,10 +89,60 @@ var ( "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + WeaveNode: m("weaveworks/weave-kube:2.1.2"), + WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.9.7-rancher1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + WeaveNode: m("weaveworks/weave-kube:2.1.2"), + WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.9.7-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2-1"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), @@ -115,10 +164,10 @@ var ( "v1.10.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.0-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), @@ -140,10 +189,35 @@ var ( "v1.10.1-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.1-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + WeaveNode: m("weaveworks/weave-kube:2.1.2"), + WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.10.1-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.1-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), @@ -200,7 +274,7 @@ var ( LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"), Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"), Kibana: m("kibana:5.6.4"), - Busybox: ToolsImage, + Busybox: m("busybox"), }, } )