1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-02 07:43:04 +00:00

Vendor go mod changes for kontainer-driver-metadata

This commit is contained in:
rajashree 2019-09-03 11:25:49 -07:00 committed by Alena Prokharchyk
parent ff663b5a59
commit 079b743ad6
5 changed files with 18 additions and 16 deletions

2
go.mod
View File

@ -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-20190829181508-f5abbfa5182e
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903162452-89591483cc05
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
github.com/rancher/types v0.0.0-20190827214052-704648244586
github.com/sirupsen/logrus v1.4.2

4
go.sum
View File

@ -181,8 +181,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE=
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e h1:IH/kDn1QKwfqVhqRfbNwmjcj4rUMpHUpjKPRjunlo9Q=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190829181508-f5abbfa5182e/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903162452-89591483cc05 h1:NlEoZblGZspgjohSjvvNpFWLSvCA4lpFVBghwOMSnnY=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903162452-89591483cc05/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=

View File

@ -1212,10 +1212,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.14.6-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
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"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),
@ -1331,10 +1331,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.15.3-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
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"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),
@ -1642,10 +1642,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"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-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"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),

View File

@ -297,6 +297,8 @@ spec:
operator: NotIn
values:
- windows
- key: node-role.kubernetes.io/worker
operator: Exists
terminationGracePeriodSeconds: 60
tolerations:
- effect: NoExecute

2
vendor/modules.txt vendored
View File

@ -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-20190829181508-f5abbfa5182e
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190903162452-89591483cc05
github.com/rancher/kontainer-driver-metadata/rke/templates
github.com/rancher/kontainer-driver-metadata/rke
# github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0