Remove eureka & client side loadbalancing
diff --git a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java
index 6e9b0f4..647e172 100644
--- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java
@@ -34,7 +34,7 @@
import java.util.List;
@SuppressWarnings("unused")
-@FeignClient(value = "notification-v1", path = "/notification/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(path = "/notification/v1", url = "http://${kubernetes.notifications.service.name}:${kubernetes.notifications.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface NotificationManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java
index 01ed4b4..2342ea1 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java
@@ -101,7 +101,6 @@
@Configuration
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.notification.api.v1.client"})
- @RibbonClient(name = APP_NAME)
@ComponentScan({"org.apache.fineract.cn.notification.listener",
"org.apache.fineract.cn.notification.service.internal.service",
"org.apache.fineract.cn.notification.service.internal.service.externalServiceClients"
diff --git a/service/build.gradle b/service/build.gradle
index 3485dce..3f77576 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -53,7 +53,7 @@
[group: 'org.apache.fineract.cn.identity', name: 'api', version: versions.fineractcnidentity],
[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.notification', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis],
diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java
index 40a89e4..4797c96 100644
--- a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/config/NotificationConfiguration.java
@@ -59,7 +59,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
index 0de6ad4..86bd3f0 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -24,13 +24,6 @@
config:
enabled: false
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2033/notification/v1/"
-
server:
port: 2033
contextPath: /notification/v1/*
@@ -73,3 +66,24 @@
notification:
user: operator
password: init1@l
+
+kubernetes:
+ notifications:
+ service:
+ name: notifications-service
+ server:
+ port: 2033
+ customer:
+ service:
+ name: customer-service
+ server:
+ port: 2024
+ identity:
+ service:
+ name: identity-service
+ server:
+ port: 2021
+
+ribbon:
+ eureka:
+ enabled: false
