From e949bd15a356934bf3b7b49efa0837f5cfcd9c97 Mon Sep 17 00:00:00 2001
From: "data-plane-api(CircleCI)" <data-plane-api@users.noreply.github.com>
Date: Tue, 4 Dec 2018 16:52:34 +0000
Subject: [PATCH] ratelimit: remove deprecated cluster (#5185)

Signed-off-by: Rama Chavali <rama.rao@salesforce.com>

Mirrored from https://github.com/envoyproxy/envoy @ 96b575469dceb640e5f14e7e454f5ed0f91b3d2f
---
 envoy/config/ratelimit/v2/rls.proto | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/envoy/config/ratelimit/v2/rls.proto b/envoy/config/ratelimit/v2/rls.proto
index b84d530a..0c76ad83 100644
--- a/envoy/config/ratelimit/v2/rls.proto
+++ b/envoy/config/ratelimit/v2/rls.proto
@@ -11,22 +11,12 @@ import "validate/validate.proto";
 
 // Rate limit :ref:`configuration overview <config_rate_limit_service>`.
 message RateLimitServiceConfig {
-  oneof service_specifier {
-    option (validate.required) = true;
+  reserved 1;
 
-    // Specifies the cluster manager cluster name that hosts the rate limit
-    // service. The client will connect to this cluster when it needs to make
-    // rate limit service requests. This field is deprecated and `grpc_service`
-    // should be used instead. The :ref:`Envoy gRPC client
-    // <envoy_api_field_core.GrpcService.envoy_grpc>` will be used when this field is
-    // specified.
-    string cluster_name = 1 [(validate.rules).string.min_bytes = 1, deprecated = true];
-
-    // Specifies the gRPC service that hosts the rate limit service. The client
-    // will connect to this cluster when it needs to make rate limit service
-    // requests.
-    envoy.api.v2.core.GrpcService grpc_service = 2;
-  }
+  // Specifies the gRPC service that hosts the rate limit service. The client
+  // will connect to this cluster when it needs to make rate limit service
+  // requests.
+  envoy.api.v2.core.GrpcService grpc_service = 2 [(validate.rules).message.required = true];
 
   reserved 3;
 }