diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index f8764d8f..197598ab 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -204,15 +204,15 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "4a4abcd45006" + "Rev": "b5bc33fc46a2" }, { "ImportPath": "k8s.io/client-go", - "Rev": "2e1a3ed22ac5" + "Rev": "1268fab57b4f" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "edcfb81a444e" + "Rev": "97cad0f8b2f3" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 5410286f..5bd04171 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ go 1.12 require ( k8s.io/api v0.0.0-20190404065945-709cf190c7b7 - k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006 - k8s.io/client-go v0.0.0-20190404172613-2e1a3ed22ac5 - k8s.io/code-generator v0.0.0-20190404080254-edcfb81a444e + k8s.io/apimachinery v0.0.0-20190404210755-b5bc33fc46a2 + k8s.io/client-go v0.0.0-20190405052620-1268fab57b4f + k8s.io/code-generator v0.0.0-20190405052243-97cad0f8b2f3 k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 ) @@ -268,9 +268,9 @@ replace ( gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.1 gotest.tools => gotest.tools v2.2.0+incompatible k8s.io/api => k8s.io/api v0.0.0-20190404065945-709cf190c7b7 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006 - k8s.io/client-go => k8s.io/client-go v0.0.0-20190404172613-2e1a3ed22ac5 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190404080254-edcfb81a444e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404210755-b5bc33fc46a2 + k8s.io/client-go => k8s.io/client-go v0.0.0-20190405052620-1268fab57b4f + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190405052243-97cad0f8b2f3 k8s.io/component-base => k8s.io/component-base v0.0.0-20190404070505-d7891e8054ca k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 diff --git a/go.sum b/go.sum index fbe23df7..9ad4830d 100644 --- a/go.sum +++ b/go.sum @@ -76,9 +76,9 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= k8s.io/api v0.0.0-20190404065945-709cf190c7b7/go.mod h1:qa6Gt7knwxwD/MXwV8iaEoTpniVksiix/r9hpLWYgTA= -k8s.io/apimachinery v0.0.0-20190404065847-4a4abcd45006/go.mod h1:65NCMCFo27j/Cv2DAQSfKd70SAtu/hwoqasuXFCDNvY= -k8s.io/client-go v0.0.0-20190404172613-2e1a3ed22ac5/go.mod h1:bIEHXHbykaOlj+pgLllzLJ2RPGdzkjtqdk0Il07KPEM= -k8s.io/code-generator v0.0.0-20190404080254-edcfb81a444e/go.mod h1:IPqxl/YHk05nodzupwjke6ctMjyNRdV2zZ5/j3/F204= +k8s.io/apimachinery v0.0.0-20190404210755-b5bc33fc46a2/go.mod h1:65NCMCFo27j/Cv2DAQSfKd70SAtu/hwoqasuXFCDNvY= +k8s.io/client-go v0.0.0-20190405052620-1268fab57b4f/go.mod h1:Dxcu+jmnbPDK6JfOyGE0dDSoQ0x/3aELgnvtC7LvJzk= +k8s.io/code-generator v0.0.0-20190405052243-97cad0f8b2f3/go.mod h1:IPqxl/YHk05nodzupwjke6ctMjyNRdV2zZ5/j3/F204= k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk= k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA= diff --git a/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go index 57ce1df2..0471f954 100644 --- a/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go +++ b/pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go @@ -19,7 +19,6 @@ limitations under the License. package v1alpha1 import ( - serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" v1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1" "k8s.io/sample-controller/pkg/generated/clientset/versioned/scheme" @@ -71,7 +70,7 @@ func setConfigDefaults(config *rest.Config) error { gv := v1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} + config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent()