diff --git a/go.mod b/go.mod index 14cfa3c6..e38ef1d2 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-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 diff --git a/go.sum b/go.sum index 0addf92a..5df79a38 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-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= diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go index ef404791..4d2c68a2 100644 --- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go +++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go @@ -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"), 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 fdd303df..df6c33d1 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 @@ -297,6 +297,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 3dc5a3d1..078e3e33 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-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