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

k8s 1.11.6 support

Browse Source
This commit is contained in:
Alena Prokharchyk
2018-12-18 21:51:06 -08:00
parent b7da8e74e9
commit 918b4ad669
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e
github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/rancher/norman 457c15b94acae52afb5290aa315452c7621d452a github.com/rancher/norman 457c15b94acae52afb5290aa315452c7621d452a
github.com/rancher/types 727109dbf5136cd3ef973580d46e574e42ec0ca9 github.com/rancher/types c8e028e67a0c30cb73c22b7a350c5c611fbd6482

28
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go generated vendored
View File

@@ -19,7 +19,7 @@ var (
k8sVersionsCurrent = []string{ k8sVersionsCurrent = []string{
"v1.9.7-rancher2-2", "v1.9.7-rancher2-2",
"v1.10.11-rancher1-1", "v1.10.11-rancher1-1",
"v1.11.5-rancher1-1", "v1.11.6-rancher1-1",
"v1.12.3-rancher1-1", "v1.12.3-rancher1-1",
} }
@@ -576,6 +576,32 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
"v1.11.6-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.6-rancher1"),
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.10"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),
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.1.3"),
CalicoCNI: m("quay.io/calico/cni:v3.1.3"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.1.3"),
CanalCNI: m("quay.io/calico/cni:v3.1.3"),
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.12.0-rancher1-1": { "v1.12.0-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"), Etcd: m("quay.io/coreos/etcd:v3.2.24"),
Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"), Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"),

8
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go generated vendored
View File

@@ -206,6 +206,14 @@ var (
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
}, },
"v1.11.6-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.11.6-nanoserver-1803"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.12.0-rancher1-1": { "v1.12.0-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"), KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"),