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

Merge pull request #943 from superseb/v22_rketoolsgo112

Browse Source 
Add version to test rke-tools v0.1.41
This commit is contained in:
Denise
2019-08-16 13:26:22 -07:00
committed by GitHub
parent 06743eb21e e6d79033c7
commit 2fe116852f
1 changed files with 117 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.14.5-rancher1-1"
DefaultK8s = "v1.14.5-rancher1-2"
)
var (
@@ -28,9 +28,9 @@ var (
// Account for the fact that rke-tools image is different cross branches, and it requires using
// different k8s version tag
"v1.12.10-rancher1-1",
"v1.13.9-rancher1-2",
"v1.14.5-rancher1-1",
"v1.15.2-rancher1-1",
"v1.13.9-rancher1-4",
"v1.14.5-rancher1-2",
"v1.15.2-rancher1-2",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@@ -1220,6 +1220,34 @@ var (
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
"v1.13.9-rancher1-4": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.9-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.41"),
NginxProxy: m("rancher/rke-tools:v0.1.41"),
CertDownloader: m("rancher/rke-tools:v0.1.41"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.41"),
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.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
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:0.21.0-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
// Enabled in Rancher v2.2.2
"v1.14.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
@@ -1334,6 +1362,34 @@ var (
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
"v1.14.5-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.5-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.41"),
NginxProxy: m("rancher/rke-tools:v0.1.41"),
CertDownloader: m("rancher/rke-tools:v0.1.41"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.41"),
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-rancher1"),
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:0.21.0-rancher3"),
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"),
@@ -1394,6 +1450,35 @@ var (
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
"v1.15.2-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.2-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.41"),
NginxProxy: m("rancher/rke-tools:v0.1.41"),
CertDownloader: m("rancher/rke-tools:v0.1.41"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.41"),
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.11.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
CalicoNode: m("quay.io/calico/node:v3.7.4"),
CalicoCNI: m("quay.io/calico/cni:v3.7.4"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"),
CanalNode: m("quay.io/calico/node:v3.7.4"),
CanalCNI: m("quay.io/calico/cni:v3.7.4"),
CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.2"),
WeaveCNI: m("weaveworks/weave-npc:2.5.2"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"),
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.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": {
@@ -1590,6 +1675,34 @@ 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.9-rancher1-3": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.13.9-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.16-1"),
NginxProxy: m("rancher/rke-tools:v0.1.16-1"),
CertDownloader: m("rancher/rke-tools:v0.1.16-1"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-1"),
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"),
},
}
)