From 644846f33ea94c3b54695056f2fabd9af86541e8 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Tue, 14 Jan 2025 10:16:48 -0500 Subject: [PATCH] code review Signed-off-by: Steve Kriss --- internal/xds/v3/callbacks.go | 9 ++++----- site/content/docs/main/configuration.md | 9 --------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/internal/xds/v3/callbacks.go b/internal/xds/v3/callbacks.go index 4801f87a010..4083fe68333 100644 --- a/internal/xds/v3/callbacks.go +++ b/internal/xds/v3/callbacks.go @@ -24,9 +24,8 @@ import ( ) // NewRequestLoggingCallbacks returns an implementation of the Envoy xDS server -// callbacks for use when Contour is run in Envoy xDS server mode to provide -// request detail logging. Currently only the xDS State of the World callback -// OnStreamRequest is implemented. +// callbacks to provide request detail logging. Currently only xDS State of the +// World callbacks are implemented. func NewRequestLoggingCallbacks(log logrus.FieldLogger) envoy_server_v3.Callbacks { return &envoy_server_v3.CallbackFuncs{ StreamOpenFunc: func(_ context.Context, streamID int64, typeURL string) error { @@ -60,8 +59,8 @@ func logStreamClosedDetails(l logrus.FieldLogger, streamID int64, node *envoy_co log.Debug("stream closed") } -// Helper function for use in the Envoy xDS server callbacks and the Contour -// xDS server to log request details. +// Helper function for use in the Envoy xDS server callbacks to +// log request details. func logDiscoveryRequestDetails(l logrus.FieldLogger, req *envoy_service_discovery_v3.DiscoveryRequest) { log := l.WithField("version_info", req.VersionInfo).WithField("response_nonce", req.ResponseNonce) if req.Node != nil { diff --git a/site/content/docs/main/configuration.md b/site/content/docs/main/configuration.md index b49e47e3bf8..d96ba39314f 100644 --- a/site/content/docs/main/configuration.md +++ b/site/content/docs/main/configuration.md @@ -97,7 +97,6 @@ Where Contour settings can also be specified with command-line flags, the comman | cluster | ClusterConfig | | The [cluster configuration](#cluster-configuration). | | network | NetworkConfig | | The [network configuration](#network-configuration). | | listener | ListenerConfig | | The [listener configuration](#listener-configuration). | -| server | ServerConfig | | The [server configuration](#server-configuration) for `contour serve` command. | | gateway | GatewayConfig | | The [gateway-api Gateway configuration](#gateway-configuration). | | rateLimitService | RateLimitServiceConfig | | The [rate limit service configuration](#rate-limit-service-configuration). | | enableExternalNameService | boolean | `false` | Enable ExternalName Service processing. Enabling this has security implications. Please see the [advisory](https://github.com/projectcontour/contour/security/advisories/GHSA-5ph6-qq5x-7jwc) for more details. | @@ -200,14 +199,6 @@ The listener configuration block can be used to configure various parameters for _This is Envoy's default setting value and is not explicitly configured by Contour._ -### Server Configuration - -The server configuration block can be used to configure various settings for the `contour serve` command. - -| Field Name | Type | Default | Description | -| --------------- | ------ | ------- | ----------------------------------------------------------------------------- | -| | | | | - ### Gateway Configuration The gateway configuration block is used to configure which gateway-api Gateway Contour should configure: