From 51e5cc2b6e7c0d23c4ce7faf5fa2d7401c6de02f Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Wed, 20 Apr 2016 13:35:09 -0400 Subject: [PATCH] Handle streaming serializers more consistently Add tests to watch behavior in both protocols (http and websocket) against all 3 media types. Adopt the `application/vnd.kubernetes.protobuf;stream=watch` media type for the content that comes back from a watch call so that it can be distinguished from a Status result. --- apiserver/apiserver.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apiserver/apiserver.go b/apiserver/apiserver.go index 5e805714..52e89471 100644 --- a/apiserver/apiserver.go +++ b/apiserver/apiserver.go @@ -94,9 +94,8 @@ func Run(serverOptions *genericapiserver.ServerRunOptions) error { VersionedResourcesStorageMap: map[string]map[string]rest.Storage{ groupVersion.Version: restStorageMap, }, - Scheme: api.Scheme, - NegotiatedSerializer: api.Codecs, - NegotiatedStreamSerializer: api.StreamCodecs, + Scheme: api.Scheme, + NegotiatedSerializer: api.Codecs, } if err := s.InstallAPIGroups([]genericapiserver.APIGroupInfo{apiGroupInfo}); err != nil { return fmt.Errorf("Error in installing API: %v", err)