Merge pull request #81522 from cblecker/1.15-x/net

Update golang/x/net dependency on release-1.15

Kubernetes-commit: 2d3c76f9091b6bec110a5e63777c332469e0cba2
This commit is contained in:
Kubernetes Publisher 2019-08-16 16:14:10 -07:00
parent bc95c9709b
commit 98e01ef3bf
3 changed files with 16 additions and 13 deletions

8
Godeps/Godeps.json generated
View File

@ -156,7 +156,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "65e2d4e15006"
"Rev": "cdfb69ac37fc"
},
{
"ImportPath": "golang.org/x/oauth2",
@ -216,15 +216,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "7525909cc6da"
"Rev": "e14a4b1f5f84"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1799e75a0719"
"Rev": "f2f3a405f61d"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e4cdb82809fc"
"Rev": "637fc595d17a"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
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/api v0.0.0-20190817021128-e14a4b1f5f84
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go v0.0.0-20190817021527-637fc595d17a
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/klog v0.3.1
)
@ -16,9 +16,8 @@ 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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20190817021128-e14a4b1f5f84
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go => k8s.io/client-go v0.0.0-20190817021527-637fc595d17a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
)

4
go.sum
View File

@ -94,6 +94,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
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-20190817021128-e14a4b1f5f84/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo=
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw=
k8s.io/client-go v0.0.0-20190817021527-637fc595d17a/go.mod h1:+Ns9AwGRd5TqhqhXZkLSCzO/bpUSWwP93/TE0q2OsLQ=
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
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.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=