You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ma...@apache.org on 2022/05/27 16:45:06 UTC
[fineract-cn-office] branch develop updated: Remove eureka & client side loadbalancer
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-office.git
The following commit(s) were added to refs/heads/develop by this push:
new acfc6c5 Remove eureka & client side loadbalancer
new e2c3df2 Merge pull request #19 from BLasan/remove-eureka
acfc6c5 is described below
commit acfc6c5160787e8452811d380ca14ab7a8d2c328
Author: BLasan <be...@gmail.com>
AuthorDate: Fri May 27 22:13:16 2022 +0530
Remove eureka & client side loadbalancer
---
.../office/api/v1/client/OrganizationManager.java | 2 +-
.../fineract/cn/office/AbstractOfficeTest.java | 1 -
service/build.gradle | 2 +-
.../rest/config/OfficeRestConfiguration.java | 1 -
service/src/main/resources/application.yml | 28 ++++++++++++----------
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
index 9fba240..0077a49 100644
--- a/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/office/api/v1/client/OrganizationManager.java
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@SuppressWarnings("unused")
-@FeignClient(name="office-v1", path="/office/v1", configuration=CustomFeignClientsConfiguration.class)
+@FeignClient(path="/office/v1", url = "http://${kubernetes.office.service.name}:${kubernetes.office.server.port}", configuration=CustomFeignClientsConfiguration.class)
public interface OrganizationManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java b/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
index f2cd858..bf28ed2 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/office/AbstractOfficeTest.java
@@ -103,7 +103,6 @@ public class AbstractOfficeTest extends SuiteTestEnvironment {
basePackages = "org.apache.fineract.cn.office.listener"
)
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.office.api.v1.client"})
- @RibbonClient(name = APP_NAME)
@EnableEventRecording(maxWait = 5000L)
@Import({OfficeRestConfiguration.class})
public static class TestConfiguration {
diff --git a/service/build.gradle b/service/build.gradle
index bfd04a5..5ee28cd 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -45,7 +45,7 @@ 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.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator],
[group: 'org.apache.fineract.cn.office', name: 'api', version: project.version],
diff --git a/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java b/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java
index 30ba0f1..f2e16bf 100644
--- a/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/office/rest/config/OfficeRestConfiguration.java
@@ -39,7 +39,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 6dbdb05..8032d1e 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -18,18 +18,11 @@
#
spring:
- cloud:
- discovery:
- enabled: false
- config:
- enabled: false
-
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2023/office/v1/"
+ cloud:
+ discovery:
+ enabled: false
+ config:
+ enabled: false
server:
port: 2023
@@ -69,3 +62,14 @@ async:
flyway:
enabled: false
+
+kubernetes:
+ office:
+ service:
+ name: office-service
+ server:
+ port: 2023
+
+ribbon:
+ eureka:
+ enabled: false