This is an automated email from the ASF dual-hosted git repository.
manojvm pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract-cn-provisioner.git
The following commit(s) were added to refs/heads/develop by this push:
new bbbee37 Remove eureka & client side loadbalncing
new 51089b5 Merge pull request #19 from BLasan/remove-eureka
bbbee37 is described below
commit bbbee373388cce442272c055a435ccbf59c8a9a8
Author: BLasan <[email protected]>
AuthorDate: Fri May 27 17:44:31 2022 +0530
Remove eureka & client side loadbalncing
---
.../cn/provisioner/api/v1/client/Provisioner.java | 2 +-
.../fineract/cn/provisioner/AbstractServiceTest.java | 2 +-
.../tenant/TestTenantApplicationAssignment.java | 2 +-
service/build.gradle | 3 ++-
service/src/main/resources/application.yaml | 19 +++++++++++++++----
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git
a/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
b/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
index 7c0d27a..4f4ac23 100644
---
a/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
+++
b/api/src/main/java/org/apache/fineract/cn/provisioner/api/v1/client/Provisioner.java
@@ -42,7 +42,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Myrle Krantz
*/
@SuppressWarnings("unused")
-@FeignClient(name="provisioner-v1", path="/provisioner/v1",
configuration=CustomFeignClientsConfiguration.class)
+@FeignClient(path="/provisioner/v1",
url="http://${kubernetes.provisioner.service.name}:${kubernetes.provisioner.server.port}";,
configuration=CustomFeignClientsConfiguration.class)
public interface Provisioner {
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
index 4e1ce2a..084f7a0 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/AbstractServiceTest.java
@@ -46,7 +46,7 @@ public class AbstractServiceTest {
@Configuration
@EnableFeignClients(basePackages =
{"org.apache.fineract.cn.provisioner.api.v1.client"})
- @RibbonClient(name = APP_NAME)
+ // @RibbonClient(name = APP_NAME)
@Import({ProvisionerServiceConfig.class})
public static class TestConfiguration {
public TestConfiguration() {
diff --git
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
index 02b4605..c8507f3 100644
---
a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
+++
b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/TestTenantApplicationAssignment.java
@@ -95,7 +95,7 @@ public class TestTenantApplicationAssignment {
@Configuration
@EnableFeignClients(basePackages =
{"org.apache.fineract.cn.provisioner.api.v1.client"})
- @RibbonClient(name = APP_NAME)
+ // @RibbonClient(name = APP_NAME)
@Import({ProvisionerServiceConfig.class})
public static class TestConfiguration {
public TestConfiguration() {
diff --git a/service/build.gradle b/service/build.gradle
index 09003e6..e16aef2 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -46,7 +46,8 @@ bootRepackage {
dependencies {
compile(
[group: 'org.springframework.cloud', name:
'spring-cloud-starter-config'],
- [group: 'org.springframework.cloud', name:
'spring-cloud-starter-eureka'],
+ [group: 'org.springframework.boot', name:
'spring-boot-starter-web'],
+ // [group: 'org.springframework.cloud', name:
'spring-cloud-starter-eureka'],
[group: 'org.springframework.boot', name:
'spring-boot-starter-jetty'],
[group: 'org.springframework', name: 'spring-jms', version:
versions.springcontext],
[group: 'org.apache.activemq', name: 'activemq-broker', version:
versions.activeMQ],
diff --git a/service/src/main/resources/application.yaml
b/service/src/main/resources/application.yaml
index ef6a76a..61412c5 100644
--- a/service/src/main/resources/application.yaml
+++ b/service/src/main/resources/application.yaml
@@ -17,10 +17,10 @@
# under the License.
#
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
+#eureka:
+# client:
+# serviceUrl:
+# defaultZone: http://localhost:8761/eureka/
server:
port: 2020
@@ -51,3 +51,14 @@ spring:
url: jdbc:postgresql://localhost:5432/seshat
username: postgres
password: postgres
+
+kubernetes:
+ provisioner:
+ service:
+ name: provisioner-service
+ server:
+ port: 2020
+
+ribbon:
+ eureka:
+ enabled: false
