Merge pull request #2024 from CatherineF-dev/set-contentType

Only use OpenMetrics and Text in contentType
kubernetes · Mar 16, 2023 · a577a59 · a577a59
2 parents b11ec2b + d46edde
commit a577a59
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/metricshandler/metrics_handler.go b/pkg/metricshandler/metrics_handler.go
@@ -187,6 +187,10 @@ func (m *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	contentType := expfmt.NegotiateIncludingOpenMetrics(r.Header)
 
+	// We do not support protobuf at the moment. Fall back to FmtText if the negotiated exposition format is not FmtOpenMetrics See: https://github.com/kubernetes/kube-state-metrics/issues/2022
+	if contentType != expfmt.FmtOpenMetrics {
+		contentType = expfmt.FmtText
+	}
 	resHeader.Set("Content-Type", string(contentType))
 
 	if m.enableGZIPEncoding {