From 289e270e234f5c0220746f664da60d0663fa1129 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 20 Jul 2018 00:10:18 +0200 Subject: [PATCH] Add new k8s versions --- apis/management.cattle.io/v3/k8s_defaults.go | 78 ++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 78c79959..b45fb65e 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -89,6 +89,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.9.7-rancher2-2": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.8"), + NginxProxy: m("rancher/rke-tools:v0.1.8"), + CertDownloader: m("rancher/rke-tools:v0.1.8"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.8"), + 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.16.2-rancher1"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), + }, "v1.10.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.0-rancher1"), @@ -219,6 +245,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.10.5-rancher1-2": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.10"), + NginxProxy: m("rancher/rke-tools:v0.1.10"), + CertDownloader: m("rancher/rke-tools:v0.1.10"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.10"), + 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.16.2-rancher1"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), + }, "v1.11.1-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"), @@ -245,6 +297,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.11.1-rancher1-2": { + Etcd: m("quay.io/coreos/etcd:v3.2.18"), + Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.10"), + NginxProxy: m("rancher/rke-tools:v0.1.10"), + CertDownloader: m("rancher/rke-tools:v0.1.10"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.10"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"), + 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"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), + }, } // K8sVersionServiceOptions - service options per k8s version