From ed78b9adbea89b473989b415405f91924fbc3b3c Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 12 Jan 2016 16:26:50 -0800 Subject: [PATCH] let the apiserver's swaggerapi endpoint reports discovery types --- pkg/apiserver/apiserver.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index b1e25e72301..a038acf3738 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -239,7 +239,8 @@ func AddApiWebService(s runtime.NegotiatedSerializer, container *restful.Contain Doc("get available API versions"). Operation("getAPIVersions"). Produces(s.SupportedMediaTypes()...). - Consumes(s.SupportedMediaTypes()...)) + Consumes(s.SupportedMediaTypes()...). + Writes(unversioned.APIVersions{})) container.Add(ws) } @@ -296,7 +297,8 @@ func AddApisWebService(s runtime.NegotiatedSerializer, container *restful.Contai Doc("get available API versions"). Operation("getAPIVersions"). Produces(s.SupportedMediaTypes()...). - Consumes(s.SupportedMediaTypes()...)) + Consumes(s.SupportedMediaTypes()...). + Writes(unversioned.APIGroupList{})) container.Add(ws) } @@ -318,7 +320,8 @@ func AddGroupWebService(s runtime.NegotiatedSerializer, container *restful.Conta Doc("get information of a group"). Operation("getAPIGroup"). Produces(s.SupportedMediaTypes()...). - Consumes(s.SupportedMediaTypes()...)) + Consumes(s.SupportedMediaTypes()...). + Writes(unversioned.APIGroup{})) container.Add(ws) } @@ -337,7 +340,8 @@ func AddSupportedResourcesWebService(s runtime.NegotiatedSerializer, ws *restful Doc("get available resources"). Operation("getAPIResources"). Produces(s.SupportedMediaTypes()...). - Consumes(s.SupportedMediaTypes()...)) + Consumes(s.SupportedMediaTypes()...). + Writes(unversioned.APIResourceList{})) } // handleVersion writes the server's version information.