Merge pull request #81394 from cblecker/golang-deps

Update golang/x/net dependency

Kubernetes-commit: 1f6cb3cb9def97320a5412dcbea1661edd95c29e
This commit is contained in:
Kubernetes Publisher 2019-08-14 00:40:52 -07:00
parent 7450545274
commit 9e08c77b09
3 changed files with 9 additions and 8 deletions

6
Godeps/Godeps.json generated
View File

@ -204,7 +204,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "65e2d4e15006"
"Rev": "cdfb69ac37fc"
},
{
"ImportPath": "golang.org/x/sync",
@ -244,11 +244,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "cbbcc3bf2cd4"
"Rev": "533d101be9a6"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "3e62d79579c8"
"Rev": "2c85c628702c"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20190814100815-533d101be9a6
k8s.io/component-base v0.0.0-20190814102701-2c85c628702c
)
replace (
@ -14,7 +14,6 @@ replace (
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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => ../apimachinery
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190814100815-533d101be9a6
k8s.io/component-base => k8s.io/component-base v0.0.0-20190814102701-2c85c628702c
)

2
go.sum
View File

@ -96,6 +96,8 @@ 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.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190814100815-533d101be9a6/go.mod h1:MAmngDqHkEif0Kxdsl08wStgNTmHhat4DuIUyb4LbCc=
k8s.io/component-base v0.0.0-20190814102701-2c85c628702c/go.mod h1:wulb8NqH7Cn2VLON2+Glym5Y80r5QZOzIb85KGukSmM=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=