Skip to content

Commit

Permalink
don't use upstreamTLS in gatewayAPI processor
Browse files Browse the repository at this point in the history
Signed-off-by: Clay Kauzlaric <ckauzlaric@vmware.com>
  • Loading branch information
KauzClay committed Dec 15, 2023
1 parent 732d47d commit 7d64501
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion cmd/contour/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,6 @@ func (s *Server) getDAGBuilder(dbc dagBuilderConfig) *dag.Builder {
MaxRequestsPerConnection: dbc.maxRequestsPerConnection,
PerConnectionBufferLimitBytes: dbc.perConnectionBufferLimitBytes,
SetSourceMetadataOnRoutes: true,
UpstreamTLS: dbc.upstreamTLS,
})
}

Expand Down
6 changes: 0 additions & 6 deletions internal/dag/gatewayapi_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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),
})
}

Expand Down

0 comments on commit 7d64501

Please sign in to comment.