Merge pull request #84503 from wojtek-t/remove_conversion_funcs_2

Cleanup clientcmd api conversions

Kubernetes-commit: 07023f2a7f050fb6df5a552289bf3e7165eba94c
This commit is contained in:
Kubernetes Publisher 2019-11-01 09:01:26 -07:00
parent 6ec083fb70
commit 940f075619
3 changed files with 8 additions and 8 deletions

4
Godeps/Godeps.json generated
View File

@ -344,11 +344,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "5524a3672fbb"
"Rev": "b19d8caf39be"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "af6325b3a843"
"Rev": "bb31b70367b7"
},
{
"ImportPath": "k8s.io/gengo",

8
go.mod
View File

@ -28,8 +28,8 @@ require (
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
google.golang.org/appengine v1.5.0 // indirect
k8s.io/api v0.0.0-20191025225708-5524a3672fbb
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
k8s.io/api v0.0.0-20191031065753-b19d8caf39be
k8s.io/apimachinery v0.0.0-20191030190112-bb31b70367b7
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4
sigs.k8s.io/yaml v1.1.0
@ -44,6 +44,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/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => k8s.io/api v0.0.0-20191025225708-5524a3672fbb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
k8s.io/api => k8s.io/api v0.0.0-20191031065753-b19d8caf39be
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191030190112-bb31b70367b7
)

4
go.sum
View File

@ -174,8 +174,8 @@ 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-20191025225708-5524a3672fbb/go.mod h1:NMIXwlJTrA+pXie6lv562GUPkluJ4oRGzQfqWBLaceY=
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k=
k8s.io/api v0.0.0-20191031065753-b19d8caf39be/go.mod h1:+hZ4rl5/4vOvVe96ffrVpS5wEIWwPC12pZr9iXDo7OI=
k8s.io/apimachinery v0.0.0-20191030190112-bb31b70367b7/go.mod h1:gA1T9z4LIup7PIegBwxkF2UYXUNVKhOAPvQWWnAc34k=
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=