Merge pull request #130 from AET-DevOps25/feature/unify-app-ports

Unify service ports

Author: esadakcam

client/nginx.conf

@@ -16,7 +16,7 @@ server {
     }
 
     location /api/ {
-        proxy_pass http://apigw-service/;
+        proxy_pass http://apigw-service:8080/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

docker-compose.yml

@@ -66,7 +66,7 @@ services:
     volumes:
       - qdrant_storage:/qdrant/storage
 
-  mongodb:
+  mongodb-service:
     image: mongo:8.0
     container_name: mongodb
     ports:
@@ -92,7 +92,7 @@ services:
       - ME_CONFIG_BASICAUTH_USERNAME=admin
       - ME_CONFIG_BASICAUTH_PASSWORD=admin
     depends_on:
-      - mongodb
+      - mongodb-service
     restart: unless-stopped
 
   prometheus:

recipai-chart/templates/genai/genai-service.yml

@@ -7,5 +7,5 @@ spec:
     app: genai
   ports:
     - protocol: TCP
-      port: 80
+      port: 8000
       targetPort: genai-api

recipai-chart/templates/prometheus/prometheus-configmap.yml

@@ -15,16 +15,16 @@ data:
           - targets: ['node-exporter-prometheus-node-exporter:9100']
       - job_name: 'genai-service'
         static_configs:
-          - targets: ['genai-service:80']
+          - targets: ['genai-service:8000']
       - job_name: 'api-gw'
         metrics_path: '/actuator/prometheus'
         static_configs:
-          - targets: ['apigw-service:80']
+          - targets: ['apigw-service:8080']
       - job_name: 'chat'
         metrics_path: '/actuator/prometheus'
         static_configs:
-          - targets: ['chat-service:80']
+          - targets: ['chat-service:8082']
       - job_name: 'user'
         metrics_path: '/actuator/prometheus'
         static_configs:
-          - targets: ['user-service:80']
+          - targets: ['user-service:8081']

recipai-chart/templates/server/apigw-service.yml

@@ -7,5 +7,5 @@ spec:
     app: apigw
   ports:
     - protocol: TCP
-      port: 80
+      port: 8080
       targetPort: apigw-api

recipai-chart/templates/server/chat-service.yml

@@ -7,5 +7,5 @@ spec:
     app: chat
   ports:
     - protocol: TCP
-      port: 80
+      port: 8082
       targetPort: chat-api

recipai-chart/templates/server/user-service.yml

@@ -7,5 +7,5 @@ spec:
     app: user
   ports:
     - protocol: TCP
-      port: 80
+      port: 8081
       targetPort: user-api

server/api-gw/src/main/resources/application.yaml

@@ -8,15 +8,15 @@ spring:
       mvc:
         routes:
           - id: genai
-            uri: http://genai-service
+            uri: http://genai-service:8000
             predicates:
               - Path=/genai/**
           - id: user
-            uri: http://user-service
+            uri: http://user-service:8081
             predicates:
               - Path=/user/**
           - id: chat
-            uri: http://chat-service
+            uri: http://chat-service:8082
             predicates:
               - Path=/chat/**
   security:

server/chat/src/main/java/com/continiousdisappointment/chat/service/GenAiService.java

@@ -13,7 +13,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-
 import java.util.Arrays;
 import java.util.List;
 
@@ -35,9 +34,8 @@ public String generateAssistantReply(String query, List<GenAiMessage> messages)
             ResponseEntity<GenAiResponse> response = restTemplate.postForEntity(
                     getGenAiServiceUrl() + "/genai/generate",
                     entity,
-                    GenAiResponse.class
-            );
-            log.info("GenAI service is called with reponse {} ", response.getBody().response());
+                    GenAiResponse.class);
+            log.info("GenAI service is called with response {} ", response.getBody().response());
             return response.getBody().response();
 
         } catch (Exception e) {
@@ -50,6 +48,6 @@ private String getGenAiServiceUrl() {
         if (Arrays.asList(environment.getActiveProfiles()).contains("dev")) {
             return "http://localhost:8000";
         }
-        return "http://genai-service";
+        return "http://genai-service:8000";
     }
 }

server/chat/src/main/java/com/continiousdisappointment/chat/service/UserService.java

@@ -36,6 +36,6 @@ private String getUserServiceUrl() {
         if (Arrays.asList(environment.getActiveProfiles()).contains("dev")) {
             return "http://localhost:8081/user/info";
         }
-        return "http://user-service/user/info";
+        return "http://user-service:8081/user/info";
     }
 }