CHORE(merge): merge develop branch

- Apply CPU limit removal
- Sync with development changes
This commit is contained in:
2025-12-05 22:41:20 +09:00
7 changed files with 17 additions and 18 deletions

View File

@@ -26,6 +26,9 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3

View File

@@ -12,8 +12,7 @@ spec:
- name: jovies-app - name: jovies-app
resources: resources:
requests: requests:
memory: "42Mi" memory: "40Mi"
cpu: "35m" cpu: "10m"
limits: limits:
memory: "84Mi" memory: "100Mi"
cpu: "105m"

View File

@@ -14,7 +14,7 @@ commonLabels:
# 이미지 태그 설정 # 이미지 태그 설정
images: images:
- name: ghcr.io/mayne0213/jovies - name: ghcr.io/mayne0213/jovies
newTag: develop-sha-9abc720e2b5164520d27d028073b97213c39bc66 newTag: develop-sha-54f2f62008e06dca26c31d219d3eac97cd8a149a
patchesStrategicMerge: patchesStrategicMerge:
- deployment-patch.yaml - deployment-patch.yaml

View File

@@ -5,8 +5,7 @@ metadata:
namespace: jovies-dev namespace: jovies-dev
spec: spec:
hard: hard:
requests.memory: "420Mi" requests.memory: "150Mi"
requests.cpu: "420m" requests.cpu: "50m"
limits.memory: "630Mi" limits.memory: "300Mi"
limits.cpu: "840m"
pods: "6" pods: "6"

View File

@@ -12,8 +12,7 @@ spec:
- name: jovies-app - name: jovies-app
resources: resources:
requests: requests:
memory: "60Mi" memory: "40Mi"
cpu: "50m" cpu: "15m"
limits: limits:
memory: "120Mi" memory: "100Mi"
cpu: "150m"

View File

@@ -13,7 +13,7 @@ commonLabels:
# 이미지 태그 설정 # 이미지 태그 설정
images: images:
- name: ghcr.io/mayne0213/jovies - name: ghcr.io/mayne0213/jovies
newTag: main-sha-7152fea281992fa7bc984a2420271cc73ae85cd6 newTag: main-sha-dbd1d17d37c26ee77825e71fbfb31b06dee03a57
patchesStrategicMerge: patchesStrategicMerge:
- deployment-patch.yaml - deployment-patch.yaml

View File

@@ -5,8 +5,7 @@ metadata:
namespace: jovies namespace: jovies
spec: spec:
hard: hard:
requests.memory: "600Mi" requests.memory: "200Mi"
requests.cpu: "600m" requests.cpu: "100m"
limits.memory: "900Mi" limits.memory: "400Mi"
limits.cpu: "1200m"
pods: "9" pods: "9"