mirror of
https://github.com/rancher/rke.git
synced 2025-09-08 18:39:40 +00:00
Update vendor
This commit is contained in:
Frank Mai
committed by
Alena Prokharchyk
Alena Prokharchyk
parent
c819cae072
commit
e31b8b0bf5
2
go.mod
2
go.mod
@@ -32,7 +32,7 @@ require (
|
||||
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
|
||||
github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
|
||||
github.com/pkg/errors v0.8.1
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18
|
||||
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
|
||||
github.com/rancher/types v0.0.0-20190823205914-444dc01b3d86
|
||||
github.com/sirupsen/logrus v1.4.2
|
||||
|
||||
2
go.sum
2
go.sum
@@ -185,6 +185,8 @@ github.com/rancher/kontainer-driver-metadata v0.0.0-20190823210613-624182a785ce
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190823210613-624182a785ce/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153 h1:MzkL/BHjjoCYmTyP5GfJW0Bn1bsGKOF70//wDoNwPiI=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18 h1:Muzkw/vWJaqXLvxJvI7C/ZkQ5n/8ypvGVpvZwnR/YIQ=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
|
||||
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0 h1:bNG4b0CTTBE8yEamIz8RYcfz+7kfK9N8YTvyiykRCS8=
|
||||
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0/go.mod h1:KwP6RD4rVMdK8XK0wqZaptrhTn/TO4kXU3doh4iatQU=
|
||||
github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3 h1:4mz/J0iEtW/VDtjN3zI9B4g49MKeoLHkHZKJGqRN7xg=
|
||||
|
||||
36
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
36
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
@@ -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
4
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_version_info.go
generated
vendored
@@ -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",
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@@ -105,7 +105,7 @@ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
|
||||
# github.com/prometheus/procfs v0.0.3
|
||||
github.com/prometheus/procfs
|
||||
github.com/prometheus/procfs/internal/fs
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190826223322-3e1df77e6153
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190828225135-38a0f0beda18
|
||||
github.com/rancher/kontainer-driver-metadata/rke/templates
|
||||
github.com/rancher/kontainer-driver-metadata/rke
|
||||
# github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
|
||||
|
||||
Reference in New Issue
Block a user