Merge pull request #88413 from liggitt/automated-cherry-pick-of-#88381-upstream-release-1.16

Automated cherry pick of #88381: update golang.org/x/crypto

Kubernetes-commit: b383807a14c53196d8e66d02853f982ca0da2ada
This commit is contained in:
Kubernetes Publisher 2020-02-27 18:04:51 -08:00
parent e3b2e6f01c
commit c37f031c4c
3 changed files with 14 additions and 11 deletions

4
Godeps/Godeps.json generated
View File

@ -272,7 +272,7 @@
},
{
"ImportPath": "golang.org/x/crypto",
"Rev": "60c769a6c586"
"Rev": "bac4c82f6975"
},
{
"ImportPath": "golang.org/x/exp",
@ -380,7 +380,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "537443fada71"
"Rev": "e3bfc0127563"
},
{
"ImportPath": "k8s.io/code-generator",

17
go.mod
View File

@ -5,18 +5,17 @@ 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-20200131112707-d64dbec685a4
k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
k8s.io/client-go v0.0.0-20200228043759-e3bfc0127563
k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0
k8s.io/klog v1.0.0
)
replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
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-20200131112707-d64dbec685a4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200228043759-e3bfc0127563
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0
)

4
go.sum
View File

@ -222,6 +222,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc=
k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
k8s.io/client-go v0.0.0-20200228043759-e3bfc0127563/go.mod h1:QUB1TlB7e3UwNo8oQLewCmsh694XhIK6H+Wlliun0Xc=
k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=