Expose ratelimit grpc authority field [1.14] (#9155)

* expose ratelimit grpc authority field * Update changelog/v1.17.0-beta8/ratelimit-grpc-authority.yaml * move into oneof --------- Co-authored-by: Nathan Fudenberg <[email protected]> Co-authored-by: soloio-bulldozer[bot] <48420018+soloio-bulldozer[bot]@users.noreply.github.com>
kgateway-dev · Feb 11, 2024 · 1b5ef13 · 1b5ef13
1 parent a38c127
commit 1b5ef13
Show file tree

Hide file tree

Showing 14 changed files with 421 additions and 97 deletions.
diff --git a/changelog/v1.14.29/ratelimit-grpc-authority.yaml b/changelog/v1.14.29/ratelimit-grpc-authority.yaml
@@ -0,0 +1,5 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/gloo/issues/8995
+    resolvesIssue: false
+    description: Expose a new ratelimit option `grpcService.authority` to configure the authority header for the ratelimit gRPC call.
diff --git a/...io/gloo/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto.sk.md b/...io/gloo/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto.sk.md
diff --git a/docs/data/ProtoMap.yaml b/docs/data/ProtoMap.yaml
@@ -1331,6 +1331,9 @@ apis:
   ratelimit.api.solo.io.SimpleDescriptor:
     relativepath: reference/api/github.com/solo-io/solo-apis/api/rate-limiter/v1alpha1/ratelimit.proto.sk/#SimpleDescriptor
     package: ratelimit.api.solo.io
+  ratelimit.options.gloo.solo.io.GrpcService:
+    relativepath: reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto.sk/#GrpcService
+    package: ratelimit.options.gloo.solo.io
   ratelimit.options.gloo.solo.io.IngressRateLimit:
     relativepath: reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto.sk/#IngressRateLimit
     package: ratelimit.options.gloo.solo.io

diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_Gateway.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_Gateway.yaml
@@ -962,6 +962,11 @@ spec:
                             type: boolean
                           enableXRatelimitHeaders:
                             type: boolean
+                          grpcService:
+                            properties:
+                              authority:
+                                type: string
+                            type: object
                           rateLimitBeforeAuth:
                             type: boolean
                           ratelimitServerRef:
@@ -2548,6 +2553,11 @@ spec:
                                       type: boolean
                                     enableXRatelimitHeaders:
                                       type: boolean
+                                    grpcService:
+                                      properties:
+                                        authority:
+                                          type: string
+                                      type: object
                                     rateLimitBeforeAuth:
                                       type: boolean
                                     ratelimitServerRef:

diff --git a/install/helm/gloo/crds/gateway.solo.io_v1_MatchableHttpGateway.yaml b/install/helm/gloo/crds/gateway.solo.io_v1_MatchableHttpGateway.yaml
@@ -957,6 +957,11 @@ spec:
                             type: boolean
                           enableXRatelimitHeaders:
                             type: boolean
+                          grpcService:
+                            properties:
+                              authority:
+                                type: string
+                            type: object
                           rateLimitBeforeAuth:
                             type: boolean
                           ratelimitServerRef:

diff --git a/install/helm/gloo/crds/gloo.solo.io_v1_Settings.yaml b/install/helm/gloo/crds/gloo.solo.io_v1_Settings.yaml
@@ -623,6 +623,11 @@ spec:
                     type: boolean
                   enableXRatelimitHeaders:
                     type: boolean
+                  grpcService:
+                    properties:
+                      authority:
+                        type: string
+                    type: object
                   rateLimitBeforeAuth:
                     type: boolean
                   ratelimitServerRef:

diff --git a/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto b/projects/gloo/api/v1/enterprise/options/ratelimit/ratelimit.proto
@@ -32,6 +32,16 @@ message Settings {
   // Set this is set to true if you would like to rate limit traffic before applying external auth to it.
   // *Note*: When this is true, you will lose some features like being able to rate limit a request based on its auth state
   bool rate_limit_before_auth = 9;
+
+  oneof service_type {
+    // Optional gRPC settings used when calling the ratelimit server.
+    GrpcService grpc_service = 10;
+  }
+}
+
+message GrpcService {
+  // Set the authority header when calling the gRPC service.
+  string authority = 1;
 }
 
 // API based on Envoy's rate-limit service API. (reference here: https://github.com/lyft/ratelimit#configuration)

diff --git a/projects/gloo/pkg/api/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go b/projects/gloo/pkg/api/v1/enterprise/options/ratelimit/ratelimit.pb.clone.go
diff --git a/projects/gloo/pkg/api/v1/enterprise/options/ratelimit/ratelimit.pb.equal.go b/projects/gloo/pkg/api/v1/enterprise/options/ratelimit/ratelimit.pb.equal.go