diff --git a/vendor.conf b/vendor.conf index 0a834fe19a..2bfc16976f 100755 --- a/vendor.conf +++ b/vendor.conf @@ -86,15 +86,15 @@ google.golang.org/grpc f495f5b15ae7ccda3b38c53a1bfc gopkg.in/inf.v0 d2d2541c53f18d2a059457998ce2876cc8e67cbf # v0.9.1 gopkg.in/yaml.v2 53403b58ad1b561927d19068c655246f2db79d48 # v2.2.8 gotest.tools/v3 bb0d8a963040ea5048dcef1a14d8f8b58a33d4b3 # v3.0.2 -k8s.io/api 35e20aa79eb876d1014e0383c7fcda49e52c5d76 # kubernetes-1.16.1 -k8s.io/apimachinery 27d36303b6556f377b4f34e64705fa9024a12b0c # kubernetes-1.16.1 -k8s.io/apiextensions-apiserver 49e3d608220c016ce72a3bd9524eed4dcef587df # kubernetes-1.16.1 -k8s.io/apiserver 3c8b233e046cffa0f8b63fff9e3ba4014a1ef456 # kubernetes-1.16.1 -k8s.io/client-go f68efa97b39e67ee47d4b4683d0037d721f077be # kubernetes-1.16.1 -k8s.io/component-base f573d376509cec44c50b8d79741bc939ec7ede56 # kubernetes-1.16.1 -k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f # v0.4.0 +k8s.io/api d49a3f108dab8e8d25f22c497fb48678b124efd2 # v0.16.9 +k8s.io/apimachinery f336d9be0221d10a93a7d6d2ec25f6fc799f4fc6 # v0.16.9 +k8s.io/apiextensions-apiserver e0288c14e6fda28eefbd584da8c657447e414f96 # v0.16.9 +k8s.io/apiserver 3987e0d46aec47186e5f2c0d61ad84975cb79bd8 # v0.16.9 +k8s.io/client-go 002560d5bf54049bf5b5ae99231cb2b591f15954 # v0.16.9 +k8s.io/component-base dbd90d7c5d87d80fd674cc40d69ca7b14798eda5 # v0.16.9 +k8s.io/klog 2ca9ad30301bf30a8a6e0fa2110db6b8df699a91 # v1.0.0 k8s.io/kube-openapi 0270cf2f1c1d995d34b36019a6f65d58e6e33ad4 -k8s.io/kubernetes d647ddbd755faf07169599a625faf302ffc34458 # v1.16.1 +k8s.io/kubernetes a17149e1a189050796ced469dbd78d380f2ed5ef # v1.16.9 k8s.io/utils 69764acb6e8e900b7c05296c5d3c9c19545475f9 sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 # v1.1.0 vbom.ml/util 256737ac55c46798123f754ab7d2c784e2c71783 diff --git a/vendor/k8s.io/api/go.mod b/vendor/k8s.io/api/go.mod index db54dc8f81..8fb4e43b68 100644 --- a/vendor/k8s.io/api/go.mod +++ b/vendor/k8s.io/api/go.mod @@ -7,12 +7,10 @@ go 1.12 require ( github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/stretchr/testify v1.3.0 - k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 + k8s.io/apimachinery v0.16.9 ) replace ( - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + k8s.io/apimachinery => k8s.io/apimachinery v0.16.9 ) diff --git a/vendor/k8s.io/apiextensions-apiserver/go.mod b/vendor/k8s.io/apiextensions-apiserver/go.mod index 997db0df69..264c91e33a 100644 --- a/vendor/k8s.io/apiextensions-apiserver/go.mod +++ b/vendor/k8s.io/apiextensions-apiserver/go.mod @@ -5,7 +5,7 @@ module k8s.io/apiextensions-apiserver go 1.12 require ( - github.com/coreos/etcd v3.3.15+incompatible + github.com/coreos/etcd v3.3.17+incompatible github.com/emicklei/go-restful v2.9.5+incompatible github.com/go-openapi/errors v0.19.2 github.com/go-openapi/spec v0.19.2 @@ -18,34 +18,28 @@ require ( github.com/pborman/uuid v1.2.0 github.com/prometheus/client_golang v0.9.2 github.com/spf13/cobra v0.0.5 - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.3.0 google.golang.org/grpc v1.23.0 - gopkg.in/yaml.v2 v2.2.2 - k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/apiserver v0.0.0-20191003001037-3c8b233e046c - k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e - k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85 - k8s.io/component-base v0.0.0-20191003000551-f573d376509c - k8s.io/klog v0.4.0 + gopkg.in/yaml.v2 v2.2.8 + k8s.io/api v0.16.9 + k8s.io/apimachinery v0.16.9 + k8s.io/apiserver v0.16.9 + k8s.io/client-go v0.16.9 + k8s.io/code-generator v0.16.9 + k8s.io/component-base v0.16.9 + k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/yaml v1.1.0 ) replace ( - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191003001037-3c8b233e046c - k8s.io/client-go => k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190927045949-f81bca4f5e85 - k8s.io/component-base => k8s.io/component-base v0.0.0-20191003000551-f573d376509c + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + k8s.io/api => k8s.io/api v0.16.9 + k8s.io/apimachinery => k8s.io/apimachinery v0.16.9 + k8s.io/apiserver => k8s.io/apiserver v0.16.9 + k8s.io/client-go => k8s.io/client-go v0.16.9 + k8s.io/code-generator => k8s.io/code-generator v0.16.9 + k8s.io/component-base => k8s.io/component-base v0.16.9 ) diff --git a/vendor/k8s.io/apimachinery/go.mod b/vendor/k8s.io/apimachinery/go.mod index 0e64636732..0fcb6616ef 100644 --- a/vendor/k8s.io/apimachinery/go.mod +++ b/vendor/k8s.io/apimachinery/go.mod @@ -23,21 +23,17 @@ require ( github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f github.com/onsi/ginkgo v1.8.0 // indirect github.com/onsi/gomega v1.5.0 // indirect - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.3.0 - golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc - golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f // indirect + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 + golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect golang.org/x/text v0.3.2 // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect - gopkg.in/inf.v0 v0.9.0 - gopkg.in/yaml.v2 v2.2.2 - k8s.io/klog v0.4.0 + gopkg.in/inf.v0 v0.9.1 + gopkg.in/yaml.v2 v2.2.8 + k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf sigs.k8s.io/yaml v1.1.0 ) -replace ( - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db -) +replace golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 diff --git a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go index 69ada8ecf9..de1a7d677f 100644 --- a/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go +++ b/vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go @@ -122,7 +122,27 @@ func (customNumberDecoder) Decode(ptr unsafe.Pointer, iter *jsoniter.Iterator) { } iter.ReportError("DecodeNumber", err.Error()) default: + // init depth, if needed + if iter.Attachment == nil { + iter.Attachment = int(1) + } + + // remember current depth + originalAttachment := iter.Attachment + + // increment depth before descending + if i, ok := iter.Attachment.(int); ok { + iter.Attachment = i + 1 + if i > 10000 { + iter.ReportError("parse", "exceeded max depth") + return + } + } + *(*interface{})(ptr) = iter.Read() + + // restore current depth + iter.Attachment = originalAttachment } } diff --git a/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go b/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go index 12c8a7b6cb..2df6295553 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go +++ b/vendor/k8s.io/apimachinery/pkg/util/intstr/intstr.go @@ -45,7 +45,7 @@ type IntOrString struct { } // Type represents the stored type of IntOrString. -type Type int +type Type int64 const ( Int Type = iota // The IntOrString holds an int. diff --git a/vendor/k8s.io/apimachinery/pkg/util/json/json.go b/vendor/k8s.io/apimachinery/pkg/util/json/json.go index 10c8cb837e..0e2e301754 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/json/json.go +++ b/vendor/k8s.io/apimachinery/pkg/util/json/json.go @@ -19,6 +19,7 @@ package json import ( "bytes" "encoding/json" + "fmt" "io" ) @@ -34,6 +35,9 @@ func Marshal(v interface{}) ([]byte, error) { return json.Marshal(v) } +// limit recursive depth to prevent stack overflow errors +const maxDepth = 10000 + // Unmarshal unmarshals the given data // If v is a *map[string]interface{}, numbers are converted to int64 or float64 func Unmarshal(data []byte, v interface{}) error { @@ -48,7 +52,7 @@ func Unmarshal(data []byte, v interface{}) error { return err } // If the decode succeeds, post-process the map to convert json.Number objects to int64 or float64 - return convertMapNumbers(*v) + return convertMapNumbers(*v, 0) case *[]interface{}: // Build a decoder from the given data @@ -60,7 +64,7 @@ func Unmarshal(data []byte, v interface{}) error { return err } // If the decode succeeds, post-process the map to convert json.Number objects to int64 or float64 - return convertSliceNumbers(*v) + return convertSliceNumbers(*v, 0) default: return json.Unmarshal(data, v) @@ -69,16 +73,20 @@ func Unmarshal(data []byte, v interface{}) error { // convertMapNumbers traverses the map, converting any json.Number values to int64 or float64. // values which are map[string]interface{} or []interface{} are recursively visited -func convertMapNumbers(m map[string]interface{}) error { +func convertMapNumbers(m map[string]interface{}, depth int) error { + if depth > maxDepth { + return fmt.Errorf("exceeded max depth of %d", maxDepth) + } + var err error for k, v := range m { switch v := v.(type) { case json.Number: m[k], err = convertNumber(v) case map[string]interface{}: - err = convertMapNumbers(v) + err = convertMapNumbers(v, depth+1) case []interface{}: - err = convertSliceNumbers(v) + err = convertSliceNumbers(v, depth+1) } if err != nil { return err @@ -89,16 +97,20 @@ func convertMapNumbers(m map[string]interface{}) error { // convertSliceNumbers traverses the slice, converting any json.Number values to int64 or float64. // values which are map[string]interface{} or []interface{} are recursively visited -func convertSliceNumbers(s []interface{}) error { +func convertSliceNumbers(s []interface{}, depth int) error { + if depth > maxDepth { + return fmt.Errorf("exceeded max depth of %d", maxDepth) + } + var err error for i, v := range s { switch v := v.(type) { case json.Number: s[i], err = convertNumber(v) case map[string]interface{}: - err = convertMapNumbers(v) + err = convertMapNumbers(v, depth+1) case []interface{}: - err = convertSliceNumbers(v) + err = convertSliceNumbers(v, depth+1) } if err != nil { return err diff --git a/vendor/k8s.io/apimachinery/pkg/util/net/http.go b/vendor/k8s.io/apimachinery/pkg/util/net/http.go index f9540c63bb..bd79d6c4a0 100644 --- a/vendor/k8s.io/apimachinery/pkg/util/net/http.go +++ b/vendor/k8s.io/apimachinery/pkg/util/net/http.go @@ -55,6 +55,12 @@ func JoinPreservingTrailingSlash(elem ...string) string { return result } +// IsTimeout returns true if the given error is a network timeout error +func IsTimeout(err error) bool { + neterr, ok := err.(net.Error) + return ok && neterr != nil && neterr.Timeout() +} + // IsProbableEOF returns true if the given error resembles a connection termination // scenario that would justify assuming that the watch is empty. // These errors are what the Go http stack returns back to us which are general diff --git a/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go b/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go index 8af256eb12..4269a836a8 100644 --- a/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go +++ b/vendor/k8s.io/apimachinery/pkg/watch/streamwatcher.go @@ -113,7 +113,7 @@ func (sw *StreamWatcher) receive() { case io.ErrUnexpectedEOF: klog.V(1).Infof("Unexpected EOF during watch stream event decoding: %v", err) default: - if net.IsProbableEOF(err) { + if net.IsProbableEOF(err) || net.IsTimeout(err) { klog.V(5).Infof("Unable to decode an event from the watch stream: %v", err) } else { sw.result <- Event{ diff --git a/vendor/k8s.io/apiserver/go.mod b/vendor/k8s.io/apiserver/go.mod index 137e32ec40..3f9b6f9a05 100644 --- a/vendor/k8s.io/apiserver/go.mod +++ b/vendor/k8s.io/apiserver/go.mod @@ -6,15 +6,16 @@ go 1.12 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect - github.com/coreos/bbolt v1.3.1-coreos.6 // indirect - github.com/coreos/etcd v3.3.15+incompatible + github.com/coreos/bbolt v1.3.3 // indirect + github.com/coreos/etcd v3.3.17+incompatible github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 + github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/emicklei/go-restful v2.9.5+incompatible github.com/evanphx/json-patch v4.2.0+incompatible + github.com/go-openapi/jsonpointer v0.19.3 // indirect github.com/go-openapi/spec v0.19.2 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/google/go-cmp v0.3.0 @@ -28,48 +29,43 @@ require ( github.com/jonboulle/clockwork v0.1.0 // indirect github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d github.com/pborman/uuid v1.2.0 - github.com/pkg/errors v0.8.0 // indirect + github.com/pkg/errors v0.8.1 // indirect github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 // indirect github.com/prometheus/client_golang v0.9.2 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 github.com/sirupsen/logrus v1.4.2 // indirect github.com/soheilhy/cmux v0.1.3 // indirect - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.3.0 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 // indirect github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect + go.etcd.io/bbolt v1.3.3 // indirect go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 // indirect go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df // indirect go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 // indirect - golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 - golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc + golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect google.golang.org/grpc v1.23.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e - k8s.io/component-base v0.0.0-20191003000551-f573d376509c - k8s.io/klog v0.4.0 + k8s.io/api v0.16.9 + k8s.io/apimachinery v0.16.9 + k8s.io/client-go v0.16.9 + k8s.io/component-base v0.16.9 + k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/utils v0.0.0-20190801114015-581e00157fb1 - sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca + sigs.k8s.io/structured-merge-diff v1.0.2 sigs.k8s.io/yaml v1.1.0 ) replace ( - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/client-go => k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e - k8s.io/component-base => k8s.io/component-base v0.0.0-20191003000551-f573d376509c + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + k8s.io/api => k8s.io/api v0.16.9 + k8s.io/apimachinery => k8s.io/apimachinery v0.16.9 + k8s.io/client-go => k8s.io/client-go v0.16.9 + k8s.io/component-base => k8s.io/component-base v0.16.9 ) diff --git a/vendor/k8s.io/client-go/go.mod b/vendor/k8s.io/client-go/go.mod index a85ebfd6a7..b554052b3f 100644 --- a/vendor/k8s.io/client-go/go.mod +++ b/vendor/k8s.io/client-go/go.mod @@ -16,31 +16,25 @@ require ( github.com/google/gofuzz v1.0.0 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d github.com/gophercloud/gophercloud v0.1.0 - github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 + github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/imdario/mergo v0.3.5 github.com/peterbourgon/diskv v2.0.1+incompatible - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.3.0 - golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 - golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc + golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 - golang.org/x/time v0.0.0-20181108054448-85acf8d2951c + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 google.golang.org/appengine v1.5.0 // indirect - k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/klog v0.4.0 + k8s.io/api v0.16.9 + k8s.io/apimachinery v0.16.9 + k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/yaml v1.1.0 ) replace ( - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + k8s.io/api => k8s.io/api v0.16.9 + k8s.io/apimachinery => k8s.io/apimachinery v0.16.9 ) diff --git a/vendor/k8s.io/client-go/rest/request.go b/vendor/k8s.io/client-go/rest/request.go index 491f8bbd1e..556ca66eed 100644 --- a/vendor/k8s.io/client-go/rest/request.go +++ b/vendor/k8s.io/client-go/rest/request.go @@ -592,7 +592,7 @@ func (r *Request) WatchWithSpecificDecoders(wrapperDecoderFn func(io.ReadCloser) if err != nil { // The watch stream mechanism handles many common partial data errors, so closed // connections can be retried in many cases. - if net.IsProbableEOF(err) { + if net.IsProbableEOF(err) || net.IsTimeout(err) { return watch.NewEmptyWatch(), nil } return nil, err diff --git a/vendor/k8s.io/client-go/tools/cache/delta_fifo.go b/vendor/k8s.io/client-go/tools/cache/delta_fifo.go index db4519f2e5..b832b4bbec 100644 --- a/vendor/k8s.io/client-go/tools/cache/delta_fifo.go +++ b/vendor/k8s.io/client-go/tools/cache/delta_fifo.go @@ -295,13 +295,6 @@ func isDeletionDup(a, b *Delta) *Delta { return b } -// willObjectBeDeletedLocked returns true only if the last delta for the -// given object is Delete. Caller must lock first. -func (f *DeltaFIFO) willObjectBeDeletedLocked(id string) bool { - deltas := f.items[id] - return len(deltas) > 0 && deltas[len(deltas)-1].Type == Deleted -} - // queueActionLocked appends to the delta list for the object. // Caller must lock first. func (f *DeltaFIFO) queueActionLocked(actionType DeltaType, obj interface{}) error { @@ -310,13 +303,6 @@ func (f *DeltaFIFO) queueActionLocked(actionType DeltaType, obj interface{}) err return KeyError{obj, err} } - // If object is supposed to be deleted (last event is Deleted), - // then we should ignore Sync events, because it would result in - // recreation of this object. - if actionType == Sync && f.willObjectBeDeletedLocked(id) { - return nil - } - newDeltas := append(f.items[id], Delta{actionType, obj}) newDeltas = dedupDeltas(newDeltas) diff --git a/vendor/k8s.io/client-go/tools/cache/reflector.go b/vendor/k8s.io/client-go/tools/cache/reflector.go index 8abde7131a..cdc9b0148c 100644 --- a/vendor/k8s.io/client-go/tools/cache/reflector.go +++ b/vendor/k8s.io/client-go/tools/cache/reflector.go @@ -269,6 +269,8 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error { AllowWatchBookmarks: true, } + // start the clock before sending the request, since some proxies won't flush headers until after the first watch event is sent + start := r.clock.Now() w, err := r.listerWatcher.Watch(options) if err != nil { switch err { @@ -290,7 +292,7 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error { return nil } - if err := r.watchHandler(w, &resourceVersion, resyncerrc, stopCh); err != nil { + if err := r.watchHandler(start, w, &resourceVersion, resyncerrc, stopCh); err != nil { if err != errorStopRequested { switch { case apierrs.IsResourceExpired(err): @@ -314,8 +316,7 @@ func (r *Reflector) syncWith(items []runtime.Object, resourceVersion string) err } // watchHandler watches w and keeps *resourceVersion up to date. -func (r *Reflector) watchHandler(w watch.Interface, resourceVersion *string, errc chan error, stopCh <-chan struct{}) error { - start := r.clock.Now() +func (r *Reflector) watchHandler(start time.Time, w watch.Interface, resourceVersion *string, errc chan error, stopCh <-chan struct{}) error { eventCount := 0 // Stopping the watcher should be idempotent and if we return from this function there's no way diff --git a/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go b/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go index 33e6239a69..e72325147b 100644 --- a/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go +++ b/vendor/k8s.io/client-go/tools/cache/thread_safe_store.go @@ -292,6 +292,13 @@ func (c *threadSafeMap) deleteFromIndices(obj interface{}, key string) { set := index[indexValue] if set != nil { set.Delete(key) + + // If we don't delete the set when zero, indices with high cardinality + // short lived resources can cause memory to increase over time from + // unused empty sets. See `kubernetes/kubernetes/issues/84959`. + if len(set) == 0 { + delete(index, indexValue) + } } } } diff --git a/vendor/k8s.io/client-go/util/connrotation/connrotation.go b/vendor/k8s.io/client-go/util/connrotation/connrotation.go index 235a9e0198..f98faee47d 100644 --- a/vendor/k8s.io/client-go/util/connrotation/connrotation.go +++ b/vendor/k8s.io/client-go/util/connrotation/connrotation.go @@ -77,11 +77,6 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net. closable := &closableConn{Conn: conn} - // Start tracking the connection - d.mu.Lock() - d.conns[closable] = struct{}{} - d.mu.Unlock() - // When the connection is closed, remove it from the map. This will // be no-op if the connection isn't in the map, e.g. if CloseAll() // is called. @@ -91,6 +86,11 @@ func (d *Dialer) DialContext(ctx context.Context, network, address string) (net. d.mu.Unlock() } + // Start tracking the connection + d.mu.Lock() + d.conns[closable] = struct{}{} + d.mu.Unlock() + return closable, nil } diff --git a/vendor/k8s.io/component-base/go.mod b/vendor/k8s.io/component-base/go.mod index ad659248c9..30c206ec31 100644 --- a/vendor/k8s.io/component-base/go.mod +++ b/vendor/k8s.io/component-base/go.mod @@ -10,23 +10,17 @@ require ( github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.3.0 - k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e - k8s.io/klog v0.4.0 + k8s.io/apimachinery v0.16.9 + k8s.io/client-go v0.16.9 + k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 ) replace ( - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 - golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20191003000013-35e20aa79eb8 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 - k8s.io/client-go => k8s.io/client-go v0.0.0-20191003000419-f68efa97b39e + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + k8s.io/api => k8s.io/api v0.16.9 + k8s.io/apimachinery => k8s.io/apimachinery v0.16.9 + k8s.io/client-go => k8s.io/client-go v0.16.9 ) diff --git a/vendor/k8s.io/klog/klog.go b/vendor/k8s.io/klog/klog.go index 2520ebdaa7..2712ce0afc 100644 --- a/vendor/k8s.io/klog/klog.go +++ b/vendor/k8s.io/klog/klog.go @@ -142,7 +142,7 @@ func (s *severity) Set(value string) error { if v, ok := severityByName(value); ok { threshold = v } else { - v, err := strconv.Atoi(value) + v, err := strconv.ParseInt(value, 10, 32) if err != nil { return err } @@ -226,7 +226,7 @@ func (l *Level) Get() interface{} { // Set is part of the flag.Value interface. func (l *Level) Set(value string) error { - v, err := strconv.Atoi(value) + v, err := strconv.ParseInt(value, 10, 32) if err != nil { return err } @@ -294,7 +294,7 @@ func (m *moduleSpec) Set(value string) error { return errVmoduleSyntax } pattern := patLev[0] - v, err := strconv.Atoi(patLev[1]) + v, err := strconv.ParseInt(patLev[1], 10, 32) if err != nil { return errors.New("syntax error: expect comma-separated list of filename=N") } @@ -396,31 +396,23 @@ type flushSyncWriter interface { io.Writer } +// init sets up the defaults and runs flushDaemon. func init() { - // Default stderrThreshold is ERROR. - logging.stderrThreshold = errorLog - + logging.stderrThreshold = errorLog // Default stderrThreshold is ERROR. logging.setVState(0, nil, false) + logging.logDir = "" + logging.logFile = "" + logging.logFileMaxSizeMB = 1800 + logging.toStderr = true + logging.alsoToStderr = false + logging.skipHeaders = false + logging.addDirHeader = false + logging.skipLogHeaders = false go logging.flushDaemon() } -var initDefaultsOnce sync.Once - // InitFlags is for explicitly initializing the flags. func InitFlags(flagset *flag.FlagSet) { - - // Initialize defaults. - initDefaultsOnce.Do(func() { - logging.logDir = "" - logging.logFile = "" - logging.logFileMaxSizeMB = 1800 - logging.toStderr = true - logging.alsoToStderr = false - logging.skipHeaders = false - logging.addDirHeader = false - logging.skipLogHeaders = false - }) - if flagset == nil { flagset = flag.CommandLine } diff --git a/vendor/k8s.io/kubernetes/go.mod b/vendor/k8s.io/kubernetes/go.mod index 743bc8f146..376708b87d 100644 --- a/vendor/k8s.io/kubernetes/go.mod +++ b/vendor/k8s.io/kubernetes/go.mod @@ -15,14 +15,14 @@ require ( github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534 github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab github.com/Microsoft/go-winio v0.4.11 - github.com/Microsoft/hcsshim v0.8.6 + github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d github.com/PuerkitoBio/purell v1.1.1 github.com/Rican7/retry v0.1.0 // indirect github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 // indirect github.com/aws/aws-sdk-go v1.16.26 - github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e - github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e + github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798 + github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89 github.com/blang/semver v3.5.0+incompatible github.com/boltdb/bolt v1.3.1 // indirect github.com/caddyserver/caddy v1.0.3 @@ -38,8 +38,8 @@ require ( github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 // indirect github.com/containernetworking/cni v0.7.1 github.com/coredns/corefile-migration v1.0.2 - github.com/coreos/etcd v3.3.15+incompatible - github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 + github.com/coreos/etcd v3.3.17+incompatible + github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea github.com/coreos/rkt v1.30.0 // indirect github.com/cpuguy83/go-md2man v1.0.10 @@ -74,17 +74,14 @@ require ( github.com/gorilla/context v1.1.1 // indirect github.com/gorilla/mux v1.7.0 // indirect github.com/hashicorp/golang-lru v0.5.1 - github.com/heketi/heketi v9.0.0+incompatible - github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect + github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect - github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 // indirect github.com/json-iterator/go v1.1.7 github.com/karrick/godirwalk v1.7.5 // indirect github.com/libopenstorage/openstorage v1.0.0 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/lithammer/dedent v1.1.0 github.com/lpabon/godbc v0.1.1 // indirect - github.com/magiconair/properties v1.8.1 // indirect github.com/mattn/go-shellwords v1.0.5 // indirect github.com/mesos/mesos-go v0.0.9 // indirect github.com/miekg/dns v1.1.4 @@ -103,7 +100,7 @@ require ( github.com/opencontainers/runtime-spec v1.0.0 // indirect github.com/opencontainers/selinux v1.2.2 github.com/pborman/uuid v1.2.0 - github.com/pkg/errors v0.8.0 + github.com/pkg/errors v0.8.1 github.com/pmezard/go-difflib v1.0.0 github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20 // indirect github.com/prometheus/client_golang v0.9.2 @@ -116,7 +113,7 @@ require ( github.com/spf13/afero v1.2.2 github.com/spf13/cobra v0.0.5 github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.3.2 github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc github.com/stretchr/testify v1.3.0 @@ -127,19 +124,19 @@ require ( github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 // indirect github.com/vmware/govmomi v0.20.1 github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect - golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 + golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 golang.org/x/lint v0.0.0-20190409202823-959b441ac422 - golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc + golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 - golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f - golang.org/x/time v0.0.0-20181108054448-85acf8d2951c - golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac + golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 + golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 google.golang.org/api v0.6.1-0.20190607001116-5213b8090861 google.golang.org/grpc v1.23.0 gopkg.in/gcfg.v1 v1.2.0 gopkg.in/square/go-jose.v2 v2.2.2 - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible gotest.tools/gotestsum v0.3.5 honnef.co/go/tools v0.0.1-2019.2.2 @@ -157,7 +154,7 @@ require ( k8s.io/csi-translation-lib v0.0.0 k8s.io/gengo v0.0.0-20190822140433-26a664648505 k8s.io/heapster v1.2.0-beta.1 - k8s.io/klog v0.4.0 + k8s.io/klog v1.0.0 k8s.io/kube-aggregator v0.0.0 k8s.io/kube-controller-manager v0.0.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf @@ -167,7 +164,7 @@ require ( k8s.io/kubelet v0.0.0 k8s.io/legacy-cloud-providers v0.0.0 k8s.io/metrics v0.0.0 - k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 + k8s.io/repo-infra v0.0.1-alpha.1 k8s.io/sample-apiserver v0.0.0 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/kustomize v2.0.3+incompatible @@ -194,22 +191,27 @@ replace ( github.com/JeffAshton/win_pdh => github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab github.com/MakeNowJust/heredoc => github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.4.11 - github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.6 + github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 + github.com/OpenPeeDeeP/depguard => github.com/OpenPeeDeeP/depguard v1.0.1 github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.1 github.com/PuerkitoBio/urlesc => github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 github.com/Rican7/retry => github.com/Rican7/retry v0.1.0 + github.com/StackExchange/wmi => github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 + github.com/anmitsu/go-shlex => github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 github.com/armon/circbuf => github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e github.com/armon/consul-api => github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a github.com/auth0/go-jwt-middleware => github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7 github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.16.26 - github.com/bazelbuild/bazel-gazelle => github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e - github.com/bazelbuild/buildtools => github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e + github.com/bazelbuild/bazel-gazelle => github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798 + github.com/bazelbuild/buildtools => github.com/bazelbuild/buildtools v0.0.0-20190917191645-69366ca98f89 + github.com/bazelbuild/rules_go => github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab github.com/beorn7/perks => github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 github.com/bifurcation/mint => github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115 github.com/blang/semver => github.com/blang/semver v3.5.0+incompatible github.com/boltdb/bolt => github.com/boltdb/bolt v1.3.1 + github.com/bradfitz/go-smtpd => github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625 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/cespare/prettybench => github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c @@ -226,12 +228,12 @@ replace ( github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20 github.com/containernetworking/cni => github.com/containernetworking/cni v0.7.1 github.com/coredns/corefile-migration => github.com/coredns/corefile-migration v1.0.2 - github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.1-coreos.6 - github.com/coreos/etcd => github.com/coreos/etcd v3.3.15+incompatible + github.com/coreos/bbolt => github.com/coreos/bbolt v1.3.3 + github.com/coreos/etcd => github.com/coreos/etcd v3.3.17+incompatible github.com/coreos/go-etcd => github.com/coreos/go-etcd v2.0.0+incompatible github.com/coreos/go-oidc => github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-semver => github.com/coreos/go-semver v0.3.0 - github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 + github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d github.com/coreos/pkg => github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea github.com/coreos/rkt => github.com/coreos/rkt v1.30.0 github.com/cpuguy83/go-md2man => github.com/cpuguy83/go-md2man v1.0.10 @@ -257,27 +259,58 @@ replace ( github.com/flynn/go-shlex => github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.7 github.com/ghodss/yaml => github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 + github.com/gliderlabs/ssh => github.com/gliderlabs/ssh v0.1.1 github.com/globalsign/mgo => github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 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-critic/go-critic => github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540 + github.com/go-lintpack/lintpack => github.com/go-lintpack/lintpack v0.5.2 github.com/go-logr/logr => github.com/go-logr/logr v0.1.0 + github.com/go-ole/go-ole => github.com/go-ole/go-ole v1.2.1 github.com/go-openapi/analysis => github.com/go-openapi/analysis v0.19.2 github.com/go-openapi/errors => github.com/go-openapi/errors v0.19.2 - github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.2 + github.com/go-openapi/jsonpointer => github.com/go-openapi/jsonpointer v0.19.3 github.com/go-openapi/jsonreference => github.com/go-openapi/jsonreference v0.19.2 github.com/go-openapi/loads => github.com/go-openapi/loads v0.19.2 github.com/go-openapi/runtime => github.com/go-openapi/runtime v0.19.0 github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.2 github.com/go-openapi/strfmt => github.com/go-openapi/strfmt v0.19.0 - github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.2 + github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.5 github.com/go-openapi/validate => github.com/go-openapi/validate v0.19.2 github.com/go-ozzo/ozzo-validation => github.com/go-ozzo/ozzo-validation v3.5.0+incompatible + github.com/go-toolsmith/astcast => github.com/go-toolsmith/astcast v1.0.0 + github.com/go-toolsmith/astcopy => github.com/go-toolsmith/astcopy v1.0.0 + github.com/go-toolsmith/astequal => github.com/go-toolsmith/astequal v1.0.0 + github.com/go-toolsmith/astfmt => github.com/go-toolsmith/astfmt v1.0.0 + github.com/go-toolsmith/astinfo => github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21 + github.com/go-toolsmith/astp => github.com/go-toolsmith/astp v1.0.0 + github.com/go-toolsmith/pkgload => github.com/go-toolsmith/pkgload v1.0.0 + github.com/go-toolsmith/strparse => github.com/go-toolsmith/strparse v1.0.0 + github.com/go-toolsmith/typep => github.com/go-toolsmith/typep v1.0.0 + github.com/gobwas/glob => github.com/gobwas/glob v0.2.3 github.com/godbus/dbus => github.com/godbus/dbus v4.1.0+incompatible github.com/gogo/protobuf => github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/golang/glog => github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 github.com/golang/mock => github.com/golang/mock v1.2.0 github.com/golang/protobuf => github.com/golang/protobuf v1.3.1 + github.com/golangci/check => github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 + github.com/golangci/dupl => github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a + github.com/golangci/errcheck => github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 + github.com/golangci/go-misc => github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 + github.com/golangci/go-tools => github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c + github.com/golangci/goconst => github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 + github.com/golangci/gocyclo => github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee + github.com/golangci/gofmt => github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98 + github.com/golangci/golangci-lint => github.com/golangci/golangci-lint v1.18.0 + github.com/golangci/gosec => github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547 + github.com/golangci/ineffassign => github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc + github.com/golangci/lint-1 => github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217 + github.com/golangci/maligned => github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca + github.com/golangci/misspell => github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770 + github.com/golangci/prealloc => github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 + github.com/golangci/revgrep => github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0 + github.com/golangci/unconvert => github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 github.com/golangplus/bytes => github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 github.com/golangplus/fmt => github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 github.com/golangplus/testing => github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e @@ -285,6 +318,8 @@ replace ( github.com/google/cadvisor => github.com/google/cadvisor v0.34.0 github.com/google/certificate-transparency-go => github.com/google/certificate-transparency-go v1.0.21 github.com/google/go-cmp => github.com/google/go-cmp v0.3.0 + github.com/google/go-github => github.com/google/go-github v17.0.0+incompatible + github.com/google/go-querystring => github.com/google/go-querystring v1.0.0 github.com/google/gofuzz => github.com/google/gofuzz v1.0.0 github.com/google/martian => github.com/google/martian v2.1.0+incompatible github.com/google/pprof => github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57 @@ -297,20 +332,20 @@ replace ( github.com/gorilla/context => github.com/gorilla/context v1.1.1 github.com/gorilla/mux => github.com/gorilla/mux v1.7.0 github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.0 - github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 + github.com/gostaticanalysis/analysisutil => github.com/gostaticanalysis/analysisutil v0.0.3 + github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 github.com/grpc-ecosystem/go-grpc-prometheus => github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.3.0 github.com/hashicorp/go-syslog => github.com/hashicorp/go-syslog v1.0.0 github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.1 github.com/hashicorp/hcl => github.com/hashicorp/hcl v1.0.0 - github.com/heketi/heketi => github.com/heketi/heketi v9.0.0+incompatible - github.com/heketi/rest => github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 + github.com/heketi/heketi => github.com/heketi/heketi v9.0.1-0.20190917153846-c2e2a4ab7ab9+incompatible github.com/heketi/tests => github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 - github.com/heketi/utils => github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 github.com/hpcloud/tail => github.com/hpcloud/tail v1.0.0 github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.0.0 + github.com/jellevandenhooff/dkim => github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1 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.0.0-20180206201540-c2b33e8439af github.com/jonboulle/clockwork => github.com/jonboulle/clockwork v0.1.0 @@ -320,6 +355,7 @@ replace ( github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.7.5 github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.2.0 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 + github.com/klauspost/compress => github.com/klauspost/compress v1.4.1 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.1 github.com/kr/pretty => github.com/kr/pretty v0.1.0 @@ -329,17 +365,19 @@ replace ( 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/lithammer/dedent => github.com/lithammer/dedent v1.1.0 + github.com/logrusorgru/aurora => github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e 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/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 + github.com/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e 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-isatty => github.com/mattn/go-isatty v0.0.3 + github.com/mattn/go-isatty => github.com/mattn/go-isatty v0.0.9 github.com/mattn/go-shellwords => github.com/mattn/go-shellwords v1.0.5 + github.com/mattn/goveralls => github.com/mattn/goveralls v0.0.2 github.com/matttproud/golang_protobuf_extensions => github.com/matttproud/golang_protobuf_extensions v1.0.1 github.com/mesos/mesos-go => github.com/mesos/mesos-go v0.0.9 github.com/mholt/certmagic => github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2 @@ -347,18 +385,21 @@ replace ( github.com/mindprince/gonvml => github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2 github.com/mistifyio/go-zfs => github.com/mistifyio/go-zfs v2.1.1+incompatible github.com/mitchellh/go-homedir => github.com/mitchellh/go-homedir v1.1.0 + github.com/mitchellh/go-ps => github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936 github.com/mitchellh/go-wordwrap => github.com/mitchellh/go-wordwrap v1.0.0 github.com/mitchellh/mapstructure => github.com/mitchellh/mapstructure v1.1.2 github.com/modern-go/concurrent => github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd github.com/modern-go/reflect2 => github.com/modern-go/reflect2 v1.0.1 github.com/mohae/deepcopy => github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb github.com/morikuni/aec => github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c + github.com/mozilla/tls-observatory => github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40 github.com/mrunalp/fileutils => github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058 github.com/munnerz/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d github.com/mvdan/xurls => github.com/mvdan/xurls v1.1.0 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/nbutton23/zxcvbn-go => github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663 github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.8.0 github.com/onsi/gomega => github.com/onsi/gomega v1.5.0 github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.0-rc1 @@ -369,7 +410,7 @@ replace ( github.com/pborman/uuid => github.com/pborman/uuid v1.2.0 github.com/pelletier/go-toml => github.com/pelletier/go-toml v1.2.0 github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible - github.com/pkg/errors => github.com/pkg/errors v0.8.0 + github.com/pkg/errors => github.com/pkg/errors v0.8.1 github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021 github.com/pquerna/ffjson => github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20 @@ -377,55 +418,74 @@ replace ( github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 github.com/prometheus/common => github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a + github.com/quasilyte/go-consistent => github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c github.com/quobyte/api => github.com/quobyte/api v0.1.2 github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 github.com/robfig/cron => github.com/robfig/cron v1.1.0 github.com/rogpeppe/go-internal => github.com/rogpeppe/go-internal v1.3.0 github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c github.com/russross/blackfriday => github.com/russross/blackfriday v1.5.2 + github.com/ryanuber/go-glob => github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0 github.com/seccomp/libseccomp-golang => github.com/seccomp/libseccomp-golang v0.9.1 + github.com/shirou/gopsutil => github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7 + github.com/shirou/w32 => github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 + github.com/shurcooL/go => github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e + github.com/shurcooL/go-goon => github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041 github.com/sirupsen/logrus => github.com/sirupsen/logrus v1.4.2 github.com/smartystreets/assertions => github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d github.com/smartystreets/goconvey => github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a github.com/soheilhy/cmux => github.com/soheilhy/cmux v0.1.3 + github.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.1 github.com/spf13/afero => github.com/spf13/afero v1.2.2 github.com/spf13/cast => github.com/spf13/cast v1.3.0 github.com/spf13/cobra => github.com/spf13/cobra v0.0.5 github.com/spf13/jwalterweatherman => github.com/spf13/jwalterweatherman v1.1.0 - github.com/spf13/pflag => github.com/spf13/pflag v1.0.3 + github.com/spf13/pflag => github.com/spf13/pflag v1.0.5 github.com/spf13/viper => github.com/spf13/viper v1.3.2 github.com/storageos/go-api => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc github.com/stretchr/objx => github.com/stretchr/objx v0.2.0 github.com/stretchr/testify => github.com/stretchr/testify v1.3.0 github.com/syndtr/gocapability => github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4 + github.com/tarm/serial => github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 github.com/thecodeteam/goscaleio => github.com/thecodeteam/goscaleio v0.1.0 + github.com/timakin/bodyclose => github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec github.com/tmc/grpc-websocket-proxy => github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 github.com/ugorji/go/codec => github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 + github.com/ultraware/funlen => github.com/ultraware/funlen v0.0.2 github.com/urfave/negroni => github.com/urfave/negroni v1.0.0 + github.com/valyala/bytebufferpool => github.com/valyala/bytebufferpool v1.0.0 + github.com/valyala/fasthttp => github.com/valyala/fasthttp v1.2.0 + github.com/valyala/quicktemplate => github.com/valyala/quicktemplate v1.1.1 + github.com/valyala/tcplisten => github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a github.com/vishvananda/netlink => github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 github.com/vmware/govmomi => github.com/vmware/govmomi v0.20.1 github.com/xiang90/probing => github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 github.com/xlab/handysort => github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 + go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.3 go.opencensus.io => go.opencensus.io v0.21.0 go.uber.org/atomic => go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569 go.uber.org/multierr => go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df go.uber.org/zap => go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15 - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 + go4.org => go4.org v0.0.0-20180809161055-417644f6feb5 + golang.org/x/build => golang.org/x/build v0.0.0-20190927031335-2835ba2e683f + golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 golang.org/x/exp => golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495 golang.org/x/image => golang.org/x/image v0.0.0-20190227222117-0694c2d4d067 - golang.org/x/lint => golang.org/x/lint v0.0.0-20181217174547-8f45f776aaf1 + golang.org/x/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422 golang.org/x/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6 golang.org/x/mod => golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e - golang.org/x/net => golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc - golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a - golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 - golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db - golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - golang.org/x/tools => golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac + golang.org/x/net => golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 + golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 + golang.org/x/perf => golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852 + golang.org/x/sync => golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a + golang.org/x/text => golang.org/x/text v0.3.2 + golang.org/x/time => golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 + golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 gonum.org/v1/gonum => gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e google.golang.org/api => google.golang.org/api v0.6.1-0.20190607001116-5213b8090861 @@ -438,15 +498,16 @@ replace ( gopkg.in/fsnotify.v1 => gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.0 gopkg.in/gemnasium/logrus-airbrake-hook.v2 => gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 - gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0 + gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1 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/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.1 - gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.8 gotest.tools => gotest.tools v2.2.0+incompatible gotest.tools/gotestsum => gotest.tools/gotestsum v0.3.5 + grpc.go4.org => grpc.go4.org v0.0.0-20170609214715-11d0a25b4919 honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.2 k8s.io/api => ./staging/src/k8s.io/api k8s.io/apiextensions-apiserver => ./staging/src/k8s.io/apiextensions-apiserver @@ -462,7 +523,7 @@ replace ( k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505 k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 - k8s.io/klog => k8s.io/klog v0.4.0 + k8s.io/klog => k8s.io/klog v1.0.0 k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf @@ -473,7 +534,7 @@ replace ( k8s.io/legacy-cloud-providers => ./staging/src/k8s.io/legacy-cloud-providers k8s.io/metrics => ./staging/src/k8s.io/metrics k8s.io/node-api => ./staging/src/k8s.io/node-api - k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 + k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1 k8s.io/sample-apiserver => ./staging/src/k8s.io/sample-apiserver k8s.io/sample-cli-plugin => ./staging/src/k8s.io/sample-cli-plugin k8s.io/sample-controller => ./staging/src/k8s.io/sample-controller @@ -483,8 +544,12 @@ replace ( modernc.org/mathutil => modernc.org/mathutil v1.0.0 modernc.org/strutil => modernc.org/strutil v1.0.0 modernc.org/xc => modernc.org/xc v1.0.0 + mvdan.cc/interfacer => mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed + mvdan.cc/lint => mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b + mvdan.cc/unparam => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34 sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible - sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca + sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.2 sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0 + sourcegraph.com/sqs/pbtypes => sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc )