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

vendor update

Browse Source
This commit is contained in:
moelsayed
2019-07-18 01:52:41 +02:00
committed by Alena Prokharchyk
parent db3f7c7bac
commit 6c5321d4e3
4 changed files with 113 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -30,4 +30,4 @@ github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ad
github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c
github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1
github.com/rancher/types 7c47f85c089c16fb312ad12c96ea09478a5d6d99
github.com/rancher/kontainer-driver-metadata 44d4ac44d186344d93735ee30c5f7d1266b4ea69
github.com/rancher/kontainer-driver-metadata 4e7226c262fbd7681ef4f09c99cfd8000319b7ad

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

@@ -1,6 +1,6 @@
package rke
import "github.com/rancher/types/apis/management.cattle.io/v3"
import v3 "github.com/rancher/types/apis/management.cattle.io/v3"
func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
return map[string]v3.RKESystemImages{
@@ -915,6 +915,34 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
"v1.13.8-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.8-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.35"),
NginxProxy: m("rancher/rke-tools:v0.1.35"),
CertDownloader: m("rancher/rke-tools:v0.1.35"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.35"),
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"),
@@ -1001,6 +1029,34 @@ 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"),
},
"v1.14.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.4-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.35"),
NginxProxy: m("rancher/rke-tools:v0.1.35"),
CertDownloader: m("rancher/rke-tools:v0.1.35"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.35"),
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"),
@@ -1031,6 +1087,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"),
},
"v1.15.0-rancher1-2": {
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.35"),
NginxProxy: m("rancher/rke-tools:v0.1.35"),
CertDownloader: m("rancher/rke-tools:v0.1.35"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.35"),
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": {

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

@@ -1,20 +1,20 @@
package rke
import "github.com/rancher/types/apis/management.cattle.io/v3"
import v3 "github.com/rancher/types/apis/management.cattle.io/v3"
func loadRancherDefaultK8sVersions() map[string]string {
return map[string]string{
"2.3": "v1.15.0-rancher1-1",
"2.3": "v1.15.0-rancher1-2",
// rancher will use default if its version is absent
"default": "v1.15.0-rancher1-1",
"default": "v1.15.0-rancher1-2",
}
}
func loadRKEDefaultK8sVersions() map[string]string {
return map[string]string{
"0.3": "v1.15.0-rancher1-1",
"0.3": "v1.15.0-rancher1-2",
// rke will use default if its version is absent
"default": "v1.15.0-rancher1-1",
"default": "v1.15.0-rancher1-2",
}
}

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

@@ -1,8 +1,6 @@
package rke
import (
"github.com/rancher/types/apis/management.cattle.io/v3"
)
import v3 "github.com/rancher/types/apis/management.cattle.io/v3"
func loadK8sVersionWindowsServiceOptions() map[string]v3.KubernetesServicesOptions {
return map[string]v3.KubernetesServicesOptions{
@@ -348,6 +346,14 @@ func loadK8sVersionWindowsSystemimages() map[string]v3.WindowsSystemImages {
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
},
"v1.13.8-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.13.8-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.14.1-rancher1-1": {
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
KubernetesBinaries: m("rancher/hyperkube:v1.14.1-nanoserver-1803"),
@@ -368,11 +374,23 @@ func loadK8sVersionWindowsSystemimages() map[string]v3.WindowsSystemImages {
FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"),
KubeletPause: m("rancher/kubelet-pause:v0.1.2"),
},
"v1.14.4-rancher1-1": {
// NginxProxy image is replaced by host running nginx, fixed rancher#16074
KubernetesBinaries: m("rancher/hyperkube:v1.14.4-rancher1"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"),
KubeletPause: m("rancher/kubelet-pause:v0.1.2"),
},
"v1.15.0-rancher1-1": {
// NginxProxy image is replaced by host running nginx, fixed rancher#16074
KubernetesBinaries: m("rancher/hyperkube:v1.15.0-rancher1"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"),
KubeletPause: m("rancher/kubelet-pause:v0.1.2"),
},
"v1.15.0-rancher1-2": {
// NginxProxy image is replaced by host running nginx, fixed rancher#16074
KubernetesBinaries: m("rancher/hyperkube:v1.15.0-rancher1"),
FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"),
KubeletPause: m("rancher/kubelet-pause:v0.1.2"),
},
}
}