diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b4f6b3dc..0845d7a9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -344,11 +344,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "fb749d2f1064" + "Rev": "21721929cffa" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "461753078381" + "Rev": "344bcc0201c9" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 235d5d2d..e6d7b541 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,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-20190905160310-fb749d2f1064 - k8s.io/apimachinery v0.0.0-20190831074630-461753078381 + k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9 k8s.io/klog v0.4.0 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/yaml v1.1.0 @@ -41,6 +41,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-20190905160310-fb749d2f1064 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831074630-461753078381 + k8s.io/api => k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9 ) diff --git a/go.sum b/go.sum index e4cf0892..3b1f36f7 100644 --- a/go.sum +++ b/go.sum @@ -177,8 +177,8 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/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-20190905160310-fb749d2f1064/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q= -k8s.io/apimachinery v0.0.0-20190831074630-461753078381/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/api v0.0.0-20190913080256-21721929cffa/go.mod h1:jESdJL4e7Q+sDnEXOZ1ysc1WBxR4I34RbRh5QqGT9kQ= +k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= 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= diff --git a/metadata/metadata.go b/metadata/metadata.go index db06cfd5..a94fe7a4 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog" - metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" + metainternalversionscheme "k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -63,7 +63,7 @@ func ConfigFor(inConfig *rest.Config) *rest.Config { config := rest.CopyConfig(inConfig) config.AcceptContentTypes = "application/vnd.kubernetes.protobuf,application/json" config.ContentType = "application/vnd.kubernetes.protobuf" - config.NegotiatedSerializer = metainternalversion.Codecs.WithoutConversion() + config.NegotiatedSerializer = metainternalversionscheme.Codecs.WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() }