Merge pull request #18 from BLasan/remove-eureka

Removed Eureka Client Side Load Balancing
apache · Jun 2, 2022 · c3bf9ab · c3bf9ab
2 parents 0380611 + 8974eb1
commit c3bf9ab
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java b/api/src/main/java/org/apache/fineract/cn/payroll/api/v1/client/PayrollManager.java
@@ -37,7 +37,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 @SuppressWarnings("unused")
-@FeignClient(name="payroll-v1", path="/payroll/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(path="/payroll/v1", url = "http://${kubernetes.payroll.service.name}:${kubernetes.payroll.server.port}", configuration = CustomFeignClientsConfiguration.class)
 public interface PayrollManager {
 
   @RequestMapping(

diff --git a/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java
@@ -54,7 +54,6 @@ public class AbstractPayrollTest extends SuiteTestEnvironment {
   @EnableFeignClients(basePackages = {
       "org.apache.fineract.cn.payroll.api.v1.client"
   })
-  @RibbonClient(name = SuiteTestEnvironment.APP_NAME)
   @ComponentScan(
       basePackages = {
           "org.apache.fineract.cn.payroll.listener"

diff --git a/service/build.gradle b/service/build.gradle
@@ -44,7 +44,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.apache.fineract.cn.payroll', name: 'api', version: project.version],
             [group: 'org.apache.fineract.cn.accounting', name: 'api', version: versions.frameworkaccounting],

diff --git a/...ice/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java b/...ice/src/main/java/org/apache/fineract/cn/payroll/service/PayrollServiceConfiguration.java
@@ -42,7 +42,6 @@
 @SuppressWarnings("WeakerAccess")
 @Configuration
 @EnableAutoConfiguration
-@EnableDiscoveryClient
 @EnableAsync
 @EnableTenantContext
 @EnableCassandra

diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
@@ -24,13 +24,6 @@ spring:
     config:
       enabled: false
 
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-  instance:
-    homePageUrl: "http://${eureka.hostname}:2031/payroll/v1/"
-
 server:
   port: 2031
   contextPath: /payroll/v1/*
@@ -69,3 +62,24 @@ async:
 
 flyway:
   enabled: false
+
+kubernetes:
+  payroll:
+    service:
+      name: payroll-service
+    server:
+      port: 2031
+  accounting:
+    service:
+      name: accounting-service
+    server:
+      port: 2025
+  customer:
+    service:
+      name: customer-service
+    server:
+      port: 2024
+
+ribbon:
+  eureka:
+    enabled: false