pull apply-rpc-server-integration

yorkie-team · May 30, 2023 · 82f90d5 · 82f90d5
1 parent e9337e9
commit 82f90d5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
@@ -26,7 +26,6 @@ services:
     ports:
       - '11101:11101'
       - '11102:11102'
-      - '11103:11103'
     depends_on:
       - mongo
   mongo:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -32,4 +32,3 @@ services:
     ports:
       - '11101:11101'
       - '11102:11102'
-      - '11103:11103'
diff --git a/docker/envoy-ci.yaml b/docker/envoy-ci.yaml
@@ -5,15 +5,14 @@ admin:
 
 static_resources:
   listeners:
-  - name: listener_0
+  - name: yorkie_rpc_listener
     address:
       socket_address: { address: 0.0.0.0, port_value: 8080 }
     filter_chains:
     - filters:
       - name: envoy.filters.network.http_connection_manager
         typed_config:
           "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-          codec_type: auto
           stat_prefix: ingress_http
           route_config:
             name: local_route
@@ -23,29 +22,29 @@ static_resources:
               routes:
               - match: { prefix: "/" }
                 route:
-                  cluster: yorkie_service
+                  cluster: yorkie_rpc_service
                   # https://github.com/grpc/grpc-web/issues/361
                   max_stream_duration:
                     grpc_timeout_header_max: 0s
               cors:
                 allow_origin_string_match:
                 - prefix: "*"
                 allow_methods: GET, PUT, DELETE, POST, OPTIONS
-                allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-api-key,x-shard-key,x-user-agent,x-grpc-web,grpc-timeout,authorization
+                allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-api-key,x-shard-key,x-user-agent,x-grpc-web,grpc-timeout,authorization,x-yorkie-user-agent
                 max_age: "1728000"
                 expose_headers: custom-header-1,grpc-status,grpc-message
           http_filters:
           - name: envoy.filters.http.grpc_web
           - name: envoy.filters.http.cors
           - name: envoy.filters.http.router
   clusters:
-  - name: yorkie_service
+  - name: yorkie_rpc_service
     connect_timeout: 0.25s
     type: logical_dns
     http2_protocol_options: {}
     lb_policy: round_robin
     load_assignment:
-      cluster_name: cluster_0
+      cluster_name: yorkie_cluster
       endpoints:
         - lb_endpoints:
             - endpoint:

diff --git a/docker/envoy.yaml b/docker/envoy.yaml
@@ -5,7 +5,7 @@ admin:
 
 static_resources:
   listeners:
-  - name: listener_0
+  - name: yorkie_rpc_listener
     address:
       socket_address: { address: 0.0.0.0, port_value: 8080 }
     filter_chains:
@@ -22,23 +22,23 @@ static_resources:
               routes:
               - match: { prefix: "/" }
                 route:
-                  cluster: yorkie_service
+                  cluster: yorkie_rpc_service
                   # https://github.com/grpc/grpc-web/issues/361
                   max_stream_duration:
                     grpc_timeout_header_max: 0s
               cors:
                 allow_origin_string_match:
                 - prefix: "*"
                 allow_methods: GET, PUT, DELETE, POST, OPTIONS
-                allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-api-key,x-shard-key,x-user-agent,x-grpc-web,grpc-timeout,authorization
+                allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-api-key,x-shard-key,x-user-agent,x-grpc-web,grpc-timeout,authorization,x-yorkie-user-agent
                 max_age: "1728000"
                 expose_headers: custom-header-1,grpc-status,grpc-message
           http_filters:
           - name: envoy.filters.http.grpc_web
           - name: envoy.filters.http.cors
           - name: envoy.filters.http.router
   clusters:
-  - name: yorkie_service
+  - name: yorkie_rpc_service
     connect_timeout: 0.25s
     type: logical_dns
     http2_protocol_options: {}
@@ -49,7 +49,7 @@ static_resources:
     # - Linux: an IP address of the host machine or docker-0 interface or some addresses defined in extra hosts of docker-compose.yml
     # you can simply use the yorkie container name(e.g. yorkie) in docker-compose whatever your OS is.
     load_assignment:
-      cluster_name: cluster_0
+      cluster_name: yorkie_cluster
       endpoints:
       - lb_endpoints:
         - endpoint: