diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 4515defe..1795bc17 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -61,6 +61,56 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, + "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.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"), + 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.5-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), + 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"), @@ -86,9 +136,9 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, - "v1.9.5-rancher1-1": { + "v1.9.7-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2-1"), Alpine: m("rancher/rke-tools:v0.1.4"), NginxProxy: m("rancher/rke-tools:v0.1.4"), CertDownloader: m("rancher/rke-tools:v0.1.4"), @@ -161,6 +211,31 @@ var ( 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.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"), + }, } // K8sVersionServiceOptions - service options per k8s version