From c321879d1eb588ed894f3fa995125a0c0b8c62d4 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 8 Sep 2021 11:47:44 -0400 Subject: [PATCH] Revert "Merge pull request #10618 from hashicorp/dnephin/docs-add-deprecation-version-grpc-port" This reverts commit 81bb5f33ebb33d1084fcc50aab62950eb7ddebc8, reversing changes made to 20feb42d3a663e72cb46cda6c08c0588f5bbf3b4. --- website/content/docs/agent/options.mdx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/docs/agent/options.mdx b/website/content/docs/agent/options.mdx index 81d0680f0e..ebc2a10ad3 100644 --- a/website/content/docs/agent/options.mdx +++ b/website/content/docs/agent/options.mdx @@ -242,8 +242,8 @@ The options below are all specified on the command-line. - `-xds-port` - the xDS gRPC port to listen on. Default -1 (disabled). See [ports](#ports) documentation for more detail. -- `-grpc-port` ((#\_grpc_port)) - **Deprecated in Consul 1.11**. - Use `-xds-port` instead. The xDS gRPC port to listen on. Default +- `-grpc-port` ((#\_grpc_port)) - Deprecated, use `-xds-port` instead. + The xDS gRPC port to listen on. Default -1 (disabled). See [ports](#ports) documentation for more detail. - `-hcl` ((#\_hcl)) - A HCL configuration fragment. This HCL configuration @@ -808,7 +808,7 @@ Valid time units are 'ns', 'us' (or 'µs'), 'ms', 's', 'm', 'h'." - `http` - The HTTP API. Defaults to `client_addr` - `https` - The HTTPS API. Defaults to `client_addr` - `xds` - The xDS gRPC API. Defaults to `client_addr` - - `grpc` - **Deprecated in Consul 1.11**. Use `xds` instead. The xDS gRPC API. Defaults to `client_addr` + - `grpc` - Deprecated: use `xds` instead. The xDS gRPC API. Defaults to `client_addr` - `advertise_addr` Equivalent to the [`-advertise` command-line flag](#_advertise). @@ -1708,7 +1708,7 @@ bind_addr = "{{ GetPrivateInterfaces | include \"network\" \"10.0.0.0/8\" | attr automatically with this. This is set to `8502` by default when the agent runs in `-dev` mode. Currently xDS is only used to expose Envoy xDS API to Envoy proxies. - - `grpc` ((#grpc_port)) - **Deprecated in Consul 1.11**. Use `xds` instead. + - `grpc` ((#grpc_port)) - Deprecated: use `xds` instead. The xDS gRPC API, -1 to disable. Default -1 (disabled). **We recommend using `8502`** for `xds` by convention as some tooling will work automatically with this. This is set to `8502` by default when the agent runs