Merge pull request kubernetes#111896 from deads2k/revert-compression-disable

Revert "Add an option to conditionally disable compression based on client ip."

Author: k8s-ci-robot

staging/src/k8s.io/apiserver/pkg/endpoints/filters/disable_compression.go

@@ -87,21 +87,19 @@ func StreamObject(statusCode int, gv schema.GroupVersion, s runtime.NegotiatedSe
 // The context is optional and can be nil. This method will perform optional content compression if requested by
 // a client and the feature gate for APIResponseCompression is enabled.
 func SerializeObject(mediaType string, encoder runtime.Encoder, hw http.ResponseWriter, req *http.Request, statusCode int, object runtime.Object) {
-	disableCompression := request.CompressionDisabledFrom(req.Context())
 	trace := utiltrace.New("SerializeObject",
 		utiltrace.Field{"audit-id", request.GetAuditIDTruncated(req.Context())},
 		utiltrace.Field{"method", req.Method},
 		utiltrace.Field{"url", req.URL.Path},
 		utiltrace.Field{"protocol", req.Proto},
 		utiltrace.Field{"mediaType", mediaType},
-		utiltrace.Field{"encoder", encoder.Identifier()},
-		utiltrace.Field{"disableCompression", disableCompression})
+		utiltrace.Field{"encoder", encoder.Identifier()})
 	defer trace.LogIfLong(5 * time.Second)
 
 	w := &deferredResponseWriter{
 		mediaType:       mediaType,
 		statusCode:      statusCode,
-		contentEncoding: negotiateContentEncoding(req, disableCompression),
+		contentEncoding: negotiateContentEncoding(req),
 		hw:              hw,
 		trace:           trace,
 	}
@@ -157,12 +155,12 @@ const (
 // negotiateContentEncoding returns a supported client-requested content encoding for the
 // provided request. It will return the empty string if no supported content encoding was
 // found or if response compression is disabled.
-func negotiateContentEncoding(req *http.Request, disableCompression bool) string {
+func negotiateContentEncoding(req *http.Request) string {
 	encoding := req.Header.Get("Accept-Encoding")
 	if len(encoding) == 0 {
 		return ""
 	}
-	if !utilfeature.DefaultFeatureGate.Enabled(features.APIResponseCompression) || disableCompression {
+	if !utilfeature.DefaultFeatureGate.Enabled(features.APIResponseCompression) {
 		return ""
 	}
 	for len(encoding) > 0 {

staging/src/k8s.io/apiserver/pkg/endpoints/filters/disable_compression_test.go

@@ -19,7 +19,6 @@ package responsewriters
 import (
 	"bytes"
 	"compress/gzip"
-	"context"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
@@ -42,7 +41,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/util/uuid"
-	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/features"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	featuregatetesting "k8s.io/component-base/featuregate/testing"
@@ -233,7 +231,7 @@ func TestSerializeObject(t *testing.T) {
 		},
 
 		{
-			name:               "compress on gzip, request's context has no decision",
+			name:               "compress on gzip",
 			compressionEnabled: true,
 			out:                largePayload,
 			mediaType:          "application/json",
@@ -251,40 +249,6 @@ func TestSerializeObject(t *testing.T) {
 			},
 			wantBody: gzipContent(largePayload, defaultGzipContentEncodingLevel),
 		},
-		{
-			name:               "compress on gzip, request's context allows compression",
-			compressionEnabled: true,
-			out:                largePayload,
-			mediaType:          "application/json",
-			req: (&http.Request{
-				Header: http.Header{
-					"Accept-Encoding": []string{"gzip"},
-				},
-				URL: &url.URL{Path: "/path"},
-			}).WithContext(request.WithCompressionDisabled(context.Background(), false)),
-			wantCode: http.StatusOK,
-			wantHeaders: http.Header{
-				"Content-Type":     []string{"application/json"},
-				"Content-Encoding": []string{"gzip"},
-				"Vary":             []string{"Accept-Encoding"},
-			},
-			wantBody: gzipContent(largePayload, defaultGzipContentEncodingLevel),
-		},
-		{
-			name:               "compress on gzip, request's context disables compression",
-			compressionEnabled: true,
-			out:                largePayload,
-			mediaType:          "application/json",
-			req: (&http.Request{
-				Header: http.Header{
-					"Accept-Encoding": []string{"gzip"},
-				},
-				URL: &url.URL{Path: "/path"},
-			}).WithContext(request.WithCompressionDisabled(context.Background(), true)),
-			wantCode:    http.StatusOK,
-			wantHeaders: http.Header{"Content-Type": []string{"application/json"}},
-			wantBody:    largePayload,
-		},
 
 		{
 			name:               "compression is not performed on small objects",

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go

@@ -257,9 +257,6 @@ type Config struct {
 
 	// StorageVersionManager holds the storage versions of the API resources installed by this server.
 	StorageVersionManager storageversion.Manager
-
-	// CompressionDisabledFunc returns whether compression should be disabled for a given request.
-	CompressionDisabledFunc genericapifilters.CompressionDisabledFunc
 }
 
 type RecommendedConfig struct {
@@ -859,9 +856,6 @@ func DefaultBuildHandlerChain(apiHandler http.Handler, c *Config) http.Handler {
 	if c.ShutdownSendRetryAfter {
 		handler = genericfilters.WithRetryAfter(handler, c.lifecycleSignals.NotAcceptingNewRequest.Signaled())
 	}
-	if c.CompressionDisabledFunc != nil {
-		handler = genericapifilters.WithCompressionDisabled(handler, c.CompressionDisabledFunc)
-	}
 	handler = genericfilters.WithHTTPLogging(handler)
 	if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerTracing) {
 		handler = genericapifilters.WithTracing(handler, c.TracerProvider)