Update cluster names and timeout

supabase · Dec 1, 2023 · 76e1746 · 76e1746
1 parent f5aeac6
commit 76e1746
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/ansible/files/envoy_config/cds.yaml b/ansible/files/envoy_config/cds.yaml
@@ -1,8 +1,8 @@
 resources:
   - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
-    name: admin-api
+    name: admin_api
     load_assignment:
-      cluster_name: admin-api
+      cluster_name: admin_api
       endpoints:
         - lb_endpoints:
             - endpoint:
@@ -38,9 +38,9 @@ resources:
                     address: 127.0.0.1
                     port_value: 3000
   - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
-    name: postgrest-admin
+    name: postgrest_admin
     load_assignment:
-      cluster_name: postgrest-admin
+      cluster_name: postgrest_admin
       endpoints:
         - lb_endpoints:
             - endpoint:

diff --git a/ansible/files/envoy_config/lds.yaml b/ansible/files/envoy_config/lds.yaml
@@ -158,6 +158,7 @@ resources:
                         route:
                           cluster: postgrest
                           prefix_rewrite: /
+                          timeout: 2m
                         typed_per_filter_config:
                           envoy.filters.http.lua:
                             '@type': >-
@@ -170,6 +171,7 @@ resources:
                         route:
                           cluster: postgrest
                           prefix_rewrite: /
+                          timeout: 2m
                       - match:
                           prefix: /rest-admin/v1/
                           query_parameters:
@@ -178,7 +180,7 @@ resources:
                         request_headers_to_remove:
                           - apikey
                         route:
-                          cluster: postgrest-admin
+                          cluster: postgrest_admin
                           prefix_rewrite: /
                         typed_per_filter_config:
                           envoy.filters.http.lua:
@@ -190,26 +192,27 @@ resources:
                         request_headers_to_remove:
                           - apikey
                         route:
-                          cluster: postgrest-admin
+                          cluster: postgrest_admin
                           prefix_rewrite: /
                       - match:
                           path: /graphql/v1
                         request_headers_to_add:
                           header:
                             key: Content-Profile
                             value: graphql_public
+                            timeout: 2m
                         route:
                           cluster: postgrest
                           prefix_rewrite: /rpc/graphql
                       - match:
                           prefix: /admin/v1/
                         route:
-                          cluster: admin-api
+                          cluster: admin_api
                           prefix_rewrite: /
                       - match:
                           prefix: /customer/v1/privileged/
                         route:
-                          cluster: admin-api
+                          cluster: admin_api
                           prefix_rewrite: /privileged/
                         typed_per_filter_config:
                           envoy.filters.http.lua:
@@ -224,7 +227,7 @@ resources:
                       - match:
                           prefix: /metrics/aggregated
                         route:
-                          cluster: admin-api
+                          cluster: admin_api
                           prefix_rewrite: /supabase-internal/metrics
                         typed_per_filter_config:
                           envoy.filters.http.rbac:
@@ -262,3 +265,4 @@ resources:
                     filename: /etc/kong/fullChain.pem
                   private_key:
                     filename: /etc/kong/privKey.pem
+