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

Update vendor

Browse Source
This commit is contained in:
Frank Mai
2019-08-29 07:11:03 +08:00
committed by Alena Prokharchyk
parent c819cae072
commit e31b8b0bf5
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1209,13 +1209,13 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.3
"v1.14.6-rancher2-1": {
"v1.14.6-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.6-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
Kubernetes: m("rancher/hyperkube:v1.14.6-rancher3"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
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"),
@@ -1328,13 +1328,13 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.3
"v1.15.3-rancher2-1": {
"v1.15.3-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.3-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
Kubernetes: m("rancher/hyperkube:v1.15.3-rancher3"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
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"),
@@ -1639,13 +1639,13 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Enabled in Rancher v2.3
"v1.16.0-beta.1-rancher1-1": {
"v1.16.0-beta.1-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.16.0-beta.1-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
Kubernetes: m("rancher/hyperkube:v1.16.0-beta.1-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
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"),

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

@@ -16,9 +16,9 @@ func loadRancherDefaultK8sVersions() map[string]string {
func loadRKEDefaultK8sVersions() map[string]string {
return map[string]string{
"0.3": "v1.15.3-rancher2-1",
"0.3": "v1.15.3-rancher3-1",
// rke will use default if its version is absent
"default": "v1.15.3-rancher2-1",
"default": "v1.15.3-rancher3-1",
}
}

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

@@ -38,7 +38,7 @@ func getWindowsKubeletOptions() map[string]string {
// increase image pulling deadline
kubeletOptions["image-pull-progress-deadline"] = "30m"
// enable some windows features
kubeletOptions["feature-gates"] = "HyperVContainer=true,WinDSR=true,WinOverlay=true,WindowsGMSA=true"
kubeletOptions["feature-gates"] = "HyperVContainer=true,WindowsGMSA=true"
return kubeletOptions
}
@@ -57,8 +57,10 @@ func getWindowsKubeProxyOptions() map[string]string {
// use kernelspace proxy mode
kubeProxyOptions["proxy-mode"] = "kernelspace"
// enable some windows features
kubeProxyOptions["feature-gates"] = "HyperVContainer=true,WinDSR=true,WinOverlay=true,WindowsGMSA=true"
// enable Windows Overlay support
kubeProxyOptions["feature-gates"] = "WinOverlay=true"
// disable Windows DSR support explicitly
kubeProxyOptions["enable-dsr"] = "false"
return kubeProxyOptions
}