diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 2ab6e4d6..d3666068 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -348,7 +348,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "0104e33c351d" + "Rev": "082230a5ffdd" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 2a33d638..398e5524 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( golang.org/x/time v0.0.0-20181108054448-85acf8d2951c google.golang.org/appengine v1.5.0 // indirect k8s.io/api v0.0.0-20190927115716-5d581ce610b0 - k8s.io/apimachinery v0.0.0-20190927035529-0104e33c351d + k8s.io/apimachinery v0.0.0-20191001195453-082230a5ffdd k8s.io/klog v1.0.0 k8s.io/utils v0.0.0-20190920012459-5008bf6f8cd6 sigs.k8s.io/yaml v1.1.0 @@ -42,5 +42,5 @@ replace ( 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-20190927115716-5d581ce610b0 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190927035529-0104e33c351d + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191001195453-082230a5ffdd ) diff --git a/go.sum b/go.sum index 554f0174..f622623f 100644 --- a/go.sum +++ b/go.sum @@ -178,7 +178,7 @@ 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-20190927115716-5d581ce610b0/go.mod h1:l2ZHS8QbgqodGx7yrYsOSwIxOR76BpGiW1OywXo9PFI= -k8s.io/apimachinery v0.0.0-20190927035529-0104e33c351d/go.mod h1:grJJH0hgilA2pYoUiJcPu2EDUal95NTq1vpxxvMLSu8= +k8s.io/apimachinery v0.0.0-20191001195453-082230a5ffdd/go.mod h1:grJJH0hgilA2pYoUiJcPu2EDUal95NTq1vpxxvMLSu8= 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/rest/config_test.go b/rest/config_test.go index df5778ce..06915567 100644 --- a/rest/config_test.go +++ b/rest/config_test.go @@ -190,6 +190,10 @@ func (c *fakeCodec) Encode(obj runtime.Object, stream io.Writer) error { return nil } +func (c *fakeCodec) Identifier() runtime.Identifier { + return runtime.Identifier("fake") +} + type fakeRoundTripper struct{} func (r *fakeRoundTripper) RoundTrip(*http.Request) (*http.Response, error) {