Merge pull request #85175 from liggitt/golang-org-comments

Add comments to explain golang.org replace directives

Kubernetes-commit: 24334444b46371e26594e1f6e594195a761b53d3
This commit is contained in:
Kubernetes Publisher 2019-11-14 13:31:27 -08:00
commit 387bf36109
3 changed files with 18 additions and 18 deletions

8
Godeps/Godeps.json generated
View File

@ -576,19 +576,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "d0c43be24bd2"
"Rev": "6cd33094d465"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "3db02fd2eea7"
"Rev": "67a48e0c9266"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "19241984841b"
"Rev": "6f03b71b98e6"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "eea1fb8fb92a"
"Rev": "90a8a7f61617"
},
{
"ImportPath": "k8s.io/gengo",

20
go.mod
View File

@ -43,10 +43,10 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.4
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191114100038-d0c43be24bd2
k8s.io/apimachinery v0.0.0-20191114095528-3db02fd2eea7
k8s.io/client-go v0.0.0-20191114100705-19241984841b
k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a
k8s.io/api v0.0.0-20191114215726-6cd33094d465
k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266
k8s.io/client-go v0.0.0-20191114220110-6f03b71b98e6
k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d
@ -55,10 +55,10 @@ require (
)
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 => k8s.io/api v0.0.0-20191114100038-d0c43be24bd2
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191114095528-3db02fd2eea7
k8s.io/client-go => k8s.io/client-go v0.0.0-20191114100705-19241984841b
k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20191114215726-6cd33094d465
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266
k8s.io/client-go => k8s.io/client-go v0.0.0-20191114220110-6f03b71b98e6
k8s.io/component-base => k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617
)

8
go.sum
View File

@ -346,10 +346,10 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
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=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191114100038-d0c43be24bd2/go.mod h1:IM5ceavki8HjRhUlaRYP3oGw0J/hbXKiKiSqS5AR728=
k8s.io/apimachinery v0.0.0-20191114095528-3db02fd2eea7/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s=
k8s.io/client-go v0.0.0-20191114100705-19241984841b/go.mod h1:KMu6hP5Br0jw+porL3eGkOag/Zwa7iZPHzsaHgzZmXo=
k8s.io/component-base v0.0.0-20191114102140-eea1fb8fb92a/go.mod h1:KnwagkUxLG5qvuakxgWdrEN7cu5xkT0IdWI1ttPr9D0=
k8s.io/api v0.0.0-20191114215726-6cd33094d465/go.mod h1:TnwOuwwOmtUq5BythlhmbJs+lwQGEsSJ6N4S4ODl2m8=
k8s.io/apimachinery v0.0.0-20191114215425-67a48e0c9266/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA=
k8s.io/client-go v0.0.0-20191114220110-6f03b71b98e6/go.mod h1:Hykx8A+UlxwDre3qJcqZPgCAZGjl9vNp6yc7SmfMQ1k=
k8s.io/component-base v0.0.0-20191114221108-90a8a7f61617/go.mod h1:mGvZw6rGJi0lRK5Qn3KrpKMsz2SmgmRw9oQoA3xkE7U=
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=