diff --git a/docker-compose.yaml b/docker-compose.yaml index c8d22b29..f653a8af 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -128,8 +128,8 @@ services: - LOGGING_LEVEL_ROOT=WARN ports: - "8080:8080" - volumes: - - ./config:/config +# volumes: +# - ./config:/config depends_on: - redis - spot-user @@ -152,8 +152,6 @@ services: - DB_HOST=db - KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가 - LOGGING_LEVEL_ROOT=WARN - volumes: - - ./config:/config depends_on: - db - redis @@ -176,8 +174,6 @@ services: - DB_HOST=db - KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가 - LOGGING_LEVEL_ROOT=WARN - volumes: - - ./config:/config depends_on: - db - redis @@ -196,8 +192,6 @@ services: - DB_HOST=db - KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가 - LOGGING_LEVEL_ROOT=WARN - volumes: - - ./config:/config depends_on: - db - redis @@ -217,8 +211,6 @@ services: - DB_HOST=db - KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가 - LOGGING_LEVEL_ROOT=WARN - volumes: - - ./config:/config depends_on: - db - redis diff --git a/infra/k8s/base/configmap.yaml b/infra/k8s/base/configmap.yaml index 7e37eb0e..d5c99e8b 100644 --- a/infra/k8s/base/configmap.yaml +++ b/infra/k8s/base/configmap.yaml @@ -8,7 +8,7 @@ data: SPRING_DATASOURCE_USERNAME: "admin" SPRING_DATA_REDIS_HOST: "redis" SPRING_DATA_REDIS_PORT: "6379" - KAFKA_BOOTSTRAP_SERVERS: "kafka:9092" + KAFKA_BOOTSTRAP_SERVERS: "kafka-svc:9092" --- apiVersion: v1 kind: Secret @@ -18,7 +18,7 @@ metadata: type: Opaque stringData: SPRING_DATASOURCE_PASSWORD: "secret" - JWT_SECRET: "jmXDQDnLqV+lOaPKMR06v4+RQ7aj2cj8LR+zgPOlz/GS989tptPtAmIpyaZHrsLOPqKoVtPus28YeXZTL8O8nw==" + SPRING_JWT_SECRET: "jmXDQDnLqV+lOaPKMR06v4+RQ7aj2cj8LR+zgPOlz/GS989tptPtAmIpyaZHrsLOPqKoVtPus28YeXZTL8O8nw==" TOSS_SECRET_KEY: "test_sk_E92LAa5PVb91Y01y1nXZ37YmpXyJ" --- apiVersion: v1 diff --git a/infra/k8s/base/fluent-bit.yaml b/infra/k8s/base/fluent-bit.yaml index 3dad9289..9a32036b 100644 --- a/infra/k8s/base/fluent-bit.yaml +++ b/infra/k8s/base/fluent-bit.yaml @@ -62,11 +62,11 @@ spec: mountPath: /fluent-bit/etc/ resources: requests: - cpu: "250m" - memory: "256Mi" + cpu: "10m" + memory: "25Mi" limits: - cpu: "500m" - memory: "512Mi" + cpu: "100m" + memory: "100Mi" volumes: - name: varlog hostPath: diff --git a/infra/k8s/base/kafka.yaml b/infra/k8s/base/kafka.yaml index 2f6a53e9..b7339a8f 100644 --- a/infra/k8s/base/kafka.yaml +++ b/infra/k8s/base/kafka.yaml @@ -41,7 +41,7 @@ spec: - name: KAFKA_LISTENERS value: "INTERNAL://0.0.0.0:29092,EXTERNAL://0.0.0.0:9092,CONTROLLER://0.0.0.0:19093" - name: KAFKA_ADVERTISED_LISTENERS - value: "INTERNAL://kafka:29092,EXTERNAL://kafka:9092" + value: "INTERNAL://kafka-svc:29092,EXTERNAL://kafka-svc:9092" - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP value: "INTERNAL:PLAINTEXT,EXTERNAL:PLAINTEXT,CONTROLLER:PLAINTEXT" - name: KAFKA_INTER_BROKER_LISTENER_NAME @@ -82,7 +82,7 @@ spec: apiVersion: v1 kind: Service metadata: - name: kafka + name: kafka-svc namespace: spot spec: selector: diff --git a/spot-gateway/src/main/resources/application.yml b/spot-gateway/src/main/resources/application.yml index 8fce1703..3451e401 100644 --- a/spot-gateway/src/main/resources/application.yml +++ b/spot-gateway/src/main/resources/application.yml @@ -3,7 +3,8 @@ spring: name: spot-gateway config: import: - # bootRun용 + # bootRun - optional:classpath:/spot-gateway.yml + # docker-compose - optional:file:/config/spot-gateway.yml \ No newline at end of file diff --git a/spot-order/src/main/resources/application.yml b/spot-order/src/main/resources/application.yml index c3b3e882..b6453c49 100644 --- a/spot-order/src/main/resources/application.yml +++ b/spot-order/src/main/resources/application.yml @@ -3,7 +3,12 @@ spring: name: spot-order config: import: - - optional:file:../config/common.yml - - optional:file:../config/kafka-topics.yml - - optional:file:../config/application-secret.yml - - optional:file:../config/spot-order.yml \ No newline at end of file + # bootRun + - optional:classpath:/common.yml + - optional:classpath:/kafka-topics.yml + - optional:classpath:/spot-order.yml + + # docker-compose + - optional:file:/config/common.yml + - optional:file:/config/kafka-topics.yml + - optional:file:/config/spot-order.yml \ No newline at end of file diff --git a/spot-payment/src/main/resources/application.yml b/spot-payment/src/main/resources/application.yml index a43c8114..713d62fd 100644 --- a/spot-payment/src/main/resources/application.yml +++ b/spot-payment/src/main/resources/application.yml @@ -4,12 +4,11 @@ spring: config: import: # bootRun - - optional:file:../config/common.yml - - optional:file:../config/kafka-topics.yml - - optional:file:../config/application-secret.yml - - optional:file:../config/spot-payment.yml + - optional:classpath:/common.yml + - optional:classpath:/kafka-topics.yml + - optional:classpath:/spot-payment.yml # docker-compose - optional:file:/config/common.yml - - optional:file:/config/spot-payment.yml - - optional:file:/config/application-secret.yml \ No newline at end of file + - optional:file:/config/kafka-topics.yml + - optional:file:/config/spot-payment.yml \ No newline at end of file diff --git a/spot-store/src/main/resources/application.yml b/spot-store/src/main/resources/application.yml index f9036e7d..005eb18a 100644 --- a/spot-store/src/main/resources/application.yml +++ b/spot-store/src/main/resources/application.yml @@ -4,12 +4,12 @@ spring: config: import: # bootRun - - optional:file:../config/common.yml - - optional:file:../config/kafka-topics.yml - - optional:file:../config/application-secret.yml - - optional:file:../config/spot-store.yml + # bootRun + - optional:classpath:/common.yml + - optional:classpath:/kafka-topics.yml + - optional:classpath:/spot-store.yml # docker-compose - optional:file:/config/common.yml - - optional:file:/config/spot-store.yml - - optional:file:/config/application-secret.yml \ No newline at end of file + - optional:file:/config/kafka-topics.yml + - optional:file:/config/spot-store.yml \ No newline at end of file