github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Update corefile-migration to v1.0.12.

Browse Source 
The coredns/corefile-migration project switched to a fork of
coredns/caddy to remove dependencies it doesn't actually need. Picking
up this update here in k/k results in a significantly smaller go.mod.

Signed-off-by: Dan Lorenc <dlorenc@google.com>
This commit is contained in:
Dan Lorenc 2021-06-12 23:49:01 -05:00
parent 52eea971c5
commit 8748f3105b
14 changed files with 115 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSES/vendor/github.com/caddyserver/caddy/LICENSE → LICENSES/vendor/github.com/coredns/caddy/LICENSE generated vendored
View File

@ -1,4 +1,4 @@
= vendor/github.com/caddyserver/caddy licensed under: = = vendor/github.com/coredns/caddy licensed under: =
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
@ -202,4 +202,4 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
= vendor/github.com/caddyserver/caddy/LICENSE.txt e3fc50a88d0a364313df4b21ef20c29e = vendor/github.com/coredns/caddy/LICENSE.txt e3fc50a88d0a364313df4b21ef20c29e

22
go.mod
View File

@ -27,7 +27,7 @@ require (
github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313 github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313
github.com/container-storage-interface/spec v1.3.0 github.com/container-storage-interface/spec v1.3.0
github.com/containernetworking/cni v0.8.1 github.com/containernetworking/cni v0.8.1
github.com/coredns/corefile-migration v1.0.11 github.com/coredns/corefile-migration v1.0.12
github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-oidc v2.1.0+incompatible
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
@ -177,17 +177,13 @@ replace (
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.35.24 github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.35.24
github.com/beorn7/perks => github.com/beorn7/perks v1.0.1 github.com/beorn7/perks => github.com/beorn7/perks v1.0.1
github.com/bgentry/speakeasy => github.com/bgentry/speakeasy v0.1.0 github.com/bgentry/speakeasy => github.com/bgentry/speakeasy v0.1.0
github.com/bifurcation/mint => github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115
github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c
github.com/blang/semver => github.com/blang/semver v3.5.1+incompatible github.com/blang/semver => github.com/blang/semver v3.5.1+incompatible
github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1 github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1
github.com/caddyserver/caddy => github.com/caddyserver/caddy v1.0.3
github.com/cenkalti/backoff => github.com/cenkalti/backoff v2.1.1+incompatible
github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1
github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1 github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1
github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.0.0 github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.0.0
github.com/cheekybits/genny => github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9
github.com/chzyer/logex => github.com/chzyer/logex v1.1.10 github.com/chzyer/logex => github.com/chzyer/logex v1.1.10
github.com/chzyer/readline => github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e github.com/chzyer/readline => github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
github.com/chzyer/test => github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 github.com/chzyer/test => github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1
@ -204,7 +200,8 @@ replace (
github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2 github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.1 github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.1
github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1 github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.11 github.com/coredns/caddy => github.com/coredns/caddy v1.1.0
github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.12
github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2 github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2
github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible
github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
@ -241,7 +238,6 @@ replace (
github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9 github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9
github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1 github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1
github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0
github.com/go-acme/lego => github.com/go-acme/lego v2.5.0+incompatible
github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible
github.com/go-errors/errors => github.com/go-errors/errors v1.0.1 github.com/go-errors/errors => github.com/go-errors/errors v1.0.1
github.com/go-gl/glfw/v3.3/glfw => github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 github.com/go-gl/glfw/v3.3/glfw => github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4
@ -305,7 +301,6 @@ replace (
github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0
github.com/ishidawataru/sctp => github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 github.com/ishidawataru/sctp => github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5
github.com/jimstudt/http-authentication => github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a
github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.4.0 github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.4.0
github.com/jmespath/go-jmespath/internal/testify => github.com/jmespath/go-jmespath/internal/testify v1.5.1 github.com/jmespath/go-jmespath/internal/testify => github.com/jmespath/go-jmespath/internal/testify v1.5.1
github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0 github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0
@ -318,27 +313,19 @@ replace (
github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1 github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1
github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0 github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0
github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0
github.com/klauspost/cpuid => github.com/klauspost/cpuid v1.2.0
github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2
github.com/kr/pretty => github.com/kr/pretty v0.2.1 github.com/kr/pretty => github.com/kr/pretty v0.2.1
github.com/kr/text => github.com/kr/text v0.2.0 github.com/kr/text => github.com/kr/text v0.2.0
github.com/kylelemons/godebug => github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.0 github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.0
github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0 github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0
github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1 github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1
github.com/lucas-clemente/aes12 => github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f
github.com/lucas-clemente/quic-clients => github.com/lucas-clemente/quic-clients v0.1.0
github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.10.2
github.com/lucas-clemente/quic-go-certificates => github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced
github.com/magiconair/properties => github.com/magiconair/properties v1.8.1 github.com/magiconair/properties => github.com/magiconair/properties v1.8.1
github.com/mailru/easyjson => github.com/mailru/easyjson v0.7.0 github.com/mailru/easyjson => github.com/mailru/easyjson v0.7.0
github.com/marten-seemann/qtls => github.com/marten-seemann/qtls v0.2.3
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9 github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.4 github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.4
github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.7 github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.7
github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
github.com/mholt/certmagic => github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2
github.com/miekg/dns => github.com/miekg/dns v1.1.35 github.com/miekg/dns => github.com/miekg/dns v1.1.35
github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989
github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
@ -363,8 +350,6 @@ replace (
github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0 github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0
github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
github.com/naoina/go-stringutil => github.com/naoina/go-stringutil v0.1.0
github.com/naoina/toml => github.com/naoina/toml v0.1.1
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
github.com/nxadm/tail => github.com/nxadm/tail v1.4.4 github.com/nxadm/tail => github.com/nxadm/tail v1.4.4
github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.4 github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.4
@ -463,7 +448,6 @@ replace (
gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0 gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0
gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1
gopkg.in/ini.v1 => gopkg.in/ini.v1 v1.51.0 gopkg.in/ini.v1 => gopkg.in/ini.v1 v1.51.0
gopkg.in/mcuadros/go-syslog.v2 => gopkg.in/mcuadros/go-syslog.v2 v2.2.1
gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/resty.v1 => gopkg.in/resty.v1 v1.12.0 gopkg.in/resty.v1 => gopkg.in/resty.v1 v1.12.0
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2

24
go.sum
View File

@ -64,15 +64,11 @@ github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
github.com/caddyserver/caddy v1.0.3 h1:i9gRhBgvc5ifchwWtSe7pDpsdS9+Q0Rw9oYQmYUTw1w=
github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@ -80,7 +76,6 @@ github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4= github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4=
github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M=
github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@ -107,8 +102,10 @@ github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5
github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg=
github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI= github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI=
github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
github.com/coredns/corefile-migration v1.0.11 h1:ptBYGW2ADXIB7ZEBPrhhTvNwJLQfxE3Q9IUMBhJCEeI= github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
github.com/coredns/corefile-migration v1.0.11/go.mod h1:RMy/mXdeDlYwzt0vdMEJvT2hGJ2I86/eO0UdXmH9XNI= github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
github.com/coredns/corefile-migration v1.0.12 h1:TJGATo0YLQJVIKJZLajXE1IrhRFtYTR1cYsGIT1YNEk=
github.com/coredns/corefile-migration v1.0.12/go.mod h1:NJOI8ceUF/NTgEwtjD+TUq3/BnH/GF7WAM3RzCa3hBo=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
@ -172,7 +169,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE= github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqFfzE=
github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg= github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg=
github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
@ -272,7 +268,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 h1:qPmlgoeRS18y2dT+iAH5vEKZgIqgiPi2Y8UCu/b7Aq8= github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 h1:qPmlgoeRS18y2dT+iAH5vEKZgIqgiPi2Y8UCu/b7Aq8=
github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8= github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5/go.mod h1:DM4VvS+hD/kDi1U1QsX2fnZowwBhqD0Dk3bRPKF/Oc8=
github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@ -290,13 +285,11 @@ github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA
github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
github.com/libopenstorage/openstorage v1.0.0 h1:GLPam7/0mpdP8ZZtKjbfcXJBTIA/T1O6CBErVEFEyIM= github.com/libopenstorage/openstorage v1.0.0 h1:GLPam7/0mpdP8ZZtKjbfcXJBTIA/T1O6CBErVEFEyIM=
github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
@ -305,20 +298,14 @@ github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffkt
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
github.com/lpabon/godbc v0.1.1 h1:ilqjArN1UOENJJdM34I2YHKmF/B0gGq4VLoSGy9iAao= github.com/lpabon/godbc v0.1.1 h1:ilqjArN1UOENJJdM34I2YHKmF/B0gGq4VLoSGy9iAao=
github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04=
github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk=
github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao=
github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs=
github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs=
@ -361,8 +348,6 @@ github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq4
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@ -534,7 +519,6 @@ gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=

0
vendor/github.com/caddyserver/caddy/LICENSE.txt → vendor/github.com/coredns/caddy/LICENSE.txt generated vendored
View File

0
vendor/github.com/caddyserver/caddy/caddyfile/dispenser.go → vendor/github.com/coredns/caddy/caddyfile/dispenser.go generated vendored
View File

0
vendor/github.com/caddyserver/caddy/caddyfile/json.go → vendor/github.com/coredns/caddy/caddyfile/json.go generated vendored
View File

3
vendor/github.com/caddyserver/caddy/caddyfile/lexer.go → vendor/github.com/coredns/caddy/caddyfile/lexer.go generated vendored
View File

@ -48,6 +48,9 @@ func (l *lexer) load(input io.Reader) error {
// discard byte order mark, if present // discard byte order mark, if present
firstCh, _, err := l.reader.ReadRune() firstCh, _, err := l.reader.ReadRune()
if err != nil { if err != nil {
if err == io.EOF {
return nil
}
return err return err
} }
if firstCh != 0xFEFF { if firstCh != 0xFEFF {

0
vendor/github.com/caddyserver/caddy/caddyfile/parse.go → vendor/github.com/coredns/caddy/caddyfile/parse.go generated vendored
View File

2
vendor/github.com/coredns/corefile-migration/migration/corefile/corefile.go generated vendored
View File

@ -3,7 +3,7 @@ package corefile
import ( import (
"strings" "strings"
"github.com/caddyserver/caddy/caddyfile" "github.com/coredns/caddy/caddyfile"
) )
type Corefile struct { type Corefile struct {

32
vendor/github.com/coredns/corefile-migration/migration/migrate.go generated vendored
View File

@ -18,13 +18,13 @@ import (
// any deprecated, removed, or ignored plugins/directives present in the Corefile. Notifications are also returned for // any deprecated, removed, or ignored plugins/directives present in the Corefile. Notifications are also returned for
// any new default plugins that would be added in a migration. // any new default plugins that would be added in a migration.
func Deprecated(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string) ([]Notice, error) { func Deprecated(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string) ([]Notice, error) {
return getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, all) return getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, SevAll)
} }
// Unsupported returns a list notifications of plugins/options that are not handled supported by this migration tool, // Unsupported returns a list notifications of plugins/options that are not handled supported by this migration tool,
// but may still be valid in CoreDNS. // but may still be valid in CoreDNS.
func Unsupported(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string) ([]Notice, error) { func Unsupported(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string) ([]Notice, error) {
return getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, unsupported) return getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, SevUnsupported)
} }
func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string) ([]Notice, error) { func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string) ([]Notice, error) {
@ -45,14 +45,14 @@ func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string)
for _, s := range cf.Servers { for _, s := range cf.Servers {
for _, p := range s.Plugins { for _, p := range s.Plugins {
vp, present := Versions[v].plugins[p.Name] vp, present := Versions[v].plugins[p.Name]
if status == unsupported && !present { if status == SevUnsupported && !present {
notices = append(notices, Notice{Plugin: p.Name, Severity: status, Version: v}) notices = append(notices, Notice{Plugin: p.Name, Severity: status, Version: v})
continue continue
} }
if !present { if !present {
continue continue
} }
if vp.status != "" && vp.status != newdefault && status != unsupported { if vp.status != "" && vp.status != SevNewDefault && status != SevUnsupported {
notices = append(notices, Notice{ notices = append(notices, Notice{
Plugin: p.Name, Plugin: p.Name,
Severity: vp.status, Severity: vp.status,
@ -64,7 +64,7 @@ func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string)
} }
for _, o := range p.Options { for _, o := range p.Options {
vo, present := matchOption(o.Name, Versions[v].plugins[p.Name]) vo, present := matchOption(o.Name, Versions[v].plugins[p.Name])
if status == unsupported { if status == SevUnsupported {
if present { if present {
continue continue
} }
@ -79,15 +79,15 @@ func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string)
if !present { if !present {
continue continue
} }
if vo.status != "" && vo.status != newdefault { if vo.status != "" && vo.status != SevNewDefault {
notices = append(notices, Notice{Plugin: p.Name, Option: o.Name, Severity: vo.status, Version: v}) notices = append(notices, Notice{Plugin: p.Name, Option: o.Name, Severity: vo.status, Version: v})
continue continue
} }
} }
if status != unsupported { if status != SevUnsupported {
CheckForNewOptions: CheckForNewOptions:
for name, vo := range Versions[v].plugins[p.Name].namedOptions { for name, vo := range Versions[v].plugins[p.Name].namedOptions {
if vo.status != newdefault { if vo.status != SevNewDefault {
continue continue
} }
for _, o := range p.Options { for _, o := range p.Options {
@ -95,14 +95,14 @@ func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string)
continue CheckForNewOptions continue CheckForNewOptions
} }
} }
notices = append(notices, Notice{Plugin: p.Name, Option: name, Severity: newdefault, Version: v}) notices = append(notices, Notice{Plugin: p.Name, Option: name, Severity: SevNewDefault, Version: v})
} }
} }
} }
if status != unsupported { if status != SevUnsupported {
CheckForNewPlugins: CheckForNewPlugins:
for name, vp := range Versions[v].plugins { for name, vp := range Versions[v].plugins {
if vp.status != newdefault { if vp.status != SevNewDefault {
continue continue
} }
for _, p := range s.Plugins { for _, p := range s.Plugins {
@ -110,7 +110,7 @@ func getStatus(fromCoreDNSVersion, toCoreDNSVersion, corefileStr, status string)
continue CheckForNewPlugins continue CheckForNewPlugins
} }
} }
notices = append(notices, Notice{Plugin: name, Option: "", Severity: newdefault, Version: v}) notices = append(notices, Notice{Plugin: name, Option: "", Severity: SevNewDefault, Version: v})
} }
} }
} }
@ -158,7 +158,7 @@ func Migrate(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string, deprecati
newPlugs = append(newPlugs, p) newPlugs = append(newPlugs, p)
continue continue
} }
if !deprecations && vp.status == deprecated { if !deprecations && vp.status == SevDeprecated {
newPlugs = append(newPlugs, p) newPlugs = append(newPlugs, p)
continue continue
} }
@ -169,7 +169,7 @@ func Migrate(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string, deprecati
newOpts = append(newOpts, o) newOpts = append(newOpts, o)
continue continue
} }
if !deprecations && vo.status == deprecated { if !deprecations && vo.status == SevDeprecated {
newOpts = append(newOpts, o) newOpts = append(newOpts, o)
continue continue
} }
@ -204,7 +204,7 @@ func Migrate(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string, deprecati
} }
CheckForNewOptions: CheckForNewOptions:
for name, vo := range Versions[v].plugins[p.Name].namedOptions { for name, vo := range Versions[v].plugins[p.Name].namedOptions {
if vo.status != newdefault { if vo.status != SevNewDefault {
continue continue
} }
for _, o := range p.Options { for _, o := range p.Options {
@ -226,7 +226,7 @@ func Migrate(fromCoreDNSVersion, toCoreDNSVersion, corefileStr string, deprecati
} }
CheckForNewPlugins: CheckForNewPlugins:
for name, vp := range Versions[v].plugins { for name, vp := range Versions[v].plugins {
if vp.status != newdefault { if vp.status != SevNewDefault {
continue continue
} }
for _, p := range s.Plugins { for _, p := range s.Plugins {

16
vendor/github.com/coredns/corefile-migration/migration/notice.go generated vendored
View File

@ -19,9 +19,9 @@ func (n *Notice) ToString() string {
} else { } else {
s += fmt.Sprintf(`Option "%v" in plugin "%v" `, n.Option, n.Plugin) s += fmt.Sprintf(`Option "%v" in plugin "%v" `, n.Option, n.Plugin)
} }
if n.Severity == unsupported { if n.Severity == SevUnsupported {
s += "is unsupported by this migration tool in " + n.Version + "." s += "is unsupported by this migration tool in " + n.Version + "."
} else if n.Severity == newdefault { } else if n.Severity == SevNewDefault {
s += "is added as a default in " + n.Version + "." s += "is added as a default in " + n.Version + "."
} else { } else {
s += "is " + n.Severity + " in " + n.Version + "." s += "is " + n.Severity + " in " + n.Version + "."
@ -37,12 +37,12 @@ func (n *Notice) ToString() string {
const ( const (
// The following statuses are used to indicate the state of support/deprecation in a given release. // The following statuses are used to indicate the state of support/deprecation in a given release.
deprecated = "deprecated" // deprecated, but still completely functional SevDeprecated = "deprecated" // deprecated, but still completely functional
ignored = "ignored" // if included in the corefile, it will be ignored by CoreDNS SevIgnored = "ignored" // if included in the corefile, it will be ignored by CoreDNS
removed = "removed" // completely removed from CoreDNS, and would cause CoreDNS to exit if present in the Corefile SevRemoved = "removed" // completely removed from CoreDNS, and would cause CoreDNS to exit if present in the Corefile
newdefault = "newdefault" // added to the default corefile. CoreDNS may not function properly if it is not present in the corefile. SevNewDefault = "newdefault" // added to the default corefile. CoreDNS may not function properly if it is not present in the corefile.
unsupported = "unsupported" // the plugin/option is not supported by the migration tool SevUnsupported = "unsupported" // the plugin/option is not supported by the migration tool
// The following statuses are used for selecting/filtering notifications // The following statuses are used for selecting/filtering notifications
all = "all" // show all statuses SevAll = "all" // show all statuses
) )

42
vendor/github.com/coredns/corefile-migration/migration/plugins.go generated vendored
View File

@ -76,7 +76,7 @@ var plugins = map[string]map[string]plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"resyncperiod": {}, "resyncperiod": {},
"endpoint": { // new deprecation "endpoint": { // new deprecation
status: deprecated, status: SevDeprecated,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -97,7 +97,7 @@ var plugins = map[string]map[string]plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"resyncperiod": {}, "resyncperiod": {},
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -107,7 +107,7 @@ var plugins = map[string]map[string]plugin{
"pods": {}, "pods": {},
"endpoint_pod_names": {}, "endpoint_pod_names": {},
"upstream": { // new deprecation "upstream": { // new deprecation
status: deprecated, status: SevDeprecated,
action: removeOption, action: removeOption,
}, },
"ttl": {}, "ttl": {},
@ -120,11 +120,11 @@ var plugins = map[string]map[string]plugin{
"v5": plugin{ "v5": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"resyncperiod": { // new deprecation "resyncperiod": { // new deprecation
status: deprecated, status: SevDeprecated,
action: removeOption, action: removeOption,
}, },
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -134,7 +134,7 @@ var plugins = map[string]map[string]plugin{
"pods": {}, "pods": {},
"endpoint_pod_names": {}, "endpoint_pod_names": {},
"upstream": { "upstream": {
status: ignored, status: SevIgnored,
action: removeOption, action: removeOption,
}, },
"ttl": {}, "ttl": {},
@ -147,11 +147,11 @@ var plugins = map[string]map[string]plugin{
"v6": plugin{ "v6": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"resyncperiod": { // now ignored "resyncperiod": { // now ignored
status: ignored, status: SevIgnored,
action: removeOption, action: removeOption,
}, },
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -161,7 +161,7 @@ var plugins = map[string]map[string]plugin{
"pods": {}, "pods": {},
"endpoint_pod_names": {}, "endpoint_pod_names": {},
"upstream": { "upstream": {
status: ignored, status: SevIgnored,
action: removeOption, action: removeOption,
}, },
"ttl": {}, "ttl": {},
@ -174,11 +174,11 @@ var plugins = map[string]map[string]plugin{
"v7": plugin{ "v7": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"resyncperiod": { // new removal "resyncperiod": { // new removal
status: removed, status: SevRemoved,
action: removeOption, action: removeOption,
}, },
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -188,7 +188,7 @@ var plugins = map[string]map[string]plugin{
"pods": {}, "pods": {},
"endpoint_pod_names": {}, "endpoint_pod_names": {},
"upstream": { // new removal "upstream": { // new removal
status: removed, status: SevRemoved,
action: removeOption, action: removeOption,
}, },
"ttl": {}, "ttl": {},
@ -201,7 +201,7 @@ var plugins = map[string]map[string]plugin{
"v8 remove transfer option": plugin{ "v8 remove transfer option": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -213,7 +213,7 @@ var plugins = map[string]map[string]plugin{
"ttl": {}, "ttl": {},
"noendpoints": {}, "noendpoints": {},
"transfer": { "transfer": {
status: removed, status: SevRemoved,
action: removeOption, action: removeOption,
}, },
"fallthrough": {}, "fallthrough": {},
@ -223,7 +223,7 @@ var plugins = map[string]map[string]plugin{
"v8": plugin{ "v8": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"endpoint": { "endpoint": {
status: ignored, status: SevIgnored,
action: useFirstArgumentOnly, action: useFirstArgumentOnly,
}, },
"tls": {}, "tls": {},
@ -258,7 +258,7 @@ var plugins = map[string]map[string]plugin{
"v1 add lameduck": plugin{ "v1 add lameduck": plugin{
namedOptions: map[string]option{ namedOptions: map[string]option{
"lameduck": { "lameduck": {
status: newdefault, status: SevNewDefault,
add: func(c *corefile.Plugin) (*corefile.Plugin, error) { add: func(c *corefile.Plugin) (*corefile.Plugin, error) {
return addOptionToPlugin(c, &corefile.Option{Name: "lameduck 5s"}) return addOptionToPlugin(c, &corefile.Option{Name: "lameduck 5s"})
}, },
@ -383,7 +383,7 @@ var plugins = map[string]map[string]plugin{
"policy": {}, "policy": {},
"health_check": {}, "health_check": {},
"max_concurrent": { // new option "max_concurrent": { // new option
status: newdefault, status: SevNewDefault,
add: func(c *corefile.Plugin) (*corefile.Plugin, error) { add: func(c *corefile.Plugin) (*corefile.Plugin, error) {
return addOptionToPlugin(c, &corefile.Option{Name: "max_concurrent 1000"}) return addOptionToPlugin(c, &corefile.Option{Name: "max_concurrent 1000"})
}, },
@ -412,7 +412,7 @@ var plugins = map[string]map[string]plugin{
"except": {}, "except": {},
"spray": {}, "spray": {},
"protocol": { // https_google option ignored "protocol": { // https_google option ignored
status: ignored, status: SevIgnored,
action: proxyRemoveHttpsGoogleProtocol, action: proxyRemoveHttpsGoogleProtocol,
}, },
}, },
@ -426,19 +426,19 @@ var plugins = map[string]map[string]plugin{
"except": {}, "except": {},
"spray": {}, "spray": {},
"protocol": { // https_google option removed "protocol": { // https_google option removed
status: removed, status: SevRemoved,
action: proxyRemoveHttpsGoogleProtocol, action: proxyRemoveHttpsGoogleProtocol,
}, },
}, },
}, },
"deprecation": plugin{ // proxy -> forward deprecation migration "deprecation": plugin{ // proxy -> forward deprecation migration
status: deprecated, status: SevDeprecated,
replacedBy: "forward", replacedBy: "forward",
action: proxyToForwardPluginAction, action: proxyToForwardPluginAction,
namedOptions: proxyToForwardOptionsMigrations, namedOptions: proxyToForwardOptionsMigrations,
}, },
"removal": plugin{ // proxy -> forward forced migration "removal": plugin{ // proxy -> forward forced migration
status: removed, status: SevRemoved,
replacedBy: "forward", replacedBy: "forward",
action: proxyToForwardPluginAction, action: proxyToForwardPluginAction,
namedOptions: proxyToForwardOptionsMigrations, namedOptions: proxyToForwardOptionsMigrations,

57
vendor/github.com/coredns/corefile-migration/migration/versions.go generated vendored
View File

@ -16,7 +16,7 @@ type release struct {
// tasks that dont fit well into the modular plugin/option migration framework. For example, when the // tasks that dont fit well into the modular plugin/option migration framework. For example, when the
// action on a plugin would need to extend beyond the scope of that plugin (affecting other plugins, or // action on a plugin would need to extend beyond the scope of that plugin (affecting other plugins, or
// server blocks, etc). e.g. Splitting plugins out into separate server blocks. // server blocks, etc). e.g. Splitting plugins out into separate server blocks.
preProcess corefileAction preProcess corefileAction
postProcess corefileAction postProcess corefileAction
// defaultConf holds the default Corefile template packaged with the corresponding k8sReleases. // defaultConf holds the default Corefile template packaged with the corresponding k8sReleases.
@ -30,9 +30,56 @@ type release struct {
// Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4) // Versions holds a map of plugin/option migrations per CoreDNS release (since 1.1.4)
var Versions = map[string]release{ var Versions = map[string]release{
"1.8.4": {
priorVersion: "1.8.3",
dockerImageSHA: "6e5a02c21641597998b4be7cb5eb1e7b02c0d8d23cce4dd09f4682d463798890",
plugins: map[string]plugin{
"errors": plugins["errors"]["v2"],
"log": plugins["log"]["v1"],
"health": plugins["health"]["v1"],
"ready": {},
"autopath": {},
"kubernetes": plugins["kubernetes"]["v8"],
"k8s_external": plugins["k8s_external"]["v1"],
"prometheus": {},
"forward": plugins["forward"]["v3"],
"cache": plugins["cache"]["v1"],
"loop": {},
"reload": {},
"loadbalance": {},
"hosts": plugins["hosts"]["v1"],
"rewrite": plugins["rewrite"]["v2"],
"transfer": plugins["transfer"]["v1"],
},
},
"1.8.3": {
nextVersion: "1.8.4",
priorVersion: "1.8.0", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
dockerImageSHA: "642ff9910da6ea9a8624b0234eef52af9ca75ecbec474c5507cb096bdfbae4e5",
plugins: map[string]plugin{
"errors": plugins["errors"]["v2"],
"log": plugins["log"]["v1"],
"health": plugins["health"]["v1"],
"ready": {},
"autopath": {},
"kubernetes": plugins["kubernetes"]["v8"],
"k8s_external": plugins["k8s_external"]["v1"],
"prometheus": {},
"forward": plugins["forward"]["v3"],
"cache": plugins["cache"]["v1"],
"loop": {},
"reload": {},
"loadbalance": {},
"hosts": plugins["hosts"]["v1"],
"rewrite": plugins["rewrite"]["v2"],
"transfer": plugins["transfer"]["v1"],
},
},
"1.8.0": { "1.8.0": {
nextVersion: "1.8.3", // CoreDNS 1.8.2 is not a valid version and 1.8.1 docker images were never released.
priorVersion: "1.7.1", priorVersion: "1.7.1",
dockerImageSHA: "TBD", k8sReleases: []string{"1.21"},
dockerImageSHA: "cc8fb77bc2a0541949d1d9320a641b82fd392b0d3d8145469ca4709ae769980e",
plugins: map[string]plugin{ plugins: map[string]plugin{
"errors": plugins["errors"]["v2"], "errors": plugins["errors"]["v2"],
"log": plugins["log"]["v1"], "log": plugins["log"]["v1"],
@ -78,7 +125,7 @@ var Versions = map[string]release{
"1.7.0": { "1.7.0": {
nextVersion: "1.7.1", nextVersion: "1.7.1",
priorVersion: "1.6.9", priorVersion: "1.6.9",
k8sReleases: []string{"1.19"}, k8sReleases: []string{"1.19", "1.20"},
dockerImageSHA: "73ca82b4ce829766d4f1f10947c3a338888f876fbed0540dc849c89ff256e90c", dockerImageSHA: "73ca82b4ce829766d4f1f10947c3a338888f876fbed0540dc849c89ff256e90c",
defaultConf: `.:53 { defaultConf: `.:53 {
errors errors
@ -424,7 +471,7 @@ var Versions = map[string]release{
"log": plugins["log"]["v1"], "log": plugins["log"]["v1"],
"health": plugins["health"]["v1"], "health": plugins["health"]["v1"],
"ready": { "ready": {
status: newdefault, status: SevNewDefault,
add: func(c *corefile.Server) (*corefile.Server, error) { add: func(c *corefile.Server) (*corefile.Server, error) {
return addToKubernetesServerBlocks(c, &corefile.Plugin{Name: "ready"}) return addToKubernetesServerBlocks(c, &corefile.Plugin{Name: "ready"})
}, },
@ -681,7 +728,7 @@ var Versions = map[string]release{
"forward": plugins["forward"]["v2"], "forward": plugins["forward"]["v2"],
"cache": plugins["cache"]["v1"], "cache": plugins["cache"]["v1"],
"loop": { "loop": {
status: newdefault, status: SevNewDefault,
add: func(s *corefile.Server) (*corefile.Server, error) { add: func(s *corefile.Server) (*corefile.Server, error) {
return addToForwardingServerBlocks(s, &corefile.Plugin{Name: "loop"}) return addToForwardingServerBlocks(s, &corefile.Plugin{Name: "loop"})
}, },

26
vendor/modules.txt vendored
View File

@ -144,8 +144,6 @@ github.com/beorn7/perks/quantile
github.com/blang/semver github.com/blang/semver
# github.com/boltdb/bolt v1.3.1 => github.com/boltdb/bolt v1.3.1 # github.com/boltdb/bolt v1.3.1 => github.com/boltdb/bolt v1.3.1
## explicit ## explicit
# github.com/caddyserver/caddy v1.0.3 => github.com/caddyserver/caddy v1.0.3
github.com/caddyserver/caddy/caddyfile
# github.com/cespare/xxhash/v2 v2.1.1 => github.com/cespare/xxhash/v2 v2.1.1 # github.com/cespare/xxhash/v2 v2.1.1 => github.com/cespare/xxhash/v2 v2.1.1
github.com/cespare/xxhash/v2 github.com/cespare/xxhash/v2
# github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 # github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
@ -197,7 +195,9 @@ github.com/containernetworking/cni/pkg/types/020
github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/types/current
github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/utils
github.com/containernetworking/cni/pkg/version github.com/containernetworking/cni/pkg/version
# github.com/coredns/corefile-migration v1.0.11 => github.com/coredns/corefile-migration v1.0.11 # github.com/coredns/caddy v1.1.0 => github.com/coredns/caddy v1.1.0
github.com/coredns/caddy/caddyfile
# github.com/coredns/corefile-migration v1.0.12 => github.com/coredns/corefile-migration v1.0.12
## explicit ## explicit
github.com/coredns/corefile-migration/migration github.com/coredns/corefile-migration/migration
github.com/coredns/corefile-migration/migration/corefile github.com/coredns/corefile-migration/migration/corefile
@ -2336,17 +2336,13 @@ sigs.k8s.io/yaml
# github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.35.24 # github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.35.24
# github.com/beorn7/perks => github.com/beorn7/perks v1.0.1 # github.com/beorn7/perks => github.com/beorn7/perks v1.0.1
# github.com/bgentry/speakeasy => github.com/bgentry/speakeasy v0.1.0 # github.com/bgentry/speakeasy => github.com/bgentry/speakeasy v0.1.0
# github.com/bifurcation/mint => github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115
# github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c # github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c
# github.com/blang/semver => github.com/blang/semver v3.5.1+incompatible # github.com/blang/semver => github.com/blang/semver v3.5.1+incompatible
# github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1 # github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1
# github.com/caddyserver/caddy => github.com/caddyserver/caddy v1.0.3
# github.com/cenkalti/backoff => github.com/cenkalti/backoff v2.1.1+incompatible
# github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1 # github.com/census-instrumentation/opencensus-proto => github.com/census-instrumentation/opencensus-proto v0.2.1
# github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1 # github.com/cespare/xxhash/v2 => github.com/cespare/xxhash/v2 v2.1.1
# github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 # github.com/chai2010/gettext-go => github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
# github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.0.0 # github.com/checkpoint-restore/go-criu/v5 => github.com/checkpoint-restore/go-criu/v5 v5.0.0
# github.com/cheekybits/genny => github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9
# github.com/chzyer/logex => github.com/chzyer/logex v1.1.10 # github.com/chzyer/logex => github.com/chzyer/logex v1.1.10
# github.com/chzyer/readline => github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e # github.com/chzyer/readline => github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
# github.com/chzyer/test => github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 # github.com/chzyer/test => github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1
@ -2363,7 +2359,8 @@ sigs.k8s.io/yaml
# github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2 # github.com/containerd/ttrpc => github.com/containerd/ttrpc v1.0.2
# github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.1 # github.com/containerd/typeurl => github.com/containerd/typeurl v1.0.1
# github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1 # github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1
# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.11 # github.com/coredns/caddy => github.com/coredns/caddy v1.1.0
# github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.12
# github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2 # github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.2
# github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible # github.com/coreos/etcd => github.com/coreos/etcd v3.3.13+incompatible
# github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible # github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible
@ -2400,7 +2397,6 @@ sigs.k8s.io/yaml
# github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9 # github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.9
# github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1 # github.com/fvbommel/sortorder => github.com/fvbommel/sortorder v1.0.1
# github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0 # github.com/ghodss/yaml => github.com/ghodss/yaml v1.0.0
# github.com/go-acme/lego => github.com/go-acme/lego v2.5.0+incompatible
# github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible # github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible
# github.com/go-errors/errors => github.com/go-errors/errors v1.0.1 # github.com/go-errors/errors => github.com/go-errors/errors v1.0.1
# github.com/go-gl/glfw/v3.3/glfw => github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 # github.com/go-gl/glfw/v3.3/glfw => github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4
@ -2464,7 +2460,6 @@ sigs.k8s.io/yaml
# github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 # github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
# github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0 # github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0
# github.com/ishidawataru/sctp => github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5 # github.com/ishidawataru/sctp => github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5
# github.com/jimstudt/http-authentication => github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a
# github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.4.0 # github.com/jmespath/go-jmespath => github.com/jmespath/go-jmespath v0.4.0
# github.com/jmespath/go-jmespath/internal/testify => github.com/jmespath/go-jmespath/internal/testify v1.5.1 # github.com/jmespath/go-jmespath/internal/testify => github.com/jmespath/go-jmespath/internal/testify v1.5.1
# github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0 # github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0
@ -2477,27 +2472,19 @@ sigs.k8s.io/yaml
# github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1 # github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1
# github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0 # github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0
# github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 # github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0
# github.com/klauspost/cpuid => github.com/klauspost/cpuid v1.2.0
# github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2 # github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2
# github.com/kr/pretty => github.com/kr/pretty v0.2.1 # github.com/kr/pretty => github.com/kr/pretty v0.2.1
# github.com/kr/text => github.com/kr/text v0.2.0 # github.com/kr/text => github.com/kr/text v0.2.0
# github.com/kylelemons/godebug => github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
# github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.0 # github.com/libopenstorage/openstorage => github.com/libopenstorage/openstorage v1.0.0
# github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de # github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
# github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0 # github.com/lithammer/dedent => github.com/lithammer/dedent v1.1.0
# github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1 # github.com/lpabon/godbc => github.com/lpabon/godbc v0.1.1
# github.com/lucas-clemente/aes12 => github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f
# github.com/lucas-clemente/quic-clients => github.com/lucas-clemente/quic-clients v0.1.0
# github.com/lucas-clemente/quic-go => github.com/lucas-clemente/quic-go v0.10.2
# github.com/lucas-clemente/quic-go-certificates => github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced
# github.com/magiconair/properties => github.com/magiconair/properties v1.8.1 # github.com/magiconair/properties => github.com/magiconair/properties v1.8.1
# github.com/mailru/easyjson => github.com/mailru/easyjson v0.7.0 # github.com/mailru/easyjson => github.com/mailru/easyjson v0.7.0
# github.com/marten-seemann/qtls => github.com/marten-seemann/qtls v0.2.3
# github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9 # github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
# github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.4 # github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.4
# github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.7 # github.com/mattn/go-runewidth => github.com/mattn/go-runewidth v0.0.7
# github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 # github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
# github.com/mholt/certmagic => github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2
# github.com/miekg/dns => github.com/miekg/dns v1.1.35 # github.com/miekg/dns => github.com/miekg/dns v1.1.35
# github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 # github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989
# github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible # github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
@ -2522,8 +2509,6 @@ sigs.k8s.io/yaml
# github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0 # github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0
# github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f # github.com/mwitkow/go-conntrack => github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
# github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f # github.com/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
# github.com/naoina/go-stringutil => github.com/naoina/go-stringutil v0.1.0
# github.com/naoina/toml => github.com/naoina/toml v0.1.1
# github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e # github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
# github.com/nxadm/tail => github.com/nxadm/tail v1.4.4 # github.com/nxadm/tail => github.com/nxadm/tail v1.4.4
# github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.4 # github.com/olekukonko/tablewriter => github.com/olekukonko/tablewriter v0.0.4
@ -2622,7 +2607,6 @@ sigs.k8s.io/yaml
# gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0 # gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0
# gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1 # gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1
# gopkg.in/ini.v1 => gopkg.in/ini.v1 v1.51.0 # gopkg.in/ini.v1 => gopkg.in/ini.v1 v1.51.0
# gopkg.in/mcuadros/go-syslog.v2 => gopkg.in/mcuadros/go-syslog.v2 v2.2.1
# gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0 # gopkg.in/natefinch/lumberjack.v2 => gopkg.in/natefinch/lumberjack.v2 v2.0.0
# gopkg.in/resty.v1 => gopkg.in/resty.v1 v1.12.0 # gopkg.in/resty.v1 => gopkg.in/resty.v1 v1.12.0
# gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 # gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2