Merge remote-tracking branch 'origin/master' into release-1.17. Deleting CHANGELOG-1.16.md

Kubernetes-commit: 57ce516fdc0eec9b7a8ff2e591f4550a3060ee09
This commit is contained in:
Kubernetes Publisher 2019-11-08 10:15:07 +00:00
parent 60c52f0115
commit f433da5d9f
3 changed files with 17 additions and 14 deletions

10
Godeps/Godeps.json generated
View File

@ -372,19 +372,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "43b1ad33cf6f"
"Rev": "5d8c3d1f60af"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "9c5262af35ca"
"Rev": "4ce4ee60b177"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "4fb1ca18cab3"
"Rev": "14c92e3dc9df"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "70ddc72eda71"
"Rev": "8b39d7f75b89"
},
{
"ImportPath": "k8s.io/gengo",
@ -396,7 +396,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "743ec37842bf"
"Rev": "30be4d16710a"
},
{
"ImportPath": "k8s.io/utils",

17
go.mod
View File

@ -5,19 +5,18 @@ 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-20191108101507-5d8c3d1f60af
k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df
k8s.io/code-generator v0.0.0-20191108105555-8b39d7f75b89
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a
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-20191108101507-5d8c3d1f60af
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177
k8s.io/client-go => k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191108105555-8b39d7f75b89
)

4
go.sum
View File

@ -213,6 +213,10 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/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-20191108101507-5d8c3d1f60af/go.mod h1:imUKtxJrdH7sLzxnW0ep/MClaxwk3jqcQByiz2y/424=
k8s.io/apimachinery v0.0.0-20191108101507-4ce4ee60b177/go.mod h1:nEP/6rwhzfljWYGVS6pfyES3ipZTR19vzMnSM+ur3ho=
k8s.io/client-go v0.0.0-20191108101507-14c92e3dc9df/go.mod h1:knaO7yT/V921wXXOrewm9oJL9XmH/gYVirmbn2DjiG4=
k8s.io/code-generator v0.0.0-20191108105555-8b39d7f75b89/go.mod h1:OJTI2RPXj6kq4bfFqT1JrTEC1S4toTWinGOm1O8jUuY=
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=