You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/09/07 19:52:53 UTC
[airavata-data-lake] branch master updated: make drms rest proxy to
global
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new 12d6c39 make drms rest proxy to global
new 7f2bb89 Merge pull request #58 from isururanawaka/sharing_service_impl
12d6c39 is described below
commit 12d6c395cdfa04663bf7c92c328b5474f34b3a2a
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Sep 7 15:51:51 2021 -0400
make drms rest proxy to global
---
.../Dockerfile | 0
.../pom.xml | 0
.../src/main/resources/README.MD | 0
.../src/main/resources/drms.pb | Bin 116769 -> 116769 bytes
.../src/main/resources/envoy.yaml | 22 ++++++++++++++++-----
.../src/main/resources/generator.txt | 0
6 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/data-resource-management-service/drms-rest-proxy/Dockerfile b/datalake-rest-proxy/Dockerfile
similarity index 100%
rename from data-resource-management-service/drms-rest-proxy/Dockerfile
rename to datalake-rest-proxy/Dockerfile
diff --git a/data-resource-management-service/drms-rest-proxy/pom.xml b/datalake-rest-proxy/pom.xml
similarity index 100%
rename from data-resource-management-service/drms-rest-proxy/pom.xml
rename to datalake-rest-proxy/pom.xml
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/README.MD b/datalake-rest-proxy/src/main/resources/README.MD
similarity index 100%
rename from data-resource-management-service/drms-rest-proxy/src/main/resources/README.MD
rename to datalake-rest-proxy/src/main/resources/README.MD
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb b/datalake-rest-proxy/src/main/resources/drms.pb
similarity index 99%
rename from data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb
rename to datalake-rest-proxy/src/main/resources/drms.pb
index 1295ce9..c66584f 100644
Binary files a/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb and b/datalake-rest-proxy/src/main/resources/drms.pb differ
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml b/datalake-rest-proxy/src/main/resources/envoy.yaml
similarity index 65%
rename from data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml
rename to datalake-rest-proxy/src/main/resources/envoy.yaml
index b2eb1e2..032da71 100644
--- a/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml
+++ b/datalake-rest-proxy/src/main/resources/envoy.yaml
@@ -20,13 +20,15 @@ static_resources:
- name: local_service
domains: ["*"]
routes:
- - match: { prefix: "/", grpc: {} }
- route: { cluster: grpc-backend-services, timeout: { seconds: 60 } }
+ - match: { prefix: "/v1.0/api/drms/", grpc: {} }
+ route: { cluster: grpc-drms-service, timeout: { seconds: 60 } }
+ - match: { prefix: "/v1.0/api/dataorch/", grpc: { } }
+ route: { cluster: grpc-dataorch-service, timeout: { seconds: 60 } }
http_filters:
- name: envoy.grpc_json_transcoder
config:
proto_descriptor: "/data/drms.pb"
- services: ["org.apache.airavata.datalake.drms.storage.StoragePreferenceService",
+ services: ["org.apache.airavata.datalake.drms.storage.StoragePreferenceService","org.apache.airavata.datalake.data.orchestrator.api.stub.notification.NotificationService",
"org.apache.airavata.datalake.drms.storage.ResourceService","org.apache.airavata.datalake.drms.storage.StorageService"]
convert_grpc_status: true
print_options:
@@ -36,7 +38,7 @@ static_resources:
preserve_proto_field_names: false
- name: envoy.router
clusters:
- - name: grpc-backend-services
+ - name: grpc-drms-service
connect_timeout: 1.25s
type: logical_dns
lb_policy: round_robin
@@ -45,4 +47,14 @@ static_resources:
hosts:
- socket_address:
address: host.docker.internal
- port_value: 7070
\ No newline at end of file
+ port_value: 7070
+ - name: grpc-dataorch-service
+ connect_timeout: 1.25s
+ type: logical_dns
+ lb_policy: round_robin
+ dns_lookup_family: V4_ONLY
+ http2_protocol_options: { }
+ hosts:
+ - socket_address:
+ address: host.docker.internal
+ port_value: 8899
\ No newline at end of file
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/generator.txt b/datalake-rest-proxy/src/main/resources/generator.txt
similarity index 100%
rename from data-resource-management-service/drms-rest-proxy/src/main/resources/generator.txt
rename to datalake-rest-proxy/src/main/resources/generator.txt