Adds support for configuration of different types of compression, including none

apis/projectcontour/v1alpha1/compression.go

@@ -0,0 +1,53 @@
+// Copyright Project Contour Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1alpha1
+
+import "fmt"
+
+// CompressionAlgorithm defines the type of compression algorithm applied in default HTTP listener filter chain.
+// Allowable values are defined as names of well known compression algorithms (plus "disabled").
+type CompressionAlgorithm string
+
+// EnvoyCompression defines configuration related to compression in the default HTTP Listener filter chain.
+type EnvoyCompression struct {
+	// Algorithm selects the compression type applied in the compression HTTP filter of the default Listener filters.
+	// Values: `gzip` (default), `brotli`, `zstd`, `disabled`.
+	// Setting this to `disabled` will make Envoy skip "Accept-Encoding: gzip,deflate" request header and always return uncompressed response
+	// +kubebuilder:validation:Enum="gzip";"brotli";"zstd";"disabled"
+	// +optional
+	Algorithm CompressionAlgorithm `json:"algorithm,omitempty"`
+}
+
+func (a CompressionAlgorithm) Validate() error {
+	switch a {
+	case BrotliCompression, DisabledCompression, GzipCompression, ZstdCompression, "":
+		return nil
+	default:
+		return fmt.Errorf("invalid compression type: %q", a)
+	}
+}
+
+const (
+	// BrotliCompression specifies brotli as the default HTTP filter chain compression mechanism
+	BrotliCompression CompressionAlgorithm = "brotli"
+
+	// DisabledCompression specifies that there will be no compression in the default HTTP filter chain
+	DisabledCompression CompressionAlgorithm = "disabled"
+
+	// GzipCompression specifies gzip as the default HTTP filter chain compression mechanism
+	GzipCompression CompressionAlgorithm = "gzip"
+
+	// ZstdCompression specifies zstd as the default HTTP filter chain compression mechanism
+	ZstdCompression CompressionAlgorithm = "zstd"
+)

apis/projectcontour/v1alpha1/compression_test.go

@@ -0,0 +1,32 @@
+// Copyright Project Contour Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package v1alpha1_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	contour_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1"
+)
+
+func TestValidateEnvoyCompressionAlgorithmType(t *testing.T) {
+	require.Error(t, contour_v1alpha1.CompressionAlgorithm("foo").Validate())
+
+	require.NoError(t, contour_v1alpha1.CompressionAlgorithm("").Validate())
+	require.NoError(t, contour_v1alpha1.BrotliCompression.Validate())
+	require.NoError(t, contour_v1alpha1.DisabledCompression.Validate())
+	require.NoError(t, contour_v1alpha1.GzipCompression.Validate())
+	require.NoError(t, contour_v1alpha1.ZstdCompression.Validate())
+}

apis/projectcontour/v1alpha1/contourconfig.go

@@ -348,6 +348,10 @@ type EnvoyListenerConfig struct {
 	// +optional
 	UseProxyProto *bool `json:"useProxyProtocol,omitempty"`
 
+	// Compression defines configuration related to compression in the default HTTP Listener filters.
+	// +optional
+	Compression *EnvoyCompression `json:"compression,omitempty"`
+
 	// DisableAllowChunkedLength disables the RFC-compliant Envoy behavior to
 	// strip the "Content-Length" header if "Transfer-Encoding: chunked" is
 	// also set. This is an emergency off-switch to revert back to Envoy's

changelogs/unreleased/6546-chaosbox-small.md

@@ -0,0 +1 @@
+The HTTP compression algorithm can now be configured using the `compression.algorithm` field in the configuration file or the `spec.envoy.listener.compression.algorithm` field in the `ContourConfiguration` CRD. The available values are `gzip` (default), `brotli`, `zstd`, and `disabled`.

cmd/contour/serve.go

@@ -123,6 +123,7 @@ func registerServe(app *kingpin.Application) (*kingpin.CmdClause, *serveContext)
 
 		return nil
 	}
+
 	serve.Flag("accesslog-format", "Format for Envoy access logs.").PlaceHolder("<envoy|json>").StringVar((*string)(&ctx.Config.AccessLogFormat))
 
 	serve.Flag("config-path", "Path to base configuration.").Short('c').PlaceHolder("/path/to/file").Action(parseConfig).ExistingFileVar(&configFile)
@@ -447,6 +448,7 @@ func (s *Server) doServe() error {
 	}
 
 	listenerConfig := xdscache_v3.ListenerConfig{
+		Compression:                   contourConfiguration.Envoy.Listener.Compression,
 		UseProxyProto:                 *contourConfiguration.Envoy.Listener.UseProxyProto,
 		HTTPAccessLog:                 contourConfiguration.Envoy.HTTPListener.AccessLog,
 		HTTPSAccessLog:                contourConfiguration.Envoy.HTTPSListener.AccessLog,

cmd/contour/servecontext.go

@@ -333,6 +333,24 @@ func (ctx *serveContext) convertToContourConfigurationSpec() contour_v1alpha1.Co
 		accessLogLevel = contour_v1alpha1.LogLevelDisabled
 	}
 
+	var compression *contour_v1alpha1.EnvoyCompression
+	if ctx.Config.Compression.Algorithm != "" {
+		var algorithm contour_v1alpha1.CompressionAlgorithm
+		switch ctx.Config.Compression.Algorithm {
+		case config.CompressionBrotli:
+			algorithm = contour_v1alpha1.BrotliCompression
+		case config.CompressionDisabled:
+			algorithm = contour_v1alpha1.DisabledCompression
+		case config.CompressionGzip:
+			algorithm = contour_v1alpha1.GzipCompression
+		case config.CompressionZstd:
+			algorithm = contour_v1alpha1.ZstdCompression
+		}
+		compression = &contour_v1alpha1.EnvoyCompression{
+			Algorithm: algorithm,
+		}
+	}
+
 	var defaultHTTPVersions []contour_v1alpha1.HTTPVersionType
 	for _, version := range ctx.Config.DefaultHTTPVersions {
 		switch version {
@@ -519,6 +537,7 @@ func (ctx *serveContext) convertToContourConfigurationSpec() contour_v1alpha1.Co
 		Envoy: &contour_v1alpha1.EnvoyConfig{
 			Listener: &contour_v1alpha1.EnvoyListenerConfig{
 				UseProxyProto:                 &ctx.useProxyProto,
+				Compression:                   compression,
 				DisableAllowChunkedLength:     &ctx.Config.DisableAllowChunkedLength,
 				DisableMergeSlashes:           &ctx.Config.DisableMergeSlashes,
 				ServerHeaderTransformation:    serverHeaderTransformation,