Merge pull request #278 from erikwilson/vendor-kubernetes-v1.13.5-k3s.1

Update vendor

trash.lock

@@ -1,17 +1,36 @@
 package: package=github.com/rancher/k3s
 import:
+- package: bitbucket.org/ww/goautoneg
+  version: a547fc61f48d567d5b4ec6f8aee5573d8efce11d
+  repo: https://github.com/rancher/goautoneg.git
+- package: github.com/Azure/go-ansiterm
+  version: d6e3b3328b783f23731bc4d058875b0371ff8109
 - package: github.com/BurntSushi/toml
   version: a368813c5e648fee92e5f6c30e3944ff9d5e8895
+- package: github.com/JeffAshton/win_pdh
+  version: 76bb4ee9f0ab50f77826f2a2ee7fb9d3880d6ec2
+- package: github.com/MakeNowJust/heredoc
+  version: bb23615498cded5e105af4ce27de75b089cbe851
 - package: github.com/Microsoft/go-winio
   version: v0.4.11
 - package: github.com/Microsoft/hcsshim
   version: v0.8.3
+- package: github.com/Nvveen/Gotty
+  version: cd527374f1e5bff4938207604a14f2e38a9cf512
 - package: github.com/alexflint/go-filemutex
   version: 72bdc8eae2aef913234599b837f5dda445ca9bd9
+- package: github.com/armon/circbuf
+  version: bbbad097214e2918d8543d5201d12bfd7bca254d
 - package: github.com/beorn7/perks
   version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
 - package: github.com/blang/semver
   version: v3.1.0
+- package: github.com/chai2010/gettext-go
+  version: c6fed771bfd517099caf0f7a961671fa8ed08723
+- package: github.com/cloudflare/cfssl
+  version: 1.3.2-21-g56268a613adfed
+- package: github.com/container-storage-interface/spec
+  version: v1.0.0
 - package: github.com/containerd/cgroups
   version: 5e610833b72089b37d0e615de9a92dfc043757c2
 - package: github.com/containerd/console
@@ -38,25 +57,53 @@ import:
 - package: github.com/containernetworking/plugins
   version: 9810b7d5137b171c4e07ce59bb18be9feccec557
   repo: https://github.com/ibuildthecloud/plugins.git
+- package: github.com/coreos/etcd
+  version: v3.3.10
 - package: github.com/coreos/flannel
   version: 823afe66b2266bf71f5bec24e6e28b26d70cfc7c
   repo: https://github.com/ibuildthecloud/flannel.git
 - package: github.com/coreos/go-iptables
   version: 47f22b0dd3355c0ba570ba12b0b8a36bf214c04b
+- package: github.com/coreos/go-semver
+  version: v0.2.0-9-ge214231b295a8e
 - package: github.com/coreos/go-systemd
   version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6
+- package: github.com/coreos/pkg
+  version: v4
+- package: github.com/cyphar/filepath-securejoin
+  version: v0.2.1-1-gae69057f2299fb
 - package: github.com/davecgh/go-spew
   version: v1.1.0
+- package: github.com/daviddengcn/go-colortext
+  version: 511bcaf42ccd42c38aba7427b6673277bf19e2a1
 - package: github.com/docker/distribution
   version: 0d3efadf0154c2b8a4e7b6621fff9809655cc580
+- package: github.com/docker/docker
+  version: docs-v1.12.0-rc4-2016-07-15-9510-ga9fbbdc8dd8794
+- package: github.com/docker/go-connections
+  version: v0.3.0
 - package: github.com/docker/go-events
   version: 9461782956ad83b30282bf90e31fa6a70c255ba9
 - package: github.com/docker/go-metrics
   version: 4ea375f7759c82740c893fc030bc37088d2ec098
+- package: github.com/docker/go-units
+  version: v0.3.1-11-g9e638d38cf6977
+- package: github.com/docker/libnetwork
+  version: v0.8.0-dev.2-1265-ga9cd636e378982
 - package: github.com/docker/spdystream
   version: 449fdfce4d962303d702fec724ef0ad181c92528
 - package: github.com/emicklei/go-restful
   version: v2.2.1
+- package: github.com/euank/go-kmsg-parser
+  version: v2.0.0
+- package: github.com/evanphx/json-patch
+  version: v4.1.0-19-g5858425f75500d
+- package: github.com/exponent-io/jsonpath
+  version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
+- package: github.com/fatih/camelcase
+  version: f6a740d52f961c60348ebb109adde9f4635d7540
+- package: github.com/fsnotify/fsnotify
+  version: v1.3.1-1-gf12c6236fe7b5c
 - package: github.com/ghodss/yaml
   version: v1.0.0
 - package: github.com/godbus/dbus
@@ -65,35 +112,76 @@ import:
   version: 08a7655d27152912db7aaf4f983275eaf8d128ef
 - package: github.com/gogo/protobuf
   version: v1.0.0
+- package: github.com/golang/groupcache
+  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
 - package: github.com/golang/protobuf
   version: v1.1.0
+- package: github.com/google/btree
+  version: 7d79101e329e5a3adf994758c578dab82b90c017
+- package: github.com/google/cadvisor
+  version: 87e237ff35b9d752ba58860a06e0ebe57816cbb7
+  repo: https://github.com/ibuildthecloud/cadvisor.git
+- package: github.com/google/certificate-transparency-go
+  version: v1.0.21
 - package: github.com/google/gofuzz
   version: 44d81051d367757e1c7c6a5a86423ece9afcf63c
+- package: github.com/googleapis/gnostic
+  version: 0c5108395e2debce0d731cf0287ddf7242066aba
 - package: github.com/gorilla/mux
   version: v1.6.2
 - package: github.com/gorilla/websocket
   version: v1.2.0
+- package: github.com/gregjones/httpcache
+  version: 787624de3eb7bd915c329cba748687a3b22666a6
 - package: github.com/grpc-ecosystem/go-grpc-prometheus
   version: 6b7015e65d366bf3f19b2b2a000a831940f0f7e0
 - package: github.com/hashicorp/errwrap
   version: 7554cd9344cec97297fa6649b055a8c98c2a1e55
 - package: github.com/hashicorp/go-multierror
   version: ed905158d87462226a13fe39ddf685ea65f1c11f
+- package: github.com/hashicorp/golang-lru
+  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
+- package: github.com/ibuildthecloud/kvsql
+  version: c649f12fe5250718e4e024b8b40e7de796ab095e
+- package: github.com/imdario/mergo
+  version: v0.3.5
+- package: github.com/inconshreveable/mousetrap
+  version: v1.0
 - package: github.com/j-keck/arping
   version: 2cf9dc699c5640a7e2c81403a44127bf28033600
+- package: github.com/jonboulle/clockwork
+  version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982
 - package: github.com/json-iterator/go
   version: 1.1.5
+- package: github.com/jteeuwen/go-bindata
+  version: v3.0.7-72-ga0ff2567cfb709
+- package: github.com/karrick/godirwalk
+  version: v1.7.5
 - package: github.com/kubernetes-sigs/cri-tools
   version: c465773e3ad8c941d1756c0a467d550b04a8f65b
   repo: https://github.com/ibuildthecloud/cri-tools.git
+- package: github.com/mattn/go-shellwords
+  version: v1.0.3-20-gf8471b0a71ded0
 - package: github.com/mattn/go-sqlite3
   version: v1.9.0
 - package: github.com/matttproud/golang_protobuf_extensions
   version: v1.0.0
+- package: github.com/miekg/dns
+  version: 5d001d020961ae1c184f9f8152fdc73810481677
+- package: github.com/mindprince/gonvml
+  version: fee913ce8fb235edf54739d259ca0ecc226c7b8a
+- package: github.com/mistifyio/go-zfs
+  version: v2.1.1-5-g1b4ae6fb4e77b0
+- package: github.com/mitchellh/go-wordwrap
+  version: ad45545899c7b13c020ea92b2072220eefad42b8
 - package: github.com/modern-go/concurrent
   version: 1.0.3
 - package: github.com/modern-go/reflect2
   version: 1.0.1
+- package: github.com/mrunalp/fileutils
+  version: 4ee1cc9a80582a0c75febdd5cfa779ee4361cbca
+- package: github.com/mxk/go-flowrate
+  version: cca7078d478f8520f85629ad7c68962d31ed7682
 - package: github.com/natefinch/lumberjack
   version: aee4629129445bbdfb69aa565537dcfa16544311
 - package: github.com/opencontainers/go-digest
@@ -108,21 +196,53 @@ import:
   version: v0.6.0
 - package: github.com/opencontainers/selinux
   version: b6fa367ed7f534f9ba25391cc2d467085dbb445a
+- package: github.com/pborman/uuid
+  version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
+- package: github.com/peterbourgon/diskv
+  version: v2.0.1
 - package: github.com/pkg/errors
   version: v0.8.0
+- package: github.com/prometheus/client_golang
+  version: v0.8.0-83-ge7e903064f5e9e
+- package: github.com/prometheus/client_model
+  version: model-0.0.2-12-gfa8ad6fec33561
+- package: github.com/prometheus/common
+  version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207
+- package: github.com/prometheus/procfs
+  version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259
 - package: github.com/rancher/norman
   version: f75e3607e96e1a5d3cbaf4ee7cea1459cc727f61
   repo: https://github.com/ibuildthecloud/norman.git
+- package: github.com/renstrom/dedent
+  version: v1.0.0-3-g020d11c3b9c0c7
+- package: github.com/robfig/cron
+  version: v1-53-gdf38d32658d878
+- package: github.com/russross/blackfriday
+  version: v1.4-2-g300106c228d52c
 - package: github.com/seccomp/libseccomp-golang
   version: 32f571b70023028bd57d9288c20efbcb237f3ce0
+- package: github.com/shurcooL/sanitized_anchor_name
+  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
+- package: github.com/sigma/go-inotify
+  version: c87b6cf5033d2c6486046f045eeebdc3d910fd38
 - package: github.com/sirupsen/logrus
   version: v1.0.3
+- package: github.com/spf13/cobra
+  version: v0.0.1-34-gc439c4fa093711
+- package: github.com/spf13/pflag
+  version: v1.0.1
 - package: github.com/syndtr/gocapability
   version: db04d3cc01c8b54962a58ec7e491717d06cfcc16
 - package: github.com/tchap/go-patricia
   version: v2.2.6
+- package: github.com/ugorji/go
+  version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57
 - package: github.com/urfave/cli
   version: 8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff
+- package: github.com/vishvananda/netlink
+  version: b2de5d10e38ecce8607e6b438b6d174f389a004e
+- package: github.com/vishvananda/netns
+  version: be1fbeda19366dea804f00efff2dd73a1642fdcc
 - package: github.com/xeipuuv/gojsonpointer
   version: 4e3ac2762d5f479393488629ee9370b50873b3a6
 - package: github.com/xeipuuv/gojsonreference
@@ -146,154 +266,34 @@ import:
   version: 19e51611da83d6be54ddafce4a4af510cb3e9ea4
 - package: golang.org/x/time
   version: f51c12702a4d776e4c1fa9b0fabab841babae631
+- package: golang.org/x/tools
+  version: 2382e3994d48b1d22acc2c86bcad0a2aff028e32
 - package: google.golang.org/genproto
   version: d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 - package: google.golang.org/grpc
   version: v1.12.0
 - package: gopkg.in/inf.v0
   version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-- package: gopkg.in/yaml.v2
-  version: v2.2.1
-- package: k8s.io/kubernetes
-  version: v1.13.4-k3s.1
-  repo: https://github.com/rancher/k3s.git
-  transitive: true
-  staging: true
-- package: github.com/mxk/go-flowrate
-  version: cca7078d478f8520f85629ad7c68962d31ed7682
-- package: github.com/JeffAshton/win_pdh
-  version: 76bb4ee9f0ab50f77826f2a2ee7fb9d3880d6ec2
-- package: github.com/inconshreveable/mousetrap
-  version: v1.0
-- package: github.com/mistifyio/go-zfs
-  version: v2.1.1-5-g1b4ae6fb4e77b0
-- package: github.com/Azure/go-ansiterm
-  version: d6e3b3328b783f23731bc4d058875b0371ff8109
-- package: github.com/docker/go-connections
-  version: v0.3.0
-- package: k8s.io/gengo
-  version: 51747d6e00da1fc578d5a333a93bb2abcbce7a95
-- package: github.com/robfig/cron
-  version: v1-53-gdf38d32658d878
-- package: github.com/chai2010/gettext-go
-  version: c6fed771bfd517099caf0f7a961671fa8ed08723
-- package: github.com/russross/blackfriday
-  version: v1.4-2-g300106c228d52c
-- package: bitbucket.org/ww/goautoneg
-  version: a547fc61f48d567d5b4ec6f8aee5573d8efce11d
-  repo: https://github.com/rancher/goautoneg.git
-- package: github.com/coreos/go-semver
-  version: v0.2.0-9-ge214231b295a8e
-- package: github.com/mindprince/gonvml
-  version: fee913ce8fb235edf54739d259ca0ecc226c7b8a
-- package: github.com/spf13/pflag
-  version: v1.0.1
-- package: github.com/euank/go-kmsg-parser
-  version: v2.0.0
-- package: github.com/fsnotify/fsnotify
-  version: v1.3.1-1-gf12c6236fe7b5c
-- package: github.com/prometheus/common
-  version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207
-- package: github.com/google/certificate-transparency-go
-  version: v1.0.21
-- package: golang.org/x/tools
-  version: 2382e3994d48b1d22acc2c86bcad0a2aff028e32
-- package: vbom.ml/util
-  version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394
-- package: github.com/google/cadvisor
-  version: 87e237ff35b9d752ba58860a06e0ebe57816cbb7
-  repo: https://github.com/ibuildthecloud/cadvisor.git
-- package: github.com/hashicorp/golang-lru
-  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
-- package: github.com/cloudflare/cfssl
-  version: 1.3.2-21-g56268a613adfed
-- package: github.com/docker/libnetwork
-  version: v0.8.0-dev.2-1265-ga9cd636e378982
-- package: github.com/prometheus/client_golang
-  version: v0.8.0-83-ge7e903064f5e9e
-- package: sigs.k8s.io/yaml
-  version: v1.1.0
-- package: github.com/Nvveen/Gotty
-  version: cd527374f1e5bff4938207604a14f2e38a9cf512
-- package: github.com/mattn/go-shellwords
-  version: v1.0.3-20-gf8471b0a71ded0
-- package: github.com/gregjones/httpcache
-  version: 787624de3eb7bd915c329cba748687a3b22666a6
-- package: github.com/imdario/mergo
-  version: v0.3.5
-- package: github.com/karrick/godirwalk
-  version: v1.7.5
-- package: github.com/mitchellh/go-wordwrap
-  version: ad45545899c7b13c020ea92b2072220eefad42b8
-- package: github.com/google/btree
-  version: 7d79101e329e5a3adf994758c578dab82b90c017
-- package: github.com/armon/circbuf
-  version: bbbad097214e2918d8543d5201d12bfd7bca254d
-- package: github.com/prometheus/procfs
-  version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259
-- package: github.com/googleapis/gnostic
-  version: 0c5108395e2debce0d731cf0287ddf7242066aba
-- package: github.com/peterbourgon/diskv
-  version: v2.0.1
-- package: github.com/vishvananda/netns
-  version: be1fbeda19366dea804f00efff2dd73a1642fdcc
-- package: github.com/evanphx/json-patch
-  version: v4.1.0-19-g5858425f75500d
-- package: github.com/spf13/cobra
-  version: v0.0.1-34-gc439c4fa093711
-- package: github.com/ugorji/go
-  version: bdcc60b419d136a85cdf2e7cbcac34b3f1cd6e57
-- package: github.com/miekg/dns
-  version: 5d001d020961ae1c184f9f8152fdc73810481677
-- package: github.com/vishvananda/netlink
-  version: b2de5d10e38ecce8607e6b438b6d174f389a004e
-- package: github.com/container-storage-interface/spec
-  version: v1.0.0
-- package: github.com/jteeuwen/go-bindata
-  version: v3.0.7-72-ga0ff2567cfb709
-- package: github.com/shurcooL/sanitized_anchor_name
-  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
-- package: github.com/golang/groupcache
-  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
-- package: github.com/mrunalp/fileutils
-  version: 4ee1cc9a80582a0c75febdd5cfa779ee4361cbca
-- package: github.com/prometheus/client_model
-  version: model-0.0.2-12-gfa8ad6fec33561
-- package: github.com/exponent-io/jsonpath
-  version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
-- package: github.com/MakeNowJust/heredoc
-  version: bb23615498cded5e105af4ce27de75b089cbe851
-- package: github.com/coreos/etcd
-  version: v3.3.10
-- package: github.com/fatih/camelcase
-  version: f6a740d52f961c60348ebb109adde9f4635d7540
-- package: github.com/docker/docker
-  version: docs-v1.12.0-rc4-2016-07-15-9510-ga9fbbdc8dd8794
 - package: gopkg.in/natefinch/lumberjack.v2
   version: v1.0-16-g20b71e5b60d756
 - package: gopkg.in/square/go-jose.v2
   version: v2.1.6-4-g89060dee6a84df
-- package: github.com/coreos/pkg
-  version: v4
-- package: github.com/sigma/go-inotify
-  version: c87b6cf5033d2c6486046f045eeebdc3d910fd38
-- package: github.com/cyphar/filepath-securejoin
-  version: v0.2.1-1-gae69057f2299fb
-- package: github.com/renstrom/dedent
-  version: v1.0.0-3-g020d11c3b9c0c7
+- package: gopkg.in/yaml.v2
+  version: v2.2.1
+- package: k8s.io/gengo
+  version: 51747d6e00da1fc578d5a333a93bb2abcbce7a95
 - package: k8s.io/heapster
   version: v1.2.0-beta.1
-- package: github.com/docker/go-units
-  version: v0.3.1-11-g9e638d38cf6977
-- package: github.com/ibuildthecloud/kvsql
-  version: c649f12fe5250718e4e024b8b40e7de796ab095e
-- package: github.com/jonboulle/clockwork
-  version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982
 - package: k8s.io/klog
   version: 8139d8cb77af419532b33dfa7dd09fbc5f1d344f
-- package: github.com/daviddengcn/go-colortext
-  version: 511bcaf42ccd42c38aba7427b6673277bf19e2a1
+- package: k8s.io/kubernetes
+  version: v1.13.5-k3s.1
+  repo: https://github.com/rancher/k3s.git
+  transitive: true
+  staging: true
 - package: k8s.io/utils
   version: 66066c83e385e385ccc3c964b44fd7dcd413d0ed
-- package: github.com/pborman/uuid
-  version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
+- package: sigs.k8s.io/yaml
+  version: v1.1.0
+- package: vbom.ml/util
+  version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394