Merge pull request #94460 from wojtek-t/remove_default_conversions

Remove default conversions

Kubernetes-commit: 5b3b2055883e05560263e337b23721ec39c64ac5
This commit is contained in:
Kubernetes Publisher 2020-09-03 09:33:54 -07:00
parent 7561eea1c6
commit da8b2c5e5e
3 changed files with 8 additions and 8 deletions

4
Godeps/Godeps.json generated
View File

@ -676,11 +676,11 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "6084ad015ddd"
"Rev": "1eef857427d9"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bb860d7b6e04"
"Rev": "7cd71358d5b6"
},
{
"ImportPath": "k8s.io/component-base",

8
go.mod
View File

@ -42,8 +42,8 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20200902131916-03aa42fe49ac
k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd
k8s.io/client-go v0.0.0-20200902132334-bb860d7b6e04
k8s.io/apimachinery v0.0.0-20200903163354-1eef857427d9
k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6
k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
@ -55,7 +55,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20200902131916-03aa42fe49ac
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd
k8s.io/client-go => k8s.io/client-go v0.0.0-20200902132334-bb860d7b6e04
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200903163354-1eef857427d9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6
k8s.io/component-base => k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823
)

4
go.sum
View File

@ -503,8 +503,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20200902131916-03aa42fe49ac/go.mod h1:RRBubtUUfQknZlqyrIcyOzchPl/ndgo1xAGCzjrKrQU=
k8s.io/apimachinery v0.0.0-20200902171538-6084ad015ddd/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200902132334-bb860d7b6e04/go.mod h1:1CDKw+WUI72vWcFo0SpATCUkR78esmyqaIDImRWHmkk=
k8s.io/apimachinery v0.0.0-20200903163354-1eef857427d9/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.0.0-20200903171857-7cd71358d5b6/go.mod h1:IlEd8lxjDG8cvAB6MHAPJe9pO2IOxBafW1hrpyMFf0U=
k8s.io/component-base v0.0.0-20200902133139-1d2c8187d823/go.mod h1:0gnPCcp/GY+eCzs3ctBHW+6CDRXi6+WyHI39AhX3nHQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=