Skip to content
Closed
12 changes: 2 additions & 10 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ services:
- LOGGING_LEVEL_ROOT=WARN
ports:
- "8080:8080"
volumes:
- ./config:/config
# volumes:
# - ./config:/config
depends_on:
- redis
- spot-user
Expand All @@ -152,8 +152,6 @@ services:
- DB_HOST=db
- KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가
- LOGGING_LEVEL_ROOT=WARN
volumes:
- ./config:/config
depends_on:
- db
- redis
Expand All @@ -176,8 +174,6 @@ services:
- DB_HOST=db
- KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가
- LOGGING_LEVEL_ROOT=WARN
volumes:
- ./config:/config
depends_on:
- db
- redis
Expand All @@ -196,8 +192,6 @@ services:
- DB_HOST=db
- KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가
- LOGGING_LEVEL_ROOT=WARN
volumes:
- ./config:/config
depends_on:
- db
- redis
Expand All @@ -217,8 +211,6 @@ services:
- DB_HOST=db
- KAFKA_BOOTSTRAP_SERVERS=kafka:29092 # 필요 시 추가
- LOGGING_LEVEL_ROOT=WARN
volumes:
- ./config:/config
depends_on:
- db
- redis
Expand Down
4 changes: 2 additions & 2 deletions infra/k8s/base/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions infra/k8s/base/fluent-bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions infra/k8s/base/kafka.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -82,7 +82,7 @@ spec:
apiVersion: v1
kind: Service
metadata:
name: kafka
name: kafka-svc
namespace: spot
spec:
selector:
Expand Down
3 changes: 2 additions & 1 deletion spot-gateway/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
13 changes: 9 additions & 4 deletions spot-order/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# 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
11 changes: 5 additions & 6 deletions spot-payment/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- optional:file:/config/kafka-topics.yml
- optional:file:/config/spot-payment.yml
12 changes: 6 additions & 6 deletions spot-store/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- optional:file:/config/kafka-topics.yml
- optional:file:/config/spot-store.yml
Loading