Merge pull request #76215 from liggitt/update-vendored-dependencies

Update vendored dependencies

Kubernetes-commit: 1cca3f9d45a6aae62145b8630e36722bd316ef88
This commit is contained in:
Kubernetes Publisher 2019-04-08 23:51:03 -07:00
parent 26c9182046
commit 63563cf7ef
3 changed files with 19 additions and 32 deletions

20
Godeps/Godeps.json generated
View File

@ -8,7 +8,7 @@
"Deps": [ "Deps": [
{ {
"ImportPath": "github.com/davecgh/go-spew", "ImportPath": "github.com/davecgh/go-spew",
"Rev": "782f4967f2dc" "Rev": "v1.1.1"
}, },
{ {
"ImportPath": "github.com/docker/spdystream", "ImportPath": "github.com/docker/spdystream",
@ -44,7 +44,7 @@
}, },
{ {
"ImportPath": "github.com/google/uuid", "ImportPath": "github.com/google/uuid",
"Rev": "8c31c18f31ed" "Rev": "v1.0.0"
}, },
{ {
"ImportPath": "github.com/googleapis/gnostic", "ImportPath": "github.com/googleapis/gnostic",
@ -84,7 +84,7 @@
}, },
{ {
"ImportPath": "github.com/pmezard/go-difflib", "ImportPath": "github.com/pmezard/go-difflib",
"Rev": "5d4384ee4fb2" "Rev": "v1.0.0"
}, },
{ {
"ImportPath": "github.com/spf13/pflag", "ImportPath": "github.com/spf13/pflag",
@ -92,7 +92,7 @@
}, },
{ {
"ImportPath": "github.com/stretchr/testify", "ImportPath": "github.com/stretchr/testify",
"Rev": "c679ae2cc0cb" "Rev": "v1.2.2"
}, },
{ {
"ImportPath": "golang.org/x/net", "ImportPath": "golang.org/x/net",
@ -104,11 +104,15 @@
}, },
{ {
"ImportPath": "golang.org/x/sys", "ImportPath": "golang.org/x/sys",
"Rev": "95c657629925" "Rev": "3b5209105503"
}, },
{ {
"ImportPath": "golang.org/x/text", "ImportPath": "golang.org/x/text",
"Rev": "b19bf474d317" "Rev": "e6919f6577db"
},
{
"ImportPath": "golang.org/x/tools",
"Rev": "aa82965741a9"
}, },
{ {
"ImportPath": "gopkg.in/check.v1", "ImportPath": "gopkg.in/check.v1",
@ -132,11 +136,11 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "3115ef20f323" "Rev": "760d1845f48b"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "383e7fa4e530" "Rev": "e34633071963"
}, },
{ {
"ImportPath": "k8s.io/klog", "ImportPath": "k8s.io/klog",

29
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12 go 1.12
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20190409093041-e34633071963
) )
replace ( replace (
@ -42,30 +42,11 @@ replace (
gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0 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/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.1 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.1
k8s.io/api => ../api k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b
k8s.io/apiextensions-apiserver => ../apiextensions-apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190409093229-67d6e044d2ef
k8s.io/apimachinery => ../apimachinery k8s.io/component-base => k8s.io/component-base v0.0.0-20190409093041-e34633071963
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/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 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-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 k8s.io/utils => k8s.io/utils v0.0.0-20190221042446-c2654d5206da
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0 sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
) )

2
go.sum
View File

@ -44,6 +44,8 @@ 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/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 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod h1:FW86P8YXVLsbuplGMZeb20J3jYHscrDqw4jELaFJvRU=
k8s.io/component-base v0.0.0-20190409093041-e34633071963/go.mod h1:2AUf0gALRFIf31Zup6Torh8msIgiDioNziBnI8wpuk4=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=