rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-25 04:12:02 +00:00
Code Issues Releases Wiki Activity

Change rke-tools for k8s 1.13

Browse Source
This commit is contained in:
galal-hussein
2019-02-20 04:23:32 +02:00
committed by Alena Prokharchyk
parent 37d8095b20
commit a741b2ace2
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.13.1-rancher1-1"
DefaultK8s = "v1.13.1-rancher1-1-1"
)
var (
@@ -20,8 +20,8 @@ var (
"v1.9.7-rancher2-2",
"v1.10.12-rancher1-1",
"v1.11.6-rancher1-1",
"v1.12.5-rancher1-1",
"v1.13.1-rancher1-1",
"v1.12.5-rancher1-1-1",
"v1.13.1-rancher1-1-1",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -745,13 +745,13 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
"v1.12.5-rancher1-1": {
"v1.12.5-rancher1-1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.5-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.23"),
NginxProxy: m("rancher/rke-tools:v0.1.23"),
CertDownloader: m("rancher/rke-tools:v0.1.23"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.23"),
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.14.13"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
@@ -771,13 +771,13 @@ 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": {
"v1.13.1-rancher1-1-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.23"),
NginxProxy: m("rancher/rke-tools:v0.1.23"),
CertDownloader: m("rancher/rke-tools:v0.1.23"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.23"),
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"),

4
apis/management.cattle.io/v3/k8s_windows_default.go
View File

@@ -254,7 +254,7 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.12.5-rancher1-1": {
"v1.12.5-rancher1-1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.12.5-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
@@ -262,7 +262,7 @@ 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": {
"v1.13.1-rancher1-1-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"),