Remove eureka & client side loadbalancing
diff --git a/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java b/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
index a41a41e..b0480c0 100644
--- a/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
@@ -49,7 +49,7 @@
* @author Myrle Krantz
*/
@SuppressWarnings("unused")
-@FeignClient(name="identity-v1", path="/identity/v1", configuration=CustomFeignClientsConfiguration.class)
+@FeignClient(path="/identity/v1", url = "http://${kubernetes.identity.service.name}:${kubernetes.identity.server.port}", configuration=CustomFeignClientsConfiguration.class)
public interface IdentityManager extends Anubis {
String REFRESH_TOKEN = "Identity-RefreshToken";
@RequestMapping(value = "/token?grant_type=password", method = RequestMethod.POST,
diff --git a/service/build.gradle b/service/build.gradle
index fbe2c87..d405d0a 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -45,7 +45,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.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.hibernate', name: 'hibernate-validator', version: versions.hibernatevalidator],
[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
diff --git a/service/src/main/java/org/apache/fineract/cn/identity/config/IdentityServiceConfig.java b/service/src/main/java/org/apache/fineract/cn/identity/config/IdentityServiceConfig.java
index 6707d25..6b51b73 100644
--- a/service/src/main/java/org/apache/fineract/cn/identity/config/IdentityServiceConfig.java
+++ b/service/src/main/java/org/apache/fineract/cn/identity/config/IdentityServiceConfig.java
@@ -43,7 +43,6 @@
@Configuration
@EnableAutoConfiguration
@EnableWebMvc
-@EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index e570045..1b229dc 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -24,14 +24,6 @@
config:
enabled: false
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- registerWithEureka: false
- instance:
- homePageUrl: "http://${eureka.hostname}:2021/identity/v1/"
-
server:
port: 2021
contextPath: /identity/v1
@@ -72,3 +64,14 @@
identity:
passwordExpiresInDays: 93
timeToChangePasswordAfterExpirationInDays: 4
+
+kubernetes:
+ identity:
+ service:
+ name: identity-service
+ server:
+ port: 2021
+
+ribbon:
+ eureka:
+ enabled: false