chore: 어드민 모듈 리버스 프록싱 v2 (#270)

* chore: nginx 리버스 프록시 설정 * chore: admin 모듈 컨테이너에 추가 * chore: 커넥션 풀 수 조정 * chore: nginx 수정 * chore: nginx 수정 * chore: blue 상태 핸들링 * chore: 엔드포인트 변경 * chore: dev nginx conf 수정 * chore: dev 브랜치 테스트
depromeet · Dec 3, 2024 · b17d50f · b17d50f
1 parent e912fb0
commit b17d50f
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 26 deletions.
diff --git a/.github/workflows/aws-cicd-dev.yml b/.github/workflows/aws-cicd-dev.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - develop
-      - feat/LA-20
+      - feat/LA-20_3
 
 env:
   REGISTRY: "docker.io"

diff --git a/.github/workflows/aws-cicd-prod.yml b/.github/workflows/aws-cicd-prod.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - chore/migration
 
 env:
   REGISTRY: "docker.io"

diff --git a/layer-admin/src/main/java/org/layer/member/controller/AdminMemberController.java b/layer-admin/src/main/java/org/layer/member/controller/AdminMemberController.java
@@ -10,7 +10,7 @@
 
 import lombok.RequiredArgsConstructor;
 
-@RequestMapping("/admin/members")
+@RequestMapping("/members")
 @RequiredArgsConstructor
 @RestController
 public class AdminMemberController implements AdminMemberApi {

diff --git a/layer-admin/src/main/resources/application-dev.yml b/layer-admin/src/main/resources/application-dev.yml
@@ -9,6 +9,9 @@ spring:
     username: ${AWS_PROD_DB_NAME}
     password: ${AWS_PROD_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5  # 최대 pool 크기
+      minimum-idle: 5  # 최소 pool 크기
   jpa:
     hibernate:
       ddl-auto: validate

diff --git a/layer-admin/src/main/resources/application-prod.yml b/layer-admin/src/main/resources/application-prod.yml
@@ -9,6 +9,9 @@ spring:
     username: ${AWS_PROD_DB_NAME}
     password: ${AWS_PROD_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5  # 최대 pool 크기
+      minimum-idle: 5  # 최소 pool 크기
   jpa:
     hibernate:
       ddl-auto: validate

diff --git a/layer-api/infra/development/nginx.conf b/layer-api/infra/development/nginx.conf
@@ -9,8 +9,10 @@ http {
         server layer-admin:3000;
     }
 
+    # api.layerapp.io에 대한 서버 블록
     server {
         listen 80;
+        server_name api.layerapp.io;
 
         location / {
             proxy_pass http://layer-api;
@@ -19,9 +21,15 @@ http {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
         }
+    }
 
-        location /admin/ {
-            proxy_pass http://layer-admin; # Proxy to layer-admin
+    # admin.api.layerapp.io에 대한 서버 블록
+    server {
+        listen 80;
+        server_name admin-dev.layerapp.io;
+
+        location / {
+            proxy_pass http://layer-admin;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

diff --git a/layer-api/infra/production/docker-compose-blue.yaml b/layer-api/infra/production/docker-compose-blue.yaml
@@ -29,5 +29,23 @@ services:
       - layer-api-blue
     restart: always
 
+  admin-app-blue:
+    image: docker.io/clean01/layer-server_layer-admin:latest #
+    container_name: layer-admin-blue
+    ports:
+      - "3001:3000"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=prod
+    volumes:
+      - ./application-secret.properties:/config/application-secret.properties
+      - ./log:/log
+      - ./tokens:/config/tokens
+    networks:
+      - app-network
+    depends_on:
+      - layer-api-blue
+    restart: always
+
 networks:
   app-network:
diff --git a/layer-api/infra/production/docker-compose-green.yaml b/layer-api/infra/production/docker-compose-green.yaml
@@ -29,5 +29,23 @@ services:
       - layer-api-green
     restart: always
 
+  admin-app-green:
+    image: docker.io/clean01/layer-server_layer-admin:latest #
+    container_name: layer-admin-green
+    ports:
+      - "3000:3000"
+    environment:
+      - TZ=Asia/Seoul
+      - SPRING_PROFILES_ACTIVE=prod
+    volumes:
+      - ./application-secret.properties:/config/application-secret.properties
+      - ./log:/log
+      - ./tokens:/config/tokens
+    networks:
+      - app-network
+    depends_on:
+      - layer-api-green
+    restart: always
+
 networks:
   app-network:
diff --git a/layer-api/infra/production/nginx.blue.conf b/layer-api/infra/production/nginx.blue.conf
@@ -5,8 +5,14 @@ http {
         server localhost:8081;
     }
 
+    upstream layer-admin {
+        server localhost:3001;
+    }
+
+    # api.layerapp.io에 대한 서버 블록
     server {
         listen 80;
+        server_name api.layerapp.io;
 
         location / {
             proxy_pass http://layer-api;
@@ -16,4 +22,18 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
     }
-}
+
+    # admin.api.layerapp.io에 대한 서버 블록
+    server {
+        listen 80;
+        server_name admin-prod.layerapp.io;
+
+        location / {
+            proxy_pass http://layer-admin;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+}
diff --git a/layer-api/infra/production/nginx.conf b/layer-api/infra/production/nginx.conf
diff --git a/layer-api/infra/production/nginx.green.conf b/layer-api/infra/production/nginx.green.conf
@@ -5,8 +5,14 @@ http {
         server localhost:8080;
     }
 
+    upstream layer-admin {
+        server localhost:3000;
+    }
+
+    # api.layerapp.io에 대한 서버 블록
     server {
         listen 80;
+        server_name api.layerapp.io;
 
         location / {
             proxy_pass http://layer-api;
@@ -16,4 +22,18 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
     }
-}
+
+    # admin.api.layerapp.io에 대한 서버 블록
+    server {
+        listen 80;
+        server_name admin-prod.layerapp.io;
+
+        location / {
+            proxy_pass http://layer-admin;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+    }
+}
diff --git a/layer-batch/src/main/resources/application.yml b/layer-batch/src/main/resources/application.yml
@@ -9,6 +9,9 @@ spring:
     username: ${AWS_PROD_DB_NAME}
     password: ${AWS_PROD_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      maximum-pool-size: 5  # 최대 pool 크기
+      minimum-idle: 5  # 최소 pool 크기
   jpa:
     hibernate:
       ddl-auto: validate
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       push:
         branches:
           - main
-          - chore/migration
     env:
       REGISTRY: "docker.io"
@@ Expand Down @@