Develop

charts/api/charts/booking/Chart.yaml

@@ -9,6 +9,9 @@ dependencies:
   - name: api-booking-database
     version: 0.1.0
     repository: "file://./charts/database"
+    alias: apiBookingDatabase
+
   - name: api-booking-redis
     version: 0.1.0
-    repository: "file://./charts/redis"
+    repository: "file://./charts/redis"
+    alias: apiBookingRedis  

charts/api/charts/booking/charts/database/values.yaml

@@ -1,18 +1,17 @@
-apiBookingDatabase:
-  replicaCount: 1
+replicaCount: 1
 
-  auth:
-    rootPassword: "rookies"
-    database: booking
-    username: rookies
-    password: rookies
+auth:
+  rootPassword: "rookies"
+  database: booking
+  username: rookies
+  password: rookies
 
-  service:
-    name: api-booking-database-service
-    type: ClusterIP
-    port: 3306
+service:
+  name: api-booking-database-service
+  type: ClusterIP
+  port: 3306
 
-  persistence:
-    enabled: true
-    size: 8Gi
-    storageClass: ""
+persistence:
+  enabled: true
+  size: 8Gi
+  storageClass: ""

charts/api/charts/booking/charts/redis/values.yaml

@@ -1,17 +1,16 @@
-apiBookingRedis:
-  replicaCount: 1
+replicaCount: 1
 
-  image:
-    repository: redis
-    tag: "7.2.4"
-    pullPolicy: IfNotPresent
+image:
+  repository: redis
+  tag: "7.2.4"
+  pullPolicy: IfNotPresent
 
-  service:
-    name: api-booking-redis-service
-    type: ClusterIP
-    port: 6379
+service:
+  name: api-booking-redis-service
+  type: ClusterIP
+  port: 6379
 
-  persistence:
-    enabled: true
-    size: 8Gi
-    storageClass: ""
+persistence:
+  enabled: true
+  size: 8Gi
+  storageClass: "gp2"

charts/api/charts/booking/templates/_helpers.tpl

@@ -29,42 +29,12 @@ expose-via-spring-gateway
 #
 # Application Properties
 # 
-#
-# Application Properties
-# 
-{{- define "api-booking.applicationProperties" -}}
-spring.application.name=booking
-
-
-server.port=8080
+{{- define "api-booking.kafka-server" -}}
+{{ printf "%s.kafka.svc.cluster.local:%d" (default "kafka-service" .Values.global.service.kafka) 9092 }}
+{{- end -}}
 
-server.address=0.0.0.0
+{{- define "api-booking.user-server" -}}
+{{ printf "http://%s.user.svc.cluster.local:%d" (default "api-user-service" .Values.global.service.apiUser) 8080 }}
+{{- end -}}
 
 
-# log file
-logging.file.path=logs
-logging.level.com.basic.myspringboot=debug
-
-# MariaDB Database 설정
-spring.datasource.url=jdbc:mariadb://{{ .Values.global.service.apiBookingDatabase | default "api-booking-database-service" }}:{{ .Values.apiBookingDatabase.service.port | default 3306 }}/{{ .Values.apiBookingDatabase.auth.database | default "booking" }}
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.username={{ .Values.apiBookingDatabase.auth.username | default "rookies" }}
-spring.datasource.password={{ .Values.apiBookingDatabase.auth.password | default "rookies" }}
-
-# JPA 설정
-spring.jpa.database-platform=org.hibernate.dialect.MariaDBDialect
-spring.jpa.hibernate.ddl-auto=update
-
-# Redis 설정
-spring.data.redis.host={{ .Values.global.service.apiBookingRedis | default "api-booking-redis-service" }}
-spring.data.redis.port={{ .Values.apiBookingRedis.service.port | default 6379 }}
-
-# Kafka 설정
-app.kafka.topic.booking-event=booking-events
-app.kafka.topic.user-event=user-events
-spring.kafka.bootstrap-servers={{ printf "%s.kafka.svc.cluster.local:%d" (default "kafka-service" .Values.global.service.kafka) 9092 }}
-spring.kafka.consumer.auto-offset-reset=earliest
-spring.kafka.consumer.value-deserializer=org.apache.kafka.common.serialization.StringDeserializer
-spring.kafka.consumer.properties.spring.json.trusted.packages=*
-spring.kafka.consumer.properties.spring.json.use.type.headers=false
-{{- end }}

charts/api/charts/booking/templates/api-booking-deployment.yaml.tpl

@@ -14,13 +14,6 @@ spec:
       labels:
         app: {{ include "api-booking.fullname" . }}
     spec:
-      volumes:
-        - name: config-volume
-          configMap:
-            name: api-booking-booking-config
-            items:
-              - key: application-dev.properties
-                path: application-dev.properties
       containers:
         - name: booking
           image: "{{ .Values.apiBooking.image.registry }}/{{ .Values.apiBooking.image.repository }}:{{ .Values.apiBooking.image.tag }}"
@@ -29,10 +22,84 @@ spec:
             - containerPort: {{ .Values.apiBooking.service.port }}
           env:
             - name: SPRING_PROFILES_ACTIVE
-              value: dev
-            - name: SPRING_CONFIG_LOCATION
-              value: "classpath:/,file:/config/"
-          volumeMounts:
-            - name: config-volume
-              mountPath: /config
-              readOnly: true
+              value: "prod"
+            - name: SERVER_PORT
+              value: "{{ .Values.apiBooking.service.port }}"
+            # Database
+            - name: DB_URL
+              value: "jdbc:mariadb://{{ .Values.global.service.apiBookingDatabase | default "api-booking-database-service" }}:{{ .Values.apiBookingDatabase.service.port | default 3306 }}/{{ .Values.apiBookingDatabase.auth.database | default "booking" }}"
+            - name: DB_USERNAME
+              value: {{ .Values.apiBookingDatabase.auth.username | default "rookies" }}
+            - name: DB_PASSWORD
+              value: {{ .Values.apiBookingDatabase.auth.password | default "rookies" }}
+            - name: SPRING_JPA_HIBERNATE_DDL_AUTO
+              value: update
+            # Redis
+            - name: REDIS_SERVER_URL
+              value: {{ .Values.global.service.apiBookingRedis | default "api-booking-redis-service" }}
+            - name: REDIS_PORT
+              value: "6379"
+
+            # Kafka
+            - name: KAFKA_SERVERS
+              value: {{ include "api-booking.kafka-server" . }}
+
+            # External APIs
+            - name: BASE_API
+              value: {{ include "api-booking.user-server" . }}
+            - name: USER_BASE_API
+              value: {{ include "api-booking.user-server" . }}
+            - name: USER_EMAIL_INFO_API
+              value: /api/users/booking-profile
+            - name: USER_STATS_LIST_API
+              value: /api/users/statisticsList
+            - name: BOOKING_USER_INFO_API
+              value: /api/users/reservationList
+            - name: LOGGING_LEVEL_COM_MNMS_BOOKING_SERVICE
+              value: DEBUG
+            - name: LOGGING_LEVEL_COM_MNMS_BOOKING_CONTROLLER
+              value: DEBUG
+
+            - name: MAIL_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: api-booking-secret
+                  key: MAIL_USERNAME
+            - name: MAIL_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: api-booking-secret
+                  key: MAIL_PASSWORD
+            # OCR Settings  
+            - name: OCR_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: api-booking-secret
+                  key: OCR_SECRET_KEY
+            - name: OCR_INVOKE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: api-booking-secret
+                  key: OCR_INVOKE_URL
+
+
+          resources:
+            requests:
+              cpu: {{ .Values.apiBooking.resources.requests.cpu | default "256m" }}
+              memory: {{ .Values.apiBooking.resources.requests.memory | default "256Mi" }}
+            limits:
+              cpu: {{ .Values.apiBooking.resources.limits.cpu | default "500m" }}
+              memory: {{ .Values.apiBooking.resources.limits.memory | default "1024Mi" }}
+          # actuator 가 없어서 주석처리
+          # livenessProbe:
+          #   httpGet:
+          #     path: /actuator/health
+          #     port: {{ .Values.apiBooking.service.port }}
+          #   initialDelaySeconds: 60
+          #   periodSeconds: 10
+          # readinessProbe:
+          #   httpGet:
+          #     path: /actuator/health
+          #     port: {{ .Values.apiBooking.service.port }}
+          #   initialDelaySeconds: 60
+          #   periodSeconds: 5

charts/api/charts/booking/templates/api-booking-service.yaml.tpl

@@ -10,5 +10,7 @@ spec:
   selector:
     app: {{ include "api-booking.fullname" . }}
   ports:
-    - port: {{ .Values.apiBooking.service.port }}
+
+    - name: http
+      port: {{ .Values.apiBooking.service.port }}
       targetPort: {{ .Values.apiBooking.service.port }}

charts/api/charts/booking/values.yaml

@@ -19,17 +19,16 @@ apiBooking:
 #
 apiBookingDatabase:
   replicaCount: 1
-
   auth:
     rootPassword: "rookies"
     database: booking
     username: rookies
     password: rookies
-
   service:
+    # ← 부모 템플릿에서 바로 읽어 쓰려면 name을 명시해 두는 게 안전합니다
+    name: api-booking-database-service
     type: ClusterIP
     port: 3306
-
   persistence:
     enabled: true
     size: 8Gi
@@ -38,19 +37,19 @@ apiBookingDatabase:
 #
 # Redis Values
 #
+
+
 apiBookingRedis:
   replicaCount: 1
-
   image:
     repository: redis
     tag: "7.2.4"
     pullPolicy: IfNotPresent
-
   service:
+    name: api-booking-redis-service     # ← 동일하게 명시
     type: ClusterIP
     port: 6379
-
   persistence:
     enabled: true
-    size: 8Gi
-    storageClass: ""
+    size: 7Gi
+    storageClass: "gp2"

charts/api/charts/festival/Chart.yaml

@@ -8,4 +8,5 @@ appVersion: "1.0.0"
 dependencies:
   - name: api-festival-database
     version: 0.1.0
-    repository: "file://./charts/database"
+    repository: "file://./charts/database"
+    alias: apiFestivalDatabase

charts/api/charts/festival/charts/database/values.yaml

@@ -1,18 +1,17 @@
-apiFestivalDatabase:
-  replicaCount: 1
+replicaCount: 1
 
-  auth:
-    rootPassword: "rookies"
-    database: festival
-    username: rookies
-    password: rookies
+auth:
+  rootPassword: "rookies"
+  database: festival
+  username: rookies
+  password: rookies
 
-  service:
-    name: api-festival-database-service
-    type: ClusterIP
-    port: 3306
+service:
+  name: api-festival-database-service
+  type: ClusterIP
+  port: 3306
 
-  persistence:
-    enabled: true
-    size: 8Gi
-    storageClass: ""
+persistence:
+  enabled: true
+  size: 8Gi
+  storageClass: ""