rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-06-28 06:26:49 +00:00
Code Issues Releases Wiki Activity

Added k8s versions from 2.1.x release

Browse Source
This commit is contained in:
Alena Prokharchyk 2019-03-06 14:29:30 -08:00
parent ea339438e0
commit e07adb52ac
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.13.4-rancher1-1"
DefaultK8s = "v1.13.4-rancher1-2"
)
var (
@ -29,7 +29,7 @@ var (
// Account for the fact that rke-tools image is different cross branches, and it requires using
// different k8s version tag
"v1.12.6-rancher1-2",
"v1.13.4-rancher1-1",
"v1.13.4-rancher1-2",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@ -872,7 +872,36 @@ var (
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
// Add a new version with old rke-tools to allow upgrade from 2.1.x clusters
"v1.13.4-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.27"),
NginxProxy: m("rancher/rke-tools:v0.1.27"),
CertDownloader: m("rancher/rke-tools:v0.1.27"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"),
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"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
// without all clusters being restarted
"v1.12.5-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.5-rancher1"),
@ -899,7 +928,8 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Add a new version with old rke-tools to allow upgrade from 2.1.x clusters
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
// without all clusters being restarted
"v1.12.6-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.6-rancher1"),
@ -926,7 +956,8 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Add a new version with old rke-tools to allow upgrade from 2.1.x clusters
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
// without all clusters being restarted
"v1.13.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"),
@ -953,13 +984,15 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
// without all clusters being restarted
"v1.13.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.27"),
NginxProxy: m("rancher/rke-tools:v0.1.27"),
CertDownloader: m("rancher/rke-tools:v0.1.27"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"),
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"),
@ -978,36 +1011,6 @@ var (
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"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.13.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.27"),
NginxProxy: m("rancher/rke-tools:v0.1.27"),
CertDownloader: m("rancher/rke-tools:v0.1.27"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"),
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"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
}
)

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

@ -247,7 +247,7 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.13.4-rancher1-1": {
"v1.13.4-rancher1-2": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.13.4-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),