From 89ee43e3fb7361a5b8a196826f58c1bd9d687eb1 Mon Sep 17 00:00:00 2001 From: Clay Kauzlaric Date: Fri, 15 Dec 2023 15:53:45 -0500 Subject: [PATCH] don't use upstreamTLS in gatewayAPI processor --- cmd/contour/serve.go | 1 - internal/dag/gatewayapi_processor.go | 6 ------ 2 files changed, 7 deletions(-) diff --git a/cmd/contour/serve.go b/cmd/contour/serve.go index e052e10fafd..1caa4af5ffc 100644 --- a/cmd/contour/serve.go +++ b/cmd/contour/serve.go @@ -1229,7 +1229,6 @@ func (s *Server) getDAGBuilder(dbc dagBuilderConfig) *dag.Builder { MaxRequestsPerConnection: dbc.maxRequestsPerConnection, PerConnectionBufferLimitBytes: dbc.perConnectionBufferLimitBytes, SetSourceMetadataOnRoutes: true, - UpstreamTLS: dbc.upstreamTLS, }) } diff --git a/internal/dag/gatewayapi_processor.go b/internal/dag/gatewayapi_processor.go index 38d2fb01e2d..5a50d6fcf39 100644 --- a/internal/dag/gatewayapi_processor.go +++ b/internal/dag/gatewayapi_processor.go @@ -21,7 +21,6 @@ import ( "strings" "time" - contour_api_v1alpha1 "github.com/projectcontour/contour/apis/projectcontour/v1alpha1" "github.com/projectcontour/contour/internal/gatewayapi" "github.com/projectcontour/contour/internal/k8s" "github.com/projectcontour/contour/internal/ref" @@ -75,10 +74,6 @@ type GatewayAPIProcessor struct { // configurable and off by default in order to support the feature // without requiring all existing test cases to change. SetSourceMetadataOnRoutes bool - - // UpstreamTLS defines the TLS settings like min/max version - // and cipher suites for upstream connections. - UpstreamTLS *contour_api_v1alpha1.EnvoyTLS } // matchConditions holds match rules. @@ -1015,7 +1010,6 @@ func (p *GatewayAPIProcessor) computeTLSRouteForListener(route *gatewayapi_v1alp TimeoutPolicy: ClusterTimeoutPolicy{ConnectTimeout: p.ConnectTimeout}, MaxRequestsPerConnection: p.MaxRequestsPerConnection, PerConnectionBufferLimitBytes: p.PerConnectionBufferLimitBytes, - UpstreamTLS: (*UpstreamTLS)(p.UpstreamTLS), }) }