From 90802b2e3ded9017177ff314d437c7633dca9e8e Mon Sep 17 00:00:00 2001 From: shijunqian Date: Mon, 24 Apr 2017 16:12:00 +0800 Subject: [PATCH] Fix Content-Type error of apis --- .../pkg/apiserver/handler_apis.go | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go index 5eafa6f4bf..37ab4b2dcf 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go @@ -22,7 +22,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" v1listers "k8s.io/client-go/listers/core/v1" @@ -88,14 +88,7 @@ func (r *apisHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { } } - json, err := runtime.Encode(r.codecs.LegacyCodec(), discoveryGroupList) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - if _, err := w.Write(json); err != nil { - panic(err) - } + responsewriters.WriteObjectNegotiated(r.codecs, schema.GroupVersion{}, w, req, http.StatusOK, discoveryGroupList) } // convertToDiscoveryAPIGroup takes apiservices in a single group and returns a discovery compatible object. @@ -198,12 +191,5 @@ func (r *apiGroupHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { http.Error(w, "", http.StatusNotFound) return } - json, err := runtime.Encode(r.codecs.LegacyCodec(), discoveryGroup) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - if _, err := w.Write(json); err != nil { - panic(err) - } + responsewriters.WriteObjectNegotiated(r.codecs, schema.GroupVersion{}, w, req, http.StatusOK, discoveryGroup) }