From f1487cf24dac792376edf72b0bf634be9acf722c Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Fri, 1 Mar 2019 21:20:18 +0200 Subject: [PATCH] copy code --- apis/management.cattle.io/v3/k8s_defaults.go | 52 +++++++++++++++++++ .../v3/k8s_windows_default.go | 16 ++++++ 2 files changed, 68 insertions(+) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 25be5a13..a7b12cf8 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -639,6 +639,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, + "v1.11.6-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.18"), + Kubernetes: m("rancher/hyperkube:v1.11.6-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.15"), + NginxProxy: m("rancher/rke-tools:v0.1.15"), + CertDownloader: m("rancher/rke-tools:v0.1.15"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.15"), + 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.10.0"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"), + 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"), + CanalNode: m("quay.io/calico/node:v3.1.3"), + CanalCNI: m("quay.io/calico/cni:v3.1.3"), + CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"), + 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.12.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"), @@ -821,6 +847,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, + "v1.13.1-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.16"), + NginxProxy: m("rancher/rke-tools:v0.1.16"), + CertDownloader: m("rancher/rke-tools:v0.1.16"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"), + 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"), + 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"), + CanalNode: m("quay.io/calico/node:v3.4.0"), + CanalCNI: m("quay.io/calico/cni:v3.4.0"), + 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"), + }, } ) diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 2d74e5f1..3b321634 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -222,6 +222,14 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.11.6-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.11.6-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), + CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, "v1.12.0-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"), @@ -278,6 +286,14 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, + "v1.13.1-rancher1-1": { + NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"), + FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), + CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), + CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), + KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), + }, } )