CHORE(merge): merge branch develop

- Sync main with develop branch - Apply development changes
2025-12-05 23:11:58 +09:00
parent c2a8ba0bee 48de6bad29
commit 7043d32296
3 changed files with 2 additions and 3 deletions
--- a/deploy/k8s/base/deployment.yaml
+++ b/deploy/k8s/base/deployment.yaml
@@ -35,7 +35,6 @@ spec:
              cpu: "50m"
            limits:
              memory: "200Mi"
-              cpu: "150m"
          livenessProbe:
            httpGet:
              path: /
--- a/deploy/k8s/overlays/dev/kustomization.yaml
+++ b/deploy/k8s/overlays/dev/kustomization.yaml
@@ -14,7 +14,7 @@ commonLabels:
 # 이미지 태그 설정
 images:
  - name: ghcr.io/mayne0213/jovies
-    newTag: develop-sha-1d8bc47884ea3b0f37323a7cffd982e548c66a37
+    newTag: develop-sha-2b51f661ffff5a963debdaaefa455e0700094017

 patchesStrategicMerge:
  - deployment-patch.yaml
--- a/deploy/k8s/overlays/prod/kustomization.yaml
+++ b/deploy/k8s/overlays/prod/kustomization.yaml
@@ -13,7 +13,7 @@ commonLabels:
 # 이미지 태그 설정
 images:
  - name: ghcr.io/mayne0213/jovies
-    newTag: main-sha-dbd1d17d37c26ee77825e71fbfb31b06dee03a57
+    newTag: main-sha-723c52e064d1c2f82694035dace2bbf6ca678361

 patchesStrategicMerge:
  - deployment-patch.yaml