mirror of
https://github.com/rancher/rke.git
synced 2025-08-28 19:31:04 +00:00
Bump rke with kontainer-driver-metadata commit
This commit is contained in:
parent
c69d971962
commit
23ea40fe29
2
go.mod
2
go.mod
@ -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-20190903162452-89591483cc05
|
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff
|
||||||
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
4
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.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-20190903162452-89591483cc05 h1:NlEoZblGZspgjohSjvvNpFWLSvCA4lpFVBghwOMSnnY=
|
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-20190903162452-89591483cc05/go.mod h1:dHvhyuoiwrjqQCFD586g0cZ9NJJXEKeAtQi8RX96U8E=
|
github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff/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=
|
||||||
|
6
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/coredns.go
generated
vendored
6
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/coredns.go
generated
vendored
@ -125,6 +125,9 @@ spec:
|
|||||||
operator: Exists
|
operator: Exists
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
beta.kubernetes.io/os: linux
|
||||||
|
{{ range $k, $v := .NodeSelector }}
|
||||||
|
{{ $k }}: "{{ $v }}"
|
||||||
|
{{ end }}
|
||||||
affinity:
|
affinity:
|
||||||
nodeAffinity:
|
nodeAffinity:
|
||||||
requiredDuringSchedulingIgnoredDuringExecution:
|
requiredDuringSchedulingIgnoredDuringExecution:
|
||||||
@ -132,9 +135,6 @@ spec:
|
|||||||
- matchExpressions:
|
- matchExpressions:
|
||||||
- key: node-role.kubernetes.io/worker
|
- key: node-role.kubernetes.io/worker
|
||||||
operator: Exists
|
operator: Exists
|
||||||
{{ range $k, $v := .NodeSelector }}
|
|
||||||
{{ $k }}: "{{ $v }}"
|
|
||||||
{{ end }}
|
|
||||||
containers:
|
containers:
|
||||||
- name: coredns
|
- name: coredns
|
||||||
image: {{.CoreDNSImage}}
|
image: {{.CoreDNSImage}}
|
||||||
|
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 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-20190903162452-89591483cc05
|
# github.com/rancher/kontainer-driver-metadata v0.0.0-20190903233325-0bbd16e747ff
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user