1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-03 16:04:26 +00:00

kdm vendor update for rke-tools

This commit is contained in:
kinarashah
2019-12-27 11:58:53 -08:00
parent 18548be050
commit 247e96df7a
4 changed files with 45 additions and 16 deletions

View File

@@ -1382,6 +1382,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.3.4
"v1.14.9-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.9-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.52"),
NginxProxy: m("rancher/rke-tools:v0.1.52"),
CertDownloader: m("rancher/rke-tools:v0.1.52"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
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.3.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
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:3.1"),
Ingress: m("rancher/nginx-ingress-controller:nginx-0.25.1-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Experimental in Rancher v2.2.5
"v1.15.0-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
@@ -1659,10 +1688,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.15.7-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.7-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
Alpine: m("rancher/rke-tools:v0.1.52"),
NginxProxy: m("rancher/rke-tools:v0.1.52"),
CertDownloader: m("rancher/rke-tools:v0.1.52"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
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"),
@@ -1818,10 +1847,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.16.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.16.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
Alpine: m("rancher/rke-tools:v0.1.52"),
NginxProxy: m("rancher/rke-tools:v0.1.52"),
CertDownloader: m("rancher/rke-tools:v0.1.52"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
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"),
@@ -1882,10 +1911,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.17.0-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.4.3-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.17.0-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.51"),
NginxProxy: m("rancher/rke-tools:v0.1.51"),
CertDownloader: m("rancher/rke-tools:v0.1.51"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
Alpine: m("rancher/rke-tools:v0.1.52"),
NginxProxy: m("rancher/rke-tools:v0.1.52"),
CertDownloader: m("rancher/rke-tools:v0.1.52"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
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"),