From e72f7ac9f6d379b155369d3de04b8eddc33328fe Mon Sep 17 00:00:00 2001 From: hiondal Date: Fri, 12 Sep 2025 22:45:13 +0900 Subject: [PATCH] =?UTF-8?q?Kustomize=20Strategic=20Merge=20Patch=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Deployment 패치 파일의 따옴표 제거 (15개 파일) - 리소스 설정을 Kubernetes YAML 표준 형식으로 변경 - dev/staging/prod 환경별 패치 호환성 개선 - Strategic Merge Patch 충돌 문제 해결 수정 내용: - memory: "256Mi" → memory: 256Mi - cpu: "256m" → cpu: 256m - 모든 환경에서 kustomize 빌드 성공 검증 완료 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude --- .../overlays/dev/deployment-api-gateway-patch.yaml | 8 ++++---- .../overlays/dev/deployment-bill-service-patch.yaml | 8 ++++---- .../kustomize/overlays/dev/deployment-kos-mock-patch.yaml | 8 ++++---- .../overlays/dev/deployment-product-service-patch.yaml | 8 ++++---- .../overlays/dev/deployment-user-service-patch.yaml | 8 ++++---- .../overlays/prod/deployment-api-gateway-patch.yaml | 8 ++++---- .../overlays/prod/deployment-bill-service-patch.yaml | 8 ++++---- .../overlays/prod/deployment-kos-mock-patch.yaml | 8 ++++---- .../overlays/prod/deployment-product-service-patch.yaml | 8 ++++---- .../overlays/prod/deployment-user-service-patch.yaml | 8 ++++---- .../overlays/staging/deployment-api-gateway-patch.yaml | 8 ++++---- .../overlays/staging/deployment-bill-service-patch.yaml | 8 ++++---- .../overlays/staging/deployment-kos-mock-patch.yaml | 8 ++++---- .../staging/deployment-product-service-patch.yaml | 8 ++++---- .../overlays/staging/deployment-user-service-patch.yaml | 8 ++++---- 15 files changed, 60 insertions(+), 60 deletions(-) diff --git a/deployment/cicd/kustomize/overlays/dev/deployment-api-gateway-patch.yaml b/deployment/cicd/kustomize/overlays/dev/deployment-api-gateway-patch.yaml index a0bdaec..f7dad01 100644 --- a/deployment/cicd/kustomize/overlays/dev/deployment-api-gateway-patch.yaml +++ b/deployment/cicd/kustomize/overlays/dev/deployment-api-gateway-patch.yaml @@ -10,8 +10,8 @@ spec: - name: api-gateway resources: requests: - memory: "256Mi" - cpu: "256m" + cpu: 256m + memory: 256Mi limits: - memory: "1024Mi" - cpu: "1024m" \ No newline at end of file + cpu: 1024m + memory: 1024Mi \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/dev/deployment-bill-service-patch.yaml b/deployment/cicd/kustomize/overlays/dev/deployment-bill-service-patch.yaml index bde12ae..c20c2a0 100644 --- a/deployment/cicd/kustomize/overlays/dev/deployment-bill-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/dev/deployment-bill-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: bill-service resources: requests: - memory: "256Mi" - cpu: "256m" + cpu: 256m + memory: 256Mi limits: - memory: "1024Mi" - cpu: "1024m" \ No newline at end of file + cpu: 1024m + memory: 1024Mi \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/dev/deployment-kos-mock-patch.yaml b/deployment/cicd/kustomize/overlays/dev/deployment-kos-mock-patch.yaml index ab3676b..98346b2 100644 --- a/deployment/cicd/kustomize/overlays/dev/deployment-kos-mock-patch.yaml +++ b/deployment/cicd/kustomize/overlays/dev/deployment-kos-mock-patch.yaml @@ -10,8 +10,8 @@ spec: - name: kos-mock resources: requests: - memory: "256Mi" - cpu: "256m" + cpu: 256m + memory: 256Mi limits: - memory: "1024Mi" - cpu: "1024m" \ No newline at end of file + cpu: 1024m + memory: 1024Mi \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/dev/deployment-product-service-patch.yaml b/deployment/cicd/kustomize/overlays/dev/deployment-product-service-patch.yaml index ed481ca..1447a22 100644 --- a/deployment/cicd/kustomize/overlays/dev/deployment-product-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/dev/deployment-product-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: product-service resources: requests: - memory: "256Mi" - cpu: "256m" + cpu: 256m + memory: 256Mi limits: - memory: "1024Mi" - cpu: "1024m" \ No newline at end of file + cpu: 1024m + memory: 1024Mi \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/dev/deployment-user-service-patch.yaml b/deployment/cicd/kustomize/overlays/dev/deployment-user-service-patch.yaml index 611c4e3..9faf21f 100644 --- a/deployment/cicd/kustomize/overlays/dev/deployment-user-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/dev/deployment-user-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: user-service resources: requests: - memory: "256Mi" - cpu: "256m" + cpu: 256m + memory: 256Mi limits: - memory: "1024Mi" - cpu: "1024m" \ No newline at end of file + cpu: 1024m + memory: 1024Mi \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/prod/deployment-api-gateway-patch.yaml b/deployment/cicd/kustomize/overlays/prod/deployment-api-gateway-patch.yaml index ac4507f..be957b9 100644 --- a/deployment/cicd/kustomize/overlays/prod/deployment-api-gateway-patch.yaml +++ b/deployment/cicd/kustomize/overlays/prod/deployment-api-gateway-patch.yaml @@ -11,11 +11,11 @@ spec: - name: api-gateway resources: requests: - memory: "1024Mi" - cpu: "1024m" + memory: 1024Mi + cpu: 1024m limits: - memory: "4096Mi" - cpu: "4096m" + memory: 4096Mi + cpu: 4096m livenessProbe: httpGet: path: /actuator/health diff --git a/deployment/cicd/kustomize/overlays/prod/deployment-bill-service-patch.yaml b/deployment/cicd/kustomize/overlays/prod/deployment-bill-service-patch.yaml index b876ce0..6c51a0e 100644 --- a/deployment/cicd/kustomize/overlays/prod/deployment-bill-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/prod/deployment-bill-service-patch.yaml @@ -11,11 +11,11 @@ spec: - name: bill-service resources: requests: - memory: "1024Mi" - cpu: "1024m" + memory: 1024Mi + cpu: 1024m limits: - memory: "4096Mi" - cpu: "4096m" + memory: 4096Mi + cpu: 4096m livenessProbe: httpGet: path: /actuator/health diff --git a/deployment/cicd/kustomize/overlays/prod/deployment-kos-mock-patch.yaml b/deployment/cicd/kustomize/overlays/prod/deployment-kos-mock-patch.yaml index 6285418..f155200 100644 --- a/deployment/cicd/kustomize/overlays/prod/deployment-kos-mock-patch.yaml +++ b/deployment/cicd/kustomize/overlays/prod/deployment-kos-mock-patch.yaml @@ -11,11 +11,11 @@ spec: - name: kos-mock resources: requests: - memory: "1024Mi" - cpu: "1024m" + memory: 1024Mi + cpu: 1024m limits: - memory: "4096Mi" - cpu: "4096m" + memory: 4096Mi + cpu: 4096m livenessProbe: httpGet: path: /actuator/health diff --git a/deployment/cicd/kustomize/overlays/prod/deployment-product-service-patch.yaml b/deployment/cicd/kustomize/overlays/prod/deployment-product-service-patch.yaml index cc900d6..6d595f0 100644 --- a/deployment/cicd/kustomize/overlays/prod/deployment-product-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/prod/deployment-product-service-patch.yaml @@ -11,11 +11,11 @@ spec: - name: product-service resources: requests: - memory: "1024Mi" - cpu: "1024m" + memory: 1024Mi + cpu: 1024m limits: - memory: "4096Mi" - cpu: "4096m" + memory: 4096Mi + cpu: 4096m livenessProbe: httpGet: path: /actuator/health diff --git a/deployment/cicd/kustomize/overlays/prod/deployment-user-service-patch.yaml b/deployment/cicd/kustomize/overlays/prod/deployment-user-service-patch.yaml index a0c568f..02f9a47 100644 --- a/deployment/cicd/kustomize/overlays/prod/deployment-user-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/prod/deployment-user-service-patch.yaml @@ -11,11 +11,11 @@ spec: - name: user-service resources: requests: - memory: "1024Mi" - cpu: "1024m" + memory: 1024Mi + cpu: 1024m limits: - memory: "4096Mi" - cpu: "4096m" + memory: 4096Mi + cpu: 4096m livenessProbe: httpGet: path: /actuator/health diff --git a/deployment/cicd/kustomize/overlays/staging/deployment-api-gateway-patch.yaml b/deployment/cicd/kustomize/overlays/staging/deployment-api-gateway-patch.yaml index db065e1..f11df32 100644 --- a/deployment/cicd/kustomize/overlays/staging/deployment-api-gateway-patch.yaml +++ b/deployment/cicd/kustomize/overlays/staging/deployment-api-gateway-patch.yaml @@ -10,8 +10,8 @@ spec: - name: api-gateway resources: requests: - memory: "512Mi" - cpu: "512m" + memory: 512Mi + cpu: 512m limits: - memory: "2048Mi" - cpu: "2048m" \ No newline at end of file + memory: 2048Mi + cpu: 2048m \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/staging/deployment-bill-service-patch.yaml b/deployment/cicd/kustomize/overlays/staging/deployment-bill-service-patch.yaml index 68f23c7..749931e 100644 --- a/deployment/cicd/kustomize/overlays/staging/deployment-bill-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/staging/deployment-bill-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: bill-service resources: requests: - memory: "512Mi" - cpu: "512m" + memory: 512Mi + cpu: 512m limits: - memory: "2048Mi" - cpu: "2048m" \ No newline at end of file + memory: 2048Mi + cpu: 2048m \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/staging/deployment-kos-mock-patch.yaml b/deployment/cicd/kustomize/overlays/staging/deployment-kos-mock-patch.yaml index 6c6761d..b9d1336 100644 --- a/deployment/cicd/kustomize/overlays/staging/deployment-kos-mock-patch.yaml +++ b/deployment/cicd/kustomize/overlays/staging/deployment-kos-mock-patch.yaml @@ -10,8 +10,8 @@ spec: - name: kos-mock resources: requests: - memory: "512Mi" - cpu: "512m" + memory: 512Mi + cpu: 512m limits: - memory: "2048Mi" - cpu: "2048m" \ No newline at end of file + memory: 2048Mi + cpu: 2048m \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/staging/deployment-product-service-patch.yaml b/deployment/cicd/kustomize/overlays/staging/deployment-product-service-patch.yaml index 142a2d0..e23cf7b 100644 --- a/deployment/cicd/kustomize/overlays/staging/deployment-product-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/staging/deployment-product-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: product-service resources: requests: - memory: "512Mi" - cpu: "512m" + memory: 512Mi + cpu: 512m limits: - memory: "2048Mi" - cpu: "2048m" \ No newline at end of file + memory: 2048Mi + cpu: 2048m \ No newline at end of file diff --git a/deployment/cicd/kustomize/overlays/staging/deployment-user-service-patch.yaml b/deployment/cicd/kustomize/overlays/staging/deployment-user-service-patch.yaml index f81f044..6f51b43 100644 --- a/deployment/cicd/kustomize/overlays/staging/deployment-user-service-patch.yaml +++ b/deployment/cicd/kustomize/overlays/staging/deployment-user-service-patch.yaml @@ -10,8 +10,8 @@ spec: - name: user-service resources: requests: - memory: "512Mi" - cpu: "512m" + memory: 512Mi + cpu: 512m limits: - memory: "2048Mi" - cpu: "2048m" \ No newline at end of file + memory: 2048Mi + cpu: 2048m \ No newline at end of file