Remove eureka & client side loadbalancing
diff --git a/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/CaseDocumentsManager.java b/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/CaseDocumentsManager.java
index b4f3655..b5a2be8 100644
--- a/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/CaseDocumentsManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/CaseDocumentsManager.java
@@ -30,7 +30,7 @@
* @author Myrle Krantz
*/
@SuppressWarnings("unused")
-@FeignClient(value = "portfolio-v1", path = "/portfolio/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(path = "/portfolio/v1", url = "http://${kubernetes.portfolio.service.name}:${kubernetes.portfolio.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface CaseDocumentsManager {
@RequestMapping(
value = "/individuallending/products/{productidentifier}/cases/{caseidentifier}/documents",
diff --git a/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/IndividualLending.java b/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/IndividualLending.java
index 1c578e7..a4ca928 100644
--- a/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/IndividualLending.java
+++ b/api/src/main/java/org/apache/fineract/cn/individuallending/api/v1/client/IndividualLending.java
@@ -37,7 +37,7 @@
* @author Myrle Krantz
*/
@SuppressWarnings("unused")
-@FeignClient (value = "portfolio-v1", path = "/portfolio/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient (path = "/portfolio/v1", url = "http://${kubernetes.portfolio.service.name}:${kubernetes.portfolio.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface IndividualLending {
@RequestMapping(
diff --git a/api/src/main/java/org/apache/fineract/cn/portfolio/api/v1/client/PortfolioManager.java b/api/src/main/java/org/apache/fineract/cn/portfolio/api/v1/client/PortfolioManager.java
index cc78099..69daee8 100644
--- a/api/src/main/java/org/apache/fineract/cn/portfolio/api/v1/client/PortfolioManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/portfolio/api/v1/client/PortfolioManager.java
@@ -51,7 +51,7 @@
* @author Myrle Krantz
*/
@SuppressWarnings("unused")
-@FeignClient(value = "portfolio-v1", path = "/portfolio/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(value = "${kubernetes.portfolio.service.name}", path = "/portfolio/v1", url = "http://${kubernetes.portfolio.service.name}:${kubernetes.portfolio.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface PortfolioManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/portfolio/AbstractPortfolioTest.java b/component-test/src/main/java/org/apache/fineract/cn/portfolio/AbstractPortfolioTest.java
index 5b4e472..a72b73e 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/portfolio/AbstractPortfolioTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/portfolio/AbstractPortfolioTest.java
@@ -100,7 +100,6 @@
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.portfolio.api.v1",
"org.apache.fineract.cn.individuallending.api.v1"})
- @RibbonClient(name = APP_NAME)
@Import({PortfolioServiceConfiguration.class})
@ComponentScan("org.apache.fineract.cn.portfolio.listener")
public static class TestConfiguration {
diff --git a/service/build.gradle b/service/build.gradle
index b30cd09..b5d7f58 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -44,7 +44,7 @@
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-spring-service-connector'],
[group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.apache.fineract.cn.portfolio', name: 'api', version: project.version],
diff --git a/service/src/main/java/org/apache/fineract/cn/portfolio/service/config/PortfolioServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/portfolio/service/config/PortfolioServiceConfiguration.java
index 1620ab8..7692988 100644
--- a/service/src/main/java/org/apache/fineract/cn/portfolio/service/config/PortfolioServiceConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/portfolio/service/config/PortfolioServiceConfiguration.java
@@ -49,7 +49,6 @@
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnablePostgreSQL
@@ -65,7 +64,6 @@
@EnableJpaRepositories(basePackages = "org.apache.fineract.cn.portfolio.service.internal.repository")
@EntityScan(basePackages = "org.apache.fineract.cn.portfolio.service.internal.repository")
@EnableFeignClients(clients = {LedgerManager.class, RhythmManager.class, CustomerManager.class})
-@RibbonClient(name = "portfolio-v1")
@EnableApplicationName
@Import(IndividualLendingConfiguration.class)
public class PortfolioServiceConfiguration extends WebMvcConfigurerAdapter {
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 6fb013c..84c5575 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -41,13 +41,6 @@
config:
enabled: false
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2026/portfolio/v1/"
-
server:
port: 2026
contextPath: /portfolio/v1/*
@@ -86,3 +79,29 @@
flyway:
enabled: false
+
+kubernetes:
+ portfolio:
+ service:
+ name: portfolio-service
+ server:
+ port: 2026
+ accounting:
+ service:
+ name: accounting-service
+ server:
+ port: 2025
+ customer:
+ service:
+ name: customer-service
+ server:
+ port: 2024
+ rhythm:
+ service:
+ name: rhythm-service
+ server:
+ port: 2022
+
+ribbon:
+ eureka:
+ enabled: false
