From 5e35b683652d720386e8bfcb41e1f79b043f1de0 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 15 Apr 2019 13:40:15 +0200 Subject: [PATCH] Update vendor Kubernetes-commit: 4d291aec7ebdcab77c91897a3082faf985a01066 --- go.mod | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++------- go.sum | 17 ++++------- 2 files changed, 88 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index 3e757f5b..1cc9f47f 100644 --- a/go.mod +++ b/go.mod @@ -5,22 +5,95 @@ module k8s.io/sample-controller go 1.12 require ( - k8s.io/api v0.0.0-20190415132514-c2f1300cac21 - k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356 - k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8 - k8s.io/code-generator v0.0.0-20190413052309-5c40078c1b12 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 ) replace ( + cloud.google.com/go => cloud.google.com/go v0.0.0-20160913182117-3b1ae45394a2 + github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.1.0+incompatible + github.com/BurntSushi/xgb => github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 + github.com/davecgh/go-spew => github.com/davecgh/go-spew v1.1.1 + github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda + github.com/docker/spdystream => github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 + github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e + github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550 + github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.4.7 github.com/gogo/protobuf => github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 + github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 + github.com/golang/protobuf => github.com/golang/protobuf v1.1.0 + github.com/google/btree => github.com/google/btree v0.0.0-20160524151835-7d79101e329e + github.com/google/gofuzz => github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf + github.com/google/uuid => github.com/google/uuid v1.0.0 + github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d + github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8 + github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 + github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.0 + github.com/hpcloud/tail => github.com/hpcloud/tail v1.0.0 + github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 + github.com/json-iterator/go => github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be + 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/mxk/go-flowrate => github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f github.com/onsi/ginkgo => github.com/onsi/ginkgo v0.0.0-20170318221715-67b9df7f55fe + github.com/onsi/gomega => github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3 + github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible + github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 + github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 + github.com/spf13/pflag => github.com/spf13/pflag v1.0.1 + github.com/stretchr/testify => github.com/stretchr/testify v1.2.2 + golang.org/x/crypto => golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 + 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/mobile => golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6 + golang.org/x/net => golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 + golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181 + 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-20190313210603-aa82965741a9 - k8s.io/api => k8s.io/api v0.0.0-20190415132514-c2f1300cac21 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356 - k8s.io/client-go => k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190413052309-5c40078c1b12 + 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/appengine => google.golang.org/appengine v1.5.0 + gopkg.in/check.v1 => gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 + gopkg.in/fsnotify.v1 => gopkg.in/fsnotify.v1 v1.4.7 + gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0 + gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 + gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.1 + k8s.io/api => ../api + k8s.io/apiextensions-apiserver => ../apiextensions-apiserver + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/cli-runtime => ../cli-runtime + k8s.io/client-go => ../client-go + k8s.io/cloud-provider => ../cloud-provider + k8s.io/cluster-bootstrap => ../cluster-bootstrap + k8s.io/code-generator => ../code-generator + k8s.io/component-base => ../component-base + k8s.io/cri-api => ../cri-api + k8s.io/csi-translation-lib => ../csi-translation-lib + k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af + k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 + k8s.io/kube-aggregator => ../kube-aggregator + k8s.io/kube-controller-manager => ../kube-controller-manager + k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 + k8s.io/kube-proxy => ../kube-proxy + k8s.io/kube-scheduler => ../kube-scheduler + k8s.io/kubelet => ../kubelet + k8s.io/metrics => ../metrics + k8s.io/node-api => ../node-api + k8s.io/sample-apiserver => ../sample-apiserver + k8s.io/sample-cli-plugin => ../sample-cli-plugin + k8s.io/sample-controller => ../sample-controller + k8s.io/utils => k8s.io/utils v0.0.0-20190221042446-c2654d5206da + modernc.org/cc => modernc.org/cc v1.0.0 + modernc.org/golex => modernc.org/golex v1.0.0 + 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 + sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0 ) - -replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190415133015-fd5d14dd6d20 diff --git a/go.sum b/go.sum index f13aa277..00da88d4 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCP github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc= +github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= @@ -49,30 +49,27 @@ github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 h1:a4tQYYYuK9QdeO/+kEvNYyuR21S+7ve5EANok6hABhI= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495 h1:I6A9Ag9FpEKOjcKrRNjQkPHawoXIhKyTGfvvjFAiiAk= golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80= golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181 h1:/4OaQ4bC66Oq9JDhUnxTjBGt8XBhDuwgMRXHgvfcCUY= golang.org/x/oauth2 v0.0.0-20170412232759-a6bd8cefa181/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190209173611-3b5209105503 h1:5SvYFrOM3W8Mexn9/oA44Ji7vhXAZQ9hiP+1Q/DMrWg= golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20161028155119-f51c12702a4d h1:TnM+PKb3ylGmZvyPXmo9m/wktg7Jn/a/fNmr33HSj8g= golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20190313210603-aa82965741a9 h1:7Pf/N3ln54fsGsAPsSwSfFhxXGKWHMIRUI/T5x1GP90= golang.org/x/tools v0.0.0-20190313210603-aa82965741a9/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -84,10 +81,6 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -k8s.io/api v0.0.0-20190415132514-c2f1300cac21/go.mod h1:5HMaKNcWJji8AGOBjOZxmFDwRutMItn4MrrXZcFANNo= -k8s.io/apimachinery v0.0.0-20190415132420-07d458fe0356/go.mod h1:jLjiXl596L+wVGdx8dRx6sSNnabzqnI2+nAJqqqyesQ= -k8s.io/client-go v0.0.0-20190415132652-0df29606e0e8/go.mod h1:adtBgFzDjiIPqoaFQ5an7OZCfFu+io4XajNOlr+FAxA= -k8s.io/code-generator v0.0.0-20190413052309-5c40078c1b12/go.mod h1:HURHo+BaZvrjm6DIST3jWY+eeitiILOLFd/uQL1jxWE= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=