rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-29 01:00:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #942 from superseb/v21_rketools01161

Browse Source 
Add version to test rke-tools v0.16.0-1 upgrade
This commit is contained in:
Denise 2019-08-16 13:24:51 -07:00 committed by GitHub
commit 82ef83491f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import (
)
const (
DefaultK8s = "v1.13.9-rancher1-1"
DefaultK8s = "v1.13.9-rancher1-3"
)
var (
@ -19,7 +19,7 @@ var (
k8sVersionsCurrent = []string{
"v1.11.9-rancher1-1",
"v1.12.7-rancher1-1",
"v1.13.9-rancher1-1",
"v1.13.9-rancher1-3",
}
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
@ -985,6 +985,32 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
"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"),
},
}
)