1
0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 08:50:13 +00:00

k8s metadata vendor update

This commit is contained in:
Alena Prokharchyk
2019-09-05 11:30:29 -07:00
parent 4a4a2357d3
commit 96802dfc72
4 changed files with 8 additions and 4 deletions

2
go.mod
View File

@@ -32,7 +32,7 @@ require (
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff github.com/rancher/kontainer-driver-metadata v0.0.0-20190905180018-bd99c3a44558
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0 github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0
github.com/rancher/types v0.0.0-20190827214052-704648244586 github.com/rancher/types v0.0.0-20190827214052-704648244586
github.com/sirupsen/logrus v1.4.2 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.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= 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/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff h1:bcG5P+9M+WSqAVd8dsR+AYAEhnV1zdsbhRXXVTTDfNM= github.com/rancher/kontainer-driver-metadata v0.0.0-20190905180018-bd99c3a44558 h1:v7ccMI1ni+hlEkLM+0k7YSkEOYUPWO1d+VNoe0iP8/4=
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E= github.com/rancher/kontainer-driver-metadata v0.0.0-20190905180018-bd99c3a44558/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 h1:bNG4b0CTTBE8yEamIz8RYcfz+7kfK9N8YTvyiykRCS8=
github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0/go.mod h1:KwP6RD4rVMdK8XK0wqZaptrhTn/TO4kXU3doh4iatQU= 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= github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3 h1:4mz/J0iEtW/VDtjN3zI9B4g49MKeoLHkHZKJGqRN7xg=

View File

@@ -185,6 +185,8 @@ spec:
operator: NotIn operator: NotIn
values: values:
- windows - windows
- key: node-role.kubernetes.io/worker
operator: Exists
hostNetwork: true hostNetwork: true
{{if .DNSPolicy}} {{if .DNSPolicy}}
dnsPolicy: {{.DNSPolicy}} dnsPolicy: {{.DNSPolicy}}
@@ -644,6 +646,8 @@ spec:
operator: NotIn operator: NotIn
values: values:
- windows - windows
- key: node-role.kubernetes.io/worker
operator: Exists
terminationGracePeriodSeconds: 60 terminationGracePeriodSeconds: 60
tolerations: tolerations:
- effect: NoExecute - 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 v0.0.3
github.com/prometheus/procfs github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/fs
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff # github.com/rancher/kontainer-driver-metadata v0.0.0-20190905180018-bd99c3a44558
github.com/rancher/kontainer-driver-metadata/rke/templates github.com/rancher/kontainer-driver-metadata/rke/templates
github.com/rancher/kontainer-driver-metadata/rke github.com/rancher/kontainer-driver-metadata/rke
# github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0 # github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0