rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-03 16:04:26 +00:00
Code Issues Releases Wiki Activity

use k8s version info from kontainer-driver-metadata

Browse Source
This commit is contained in:
kinarashah
2019-05-28 11:51:53 -07:00
committed by Alena Prokharchyk
parent 8c8e3d1c6b
commit c191ed6202
25 changed files with 231 additions and 5547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/coreos/go-semver/semver/semver.go generated vendored
View File

@@ -19,6 +19,7 @@ import (
"bytes"
"errors"
"fmt"
"github.com/sirupsen/logrus"
"regexp"
"strconv"
"strings"
@@ -74,6 +75,7 @@ func (v *Version) Set(version string) error {
dotParts := strings.SplitN(version, ".", 3)
if len(dotParts) != 3 {
logrus.Infof("version version version %s", version)
return fmt.Errorf("%s is not in dotted-tri format", version)
}

58
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go generated vendored
View File

@@ -1001,35 +1001,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"),
},
//// Experimental in Rancher v2.2.5
//"v1.15.0-rancher1-1": {
// Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
// Kubernetes: m("rancher/hyperkube:v1.15.0-rancher1"),
// Alpine: m("rancher/rke-tools:v0.1.32"),
// NginxProxy: m("rancher/rke-tools:v0.1.32"),
// CertDownloader: m("rancher/rke-tools:v0.1.32"),
// KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.32"),
// 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.3"),
// CalicoCNI: m("quay.io/calico/cni:v3.7.3"),
// CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
// CanalNode: m("quay.io/calico/node:v3.7.3"),
// CanalCNI: m("quay.io/calico/cni:v3.7.3"),
// 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"),
//},
// Experimental in Rancher v2.2.5
"v1.15.0-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.0-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.34"),
NginxProxy: m("rancher/rke-tools:v0.1.34"),
CertDownloader: m("rancher/rke-tools:v0.1.34"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"),
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.3"),
CalicoCNI: m("quay.io/calico/cni:v3.7.3"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.7.3"),
CanalCNI: m("quay.io/calico/cni:v3.7.3"),
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": {