Merge pull request #44837 from danielqsj/apiissue

Automatic merge from submit-queue Fix Content-Type error of apis **What this PR does / why we need it**: Response's Content-type of `/apis` is `text/plain`, not `application/json`. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #44646 **Special notes for your reviewer**: We could use `responsewriters.WriteObjectNegotiated()` to write Content-type correctly. **Release note**: ```release-note ```

Merge pull request #44837 from danielqsj/apiissue
08c5e289 · Kubernetes Submit Queue · GitHub · 57fdd75c · 90802b2e · 08c5e289
Commit 08c5e289 authored Apr 24, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 17 deletions

handler_apis.go .../src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go +3 -17

No files found.
--- 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)
+	responsewriters.WriteObjectNegotiated(r.codecs, schema.GroupVersion{}, w, req, http.StatusOK, discoveryGroupList)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if _, err := w.Write(json); err != nil {
-		panic(err)
-	}
 }
 // 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)
+	responsewriters.WriteObjectNegotiated(r.codecs, schema.GroupVersion{}, w, req, http.StatusOK, discoveryGroup)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if _, err := w.Write(json); err != nil {
-		panic(err)
-	}
 }