Remove eureka & client side loadbalancing
diff --git a/Dockerfile b/Dockerfile
index 0e45910..4e98f34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@
# under the License.
#
FROM openjdk:8-jdk-alpine AS builder
+
RUN mkdir builddir
COPY . builddir
WORKDIR builddir
diff --git a/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
index 0d5fb79..86be32f 100644
--- a/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/teller/api/v1/client/TellerManager.java
@@ -39,7 +39,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-@FeignClient(value = "teller-v1", path = "/teller/v1", configuration = CustomFeignClientsConfiguration.class)
+@FeignClient(path = "/teller/v1", url = "http://${kubernetes.teller.service.name}:${kubernetes.teller.server.port}", configuration = CustomFeignClientsConfiguration.class)
public interface TellerManager {
@RequestMapping(
diff --git a/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
index 02b6d01..271720f 100644
--- a/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
+++ b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java
@@ -63,7 +63,7 @@
@Configuration
@EnableEventRecording
@EnableFeignClients(basePackages = {"org.apache.fineract.cn.teller.api.v1.client"})
- @RibbonClient(name = APP_NAME)
+ // @RibbonClient(name = APP_NAME)
@Import({TellerConfiguration.class})
@ComponentScan("org.apache.fineract.cn.teller.listener")
public static class TestConfiguration {
diff --git a/service/build.gradle b/service/build.gradle
index 99a98a8..71715d6 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.boot', name: 'spring-boot-starter-jetty'],
[group: 'org.apache.fineract.cn.teller', name: 'api', version: project.version],
[group: 'org.apache.fineract.cn.office', name: 'api', version: versions.frameworkoffice],
diff --git a/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java b/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
index f26d33c..410b3fa 100644
--- a/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/TellerConfiguration.java
@@ -46,7 +46,7 @@
@SuppressWarnings("WeakerAccess")
@Configuration
@EnableAutoConfiguration
-@EnableDiscoveryClient
+// @EnableDiscoveryClient
@EnableAsync
@EnableTenantContext
@EnableCassandra
diff --git a/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
index 0a16743..6614566 100644
--- a/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
+++ b/service/src/main/java/org/apache/fineract/cn/teller/service/internal/service/helper/OrganizationService.java
@@ -44,6 +44,7 @@
public boolean officeExists(final String officeIdentifier) {
try {
this.organizationManager.findOfficeByIdentifier(officeIdentifier);
+ this.logger.info("Talked to office");
return true;
} catch (final NotFoundException nfex) {
this.logger.warn("Office {} not found.", officeIdentifier);
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index 56e1713..2c6eea7 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -17,19 +17,19 @@
# under the License.
#
-spring:
- cloud:
- discovery:
- enabled: false
- config:
- enabled: false
+#spring:
+# cloud:
+# discovery:
+# enabled: false
+# config:
+# enabled: false
-eureka:
- client:
- serviceUrl:
- defaultZone: http://localhost:8761/eureka/
- instance:
- homePageUrl: "http://${eureka.hostname}:2028/teller/v1/"
+# eureka:
+# client:
+# serviceUrl:
+# defaultZone: http://localhost:8761/eureka/
+# instance:
+# homePageUrl: "http://${eureka.hostname}:2028/teller/v1/"
server:
port: 2028
@@ -69,3 +69,39 @@
flyway:
enabled: false
+
+kubernetes:
+ teller:
+ service:
+ name: teller-service
+ server:
+ port: 2028
+ office:
+ service:
+ name: office-service
+ server:
+ port: 2023
+ accounting:
+ service:
+ name: accounting-service
+ server:
+ port: 2025
+ deposit:
+ service:
+ name: deposit-service
+ server:
+ port: 2027
+ cheque:
+ service:
+ name: cheques-service
+ server:
+ port: 2030
+ portfolio:
+ service:
+ name: portfolio-service
+ server:
+ port: 2026
+
+ribbon:
+ eureka:
+ enabled: false
