change default xDS server to envoy

Signed-off-by: Steve Kriss <stephen.kriss@gmail.com>
skriss · Feb 14, 2024 · 421c078 · 421c078
1 parent 6e6d2f7
commit 421c078
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/cmd/contour/servecontext_test.go b/cmd/contour/servecontext_test.go
@@ -379,7 +379,7 @@ func TestConvertServeContext(t *testing.T) {
 	defaultContourConfiguration := func() contour_v1alpha1.ContourConfigurationSpec {
 		return contour_v1alpha1.ContourConfigurationSpec{
 			XDSServer: &contour_v1alpha1.XDSServerConfig{
-				Type:    contour_v1alpha1.ContourServerType,
+				Type:    contour_v1alpha1.EnvoyServerType,
 				Address: "127.0.0.1",
 				Port:    8001,
 				TLS: &contour_v1alpha1.TLS{

diff --git a/examples/contour/01-contour-config.yaml b/examples/contour/01-contour-config.yaml
@@ -9,7 +9,7 @@ data:
     #
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
-    #   xds-server-type: contour
+    #   xds-server-type: envoy
     #
     # Specify the Gateway API configuration.
     # gateway:

diff --git a/examples/render/contour-deployment.yaml b/examples/render/contour-deployment.yaml
@@ -42,7 +42,7 @@ data:
     #
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
-    #   xds-server-type: contour
+    #   xds-server-type: envoy
     #
     # Specify the Gateway API configuration.
     # gateway:

diff --git a/examples/render/contour.yaml b/examples/render/contour.yaml
@@ -42,7 +42,7 @@ data:
     #
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
-    #   xds-server-type: contour
+    #   xds-server-type: envoy
     #
     # Specify the Gateway API configuration.
     # gateway:

diff --git a/internal/contourconfig/contourconfiguration.go b/internal/contourconfig/contourconfiguration.go
@@ -41,7 +41,7 @@ func OverlayOnDefaults(spec contour_v1alpha1.ContourConfigurationSpec) (contour_
 func Defaults() contour_v1alpha1.ContourConfigurationSpec {
 	return contour_v1alpha1.ContourConfigurationSpec{
 		XDSServer: &contour_v1alpha1.XDSServerConfig{
-			Type:    contour_v1alpha1.ContourServerType,
+			Type:    contour_v1alpha1.EnvoyServerType,
 			Address: "0.0.0.0",
 			Port:    8001,
 			TLS: &contour_v1alpha1.TLS{

diff --git a/pkg/config/parameters.go b/pkg/config/parameters.go
@@ -241,7 +241,7 @@ func (t ProtocolParameters) Validate() error {
 // ServerParameters holds the configuration for the Contour xDS server.
 type ServerParameters struct {
 	// Defines the XDSServer to use for `contour serve`.
-	// Defaults to "contour"
+	// Defaults to "envoy"
 	XDSServerType ServerType `yaml:"xds-server-type,omitempty"`
 }
 
@@ -1036,7 +1036,7 @@ func Defaults() Parameters {
 		InCluster:  false,
 		Kubeconfig: filepath.Join(os.Getenv("HOME"), ".kube", "config"),
 		Server: ServerParameters{
-			XDSServerType: ContourServerType,
+			XDSServerType: EnvoyServerType,
 		},
 		IngressStatusAddress:       "",
 		AccessLogFormat:            DEFAULT_ACCESS_LOG_TYPE,

diff --git a/pkg/config/parameters_test.go b/pkg/config/parameters_test.go
@@ -48,7 +48,7 @@ func TestParseDefaults(t *testing.T) {
 debug: false
 kubeconfig: TestParseDefaults/.kube/config
 server:
-    xds-server-type: contour
+    xds-server-type: envoy
 accesslog-format: envoy
 json-fields:
     - '@timestamp'

diff --git a/site/content/docs/main/configuration.md b/site/content/docs/main/configuration.md
@@ -206,7 +206,7 @@ The server configuration block can be used to configure various settings for the
 
 | Field Name      | Type   | Default | Description                                                                   |
 | --------------- | ------ | ------- | ----------------------------------------------------------------------------- |
-| xds-server-type | string | contour | This field specifies the xDS Server to use. Options are `contour` or `envoy`. |
+| xds-server-type | string | envoy   | This field specifies the xDS Server to use. Options are `contour` or `envoy`. |
 
 ### Gateway Configuration
 
@@ -316,7 +316,7 @@ data:
     #
     # server:
     #   determine which XDS Server implementation to utilize in Contour.
-    #   xds-server-type: contour
+    #   xds-server-type: envoy
     #
     # specify the gateway-api Gateway Contour should configure
     # gateway: