From 96802dfc722ca19dc2f10fea51653fc0923e35c0 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 5 Sep 2019 11:30:29 -0700 Subject: [PATCH] k8s metadata vendor update --- go.mod | 2 +- go.sum | 4 ++-- .../kontainer-driver-metadata/rke/templates/nginx-ingress.go | 4 ++++ vendor/modules.txt | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 643914cb..532d331a 100644 --- a/go.mod +++ b/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-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/types v0.0.0-20190827214052-704648244586 github.com/sirupsen/logrus v1.4.2 diff --git a/go.sum b/go.sum index 192dbec5..fe3b72e9 100644 --- a/go.sum +++ b/go.sum @@ -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-20190903233325-0bbd16e747ff h1:bcG5P+9M+WSqAVd8dsR+AYAEhnV1zdsbhRXXVTTDfNM= -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 h1:v7ccMI1ni+hlEkLM+0k7YSkEOYUPWO1d+VNoe0iP8/4= +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/go.mod h1:KwP6RD4rVMdK8XK0wqZaptrhTn/TO4kXU3doh4iatQU= github.com/rancher/types v0.0.0-20190822170951-b99efa820bc3 h1:4mz/J0iEtW/VDtjN3zI9B4g49MKeoLHkHZKJGqRN7xg= diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go index df6c33d1..4e8f01eb 100644 --- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go +++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go @@ -185,6 +185,8 @@ spec: operator: NotIn values: - windows + - key: node-role.kubernetes.io/worker + operator: Exists hostNetwork: true {{if .DNSPolicy}} dnsPolicy: {{.DNSPolicy}} @@ -644,6 +646,8 @@ spec: operator: NotIn values: - windows + - key: node-role.kubernetes.io/worker + operator: Exists terminationGracePeriodSeconds: 60 tolerations: - effect: NoExecute diff --git a/vendor/modules.txt b/vendor/modules.txt index bd531791..237a1451 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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-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 # github.com/rancher/norman v0.0.0-20190821234528-20a936b685b0