From e7a46a7c81105a831d4348769110c5644a946417 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Mon, 16 May 2016 21:20:46 -0400
Subject: [PATCH] Fix Incorrect response model for pods/{name}/log

The swagger spec for pods/{name}/log does not include
"text/plain" as a possible content-type for the the response.
So we implement ProducesMIMETypes to make sure "text/plain"
gets added to the default list ot content-types.

the v1.json was generated by running:
hack/update-generated-swagger-docs.sh;./hack/update-swagger-spec.sh;

Fixes #14071
---
 api/swagger-spec/v1.json              |  1 +
 docs/api-reference/v1/operations.html |  3 +++
 pkg/registry/pod/rest/log.go          | 10 ++++++++++
 3 files changed, 14 insertions(+)

diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json
index ccbf8985a95..8fda570e4c2 100644
--- a/api/swagger-spec/v1.json
+++ b/api/swagger-spec/v1.json
@@ -8817,6 +8817,7 @@
        }
       ],
       "produces": [
+       "text/plain",
        "application/json",
        "application/yaml",
        "application/vnd.kubernetes.protobuf"
diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html
index 47167e7565c..85da91027cc 100755
--- a/docs/api-reference/v1/operations.html
+++ b/docs/api-reference/v1/operations.html
@@ -8705,6 +8705,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
 <div class="ulist">
 <ul>
 <li>
+<p>text/plain</p>
+</li>
+<li>
 <p>application/json</p>
 </li>
 <li>
diff --git a/pkg/registry/pod/rest/log.go b/pkg/registry/pod/rest/log.go
index 24e3c422e6a..74c9805b9f3 100644
--- a/pkg/registry/pod/rest/log.go
+++ b/pkg/registry/pod/rest/log.go
@@ -45,6 +45,16 @@ func (r *LogREST) New() runtime.Object {
 	return &api.Pod{}
 }
 
+// LogREST implements StorageMetadata
+func (r *LogREST) ProducesMIMETypes(verb string) []string {
+	// Since the default list does not include "plain/text", we need to
+	// explicitly override ProducesMIMETypes, so that it gets added to
+	// the "produces" section for pods/{name}/log
+	return []string{
+		"text/plain",
+	}
+}
+
 // Get retrieves a runtime.Object that will stream the contents of the pod log
 func (r *LogREST) Get(ctx api.Context, name string, opts runtime.Object) (runtime.Object, error) {
 	logOpts, ok := opts.(*api.PodLogOptions)