From 6a6592f2d5ad68ae224ad0718fb0311452e82807 Mon Sep 17 00:00:00 2001 From: jade Date: Mon, 31 Aug 2026 09:57:03 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecruitmentFeeDisclosureDataRequest.java | 4 +-- .../infra/itrf/mci/nbt/i/io/ONBTI2370_I.java | 4 +-- docker-compose.local.yml | 8 ++--- docker-compose.prod.yml | 8 ++--- k8s/README.md | 8 ++--- k8s/base/configmap.yaml | 4 +-- k8s/base/deployments.yaml | 32 +++++++++---------- k8s/base/services.yaml | 8 ++--- k8s/overlays/dev/kustomization.yaml | 10 +++--- settings.gradle | 2 +- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/biz/pro/dto/RecruitmentFeeDisclosureDataRequest.java b/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/biz/pro/dto/RecruitmentFeeDisclosureDataRequest.java index c85aca3d0..f445b1098 100644 --- a/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/biz/pro/dto/RecruitmentFeeDisclosureDataRequest.java +++ b/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/biz/pro/dto/RecruitmentFeeDisclosureDataRequest.java @@ -15,11 +15,11 @@ public class RecruitmentFeeDisclosureDataRequest { @Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED) @Pattern(regexp = "^[0-9]{4}$") - private Integer year; + private String year; @Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1") @Pattern(regexp = "^[1-4]$") - private Integer quarter; + private String quarter; @Schema(description = "조회 시작일 (YYYY-MM-DD) (형식: ^[0-9]{4}-[0-9]{2}-[0-9]{2}$) (예시: 2024-01-01, 2024-04-01)", example = "2024-01-01") @Pattern(regexp = "^[0-9]{4}-[0-9]{2}-[0-9]{2}$") diff --git a/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/infra/itrf/mci/nbt/i/io/ONBTI2370_I.java b/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/infra/itrf/mci/nbt/i/io/ONBTI2370_I.java index d3f45bc1d..8f9446596 100644 --- a/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/infra/itrf/mci/nbt/i/io/ONBTI2370_I.java +++ b/dat-was-pro/src/main/java/io/shinhanlife/dat/mcc/infra/itrf/mci/nbt/i/io/ONBTI2370_I.java @@ -13,11 +13,11 @@ public class ONBTI2370_I { @Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED) @Pattern(regexp = "^[0-9]{4}$") - private Integer year; + private String year; @Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1") @Pattern(regexp = "^[1-4]$") - private Integer quarter; + private String quarter; @Schema(description = "조회 시작일 (YYYY-MM-DD) (형식: ^[0-9]{4}-[0-9]{2}-[0-9]{2}$) (예시: 2024-01-01, 2024-04-01)", example = "2024-01-01") @Pattern(regexp = "^[0-9]{4}-[0-9]{2}-[0-9]{2}$") diff --git a/docker-compose.local.yml b/docker-compose.local.yml index eb7c311cc..4ad0a6c6e 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -12,7 +12,7 @@ services: was-sal: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-sal/Dockerfile ports: - "8282:8082" @@ -30,7 +30,7 @@ services: was-cus: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-cus/Dockerfile ports: - "8284:8084" @@ -48,7 +48,7 @@ services: was-pro: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-pro/Dockerfile ports: - "8285:8085" @@ -66,7 +66,7 @@ services: was-sys: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-sys/Dockerfile ports: - "8286:8086" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 1524ace80..82dfe9190 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -13,7 +13,7 @@ services: was-sal: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-sal/Dockerfile ports: - "127.0.0.1:9282:8082" @@ -32,7 +32,7 @@ services: was-cus: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-cus/Dockerfile ports: - "127.0.0.1:9284:8084" @@ -51,7 +51,7 @@ services: was-pro: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-pro/Dockerfile ports: - "127.0.0.1:9285:8085" @@ -70,7 +70,7 @@ services: was-sys: build: - context: ./dat-was-datmt + context: ./dat-was-dasmt dockerfile: dat-was-sys/Dockerfile ports: - "127.0.0.1:9286:8086" diff --git a/k8s/README.md b/k8s/README.md index ac428c16c..1260972b1 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -1,4 +1,4 @@ -# dat-was-datmt OpenShift 배포 +# dat-was-dasmt OpenShift 배포 이 매니페스트는 `was-sal`, `was-cus`, `was-pro`, `was-sys`를 Gateway 전용 내부 Service로 배포합니다. OpenShift Route는 만들지 않습니다. @@ -9,7 +9,7 @@ 3. Secret 값은 Git에 저장하지 말고, 배포 namespace에서 별도로 만듭니다. ```powershell -oc -n axhub-datmt-dev create secret generic datmt-runtime-secrets --from-env-file=runtime-secrets.env +oc -n axhub-dasmt-dev create secret generic dasmt-runtime-secrets --from-env-file=runtime-secrets.env ``` `runtime-secrets.env`에는 DB 계정·비밀번호, API 키, 인증서 비밀번호 등 민감값만 넣고 저장소에 추가하지 않습니다. 애플리케이션이 필요한 Secret 키를 사용하지 않는 경우에도 빈 Secret은 먼저 생성해야 Pod의 `envFrom.secretRef`가 정상 해석됩니다. @@ -20,11 +20,11 @@ oc -n axhub-datmt-dev create secret generic datmt-runtime-secrets --from-env-fil oc kustomize k8s/overlays/dev oc kustomize k8s/overlays/dev | oc apply --dry-run=client -f - oc apply -k k8s/overlays/dev -oc get deployment,pod,svc -n axhub-datmt-dev +oc get deployment,pod,svc -n axhub-dasmt-dev ``` ## Gateway 연결 확인 -Gateway가 같은 namespace에 있다면 `http://was-sal:8082`, `http://was-cus:8084`, `http://was-pro:8085`, `http://was-sys:8086`로 호출합니다. 다른 namespace에 있으면 `was-.axhub-datmt-dev.svc` FQDN을 사용하고 NetworkPolicy에서 Gateway namespace의 ingress를 허용합니다. +Gateway가 같은 namespace에 있다면 `http://was-sal:8082`, `http://was-cus:8084`, `http://was-pro:8085`, `http://was-sys:8086`로 호출합니다. 다른 namespace에 있으면 `was-.axhub-dasmt-dev.svc` FQDN을 사용하고 NetworkPolicy에서 Gateway namespace의 ingress를 허용합니다. 현재 애플리케이션에는 Actuator health endpoint가 없으므로 TCP readiness/liveness probe를 사용합니다. Actuator를 추가한 뒤에는 HTTP health probe로 바꾸는 것을 권장합니다. diff --git a/k8s/base/configmap.yaml b/k8s/base/configmap.yaml index 3e0fdc3bc..ace16a542 100644 --- a/k8s/base/configmap.yaml +++ b/k8s/base/configmap.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: datmt-runtime-config + name: dasmt-runtime-config labels: - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt data: SPRING_PROFILES_ACTIVE: dev TZ: Asia/Seoul diff --git a/k8s/base/deployments.yaml b/k8s/base/deployments.yaml index 0556f984e..787f5869e 100644 --- a/k8s/base/deployments.yaml +++ b/k8s/base/deployments.yaml @@ -4,7 +4,7 @@ metadata: name: was-sal labels: app.kubernetes.io/name: was-sal - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: replicas: 1 selector: @@ -14,7 +14,7 @@ spec: metadata: labels: app.kubernetes.io/name: was-sal - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: containers: - name: was-sal @@ -25,9 +25,9 @@ spec: containerPort: 8082 envFrom: - configMapRef: - name: datmt-runtime-config + name: dasmt-runtime-config - secretRef: - name: datmt-runtime-secrets + name: dasmt-runtime-secrets env: - name: AXHUB_TOOL_URL value: http://was-sal:8082 @@ -65,7 +65,7 @@ metadata: name: was-cus labels: app.kubernetes.io/name: was-cus - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: replicas: 1 selector: @@ -75,7 +75,7 @@ spec: metadata: labels: app.kubernetes.io/name: was-cus - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: containers: - name: was-cus @@ -86,9 +86,9 @@ spec: containerPort: 8084 envFrom: - configMapRef: - name: datmt-runtime-config + name: dasmt-runtime-config - secretRef: - name: datmt-runtime-secrets + name: dasmt-runtime-secrets env: - name: AXHUB_TOOL_URL value: http://was-cus:8084 @@ -126,7 +126,7 @@ metadata: name: was-pro labels: app.kubernetes.io/name: was-pro - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: replicas: 1 selector: @@ -136,7 +136,7 @@ spec: metadata: labels: app.kubernetes.io/name: was-pro - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: containers: - name: was-pro @@ -147,9 +147,9 @@ spec: containerPort: 8085 envFrom: - configMapRef: - name: datmt-runtime-config + name: dasmt-runtime-config - secretRef: - name: datmt-runtime-secrets + name: dasmt-runtime-secrets env: - name: AXHUB_TOOL_URL value: http://was-pro:8085 @@ -187,7 +187,7 @@ metadata: name: was-sys labels: app.kubernetes.io/name: was-sys - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: replicas: 1 selector: @@ -197,7 +197,7 @@ spec: metadata: labels: app.kubernetes.io/name: was-sys - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: containers: - name: was-sys @@ -208,9 +208,9 @@ spec: containerPort: 8086 envFrom: - configMapRef: - name: datmt-runtime-config + name: dasmt-runtime-config - secretRef: - name: datmt-runtime-secrets + name: dasmt-runtime-secrets env: - name: AXHUB_TOOL_URL value: http://was-sys:8086 diff --git a/k8s/base/services.yaml b/k8s/base/services.yaml index 746a35b05..44d7d98bc 100644 --- a/k8s/base/services.yaml +++ b/k8s/base/services.yaml @@ -4,7 +4,7 @@ metadata: name: was-sal labels: app.kubernetes.io/name: was-sal - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: type: ClusterIP selector: @@ -20,7 +20,7 @@ metadata: name: was-cus labels: app.kubernetes.io/name: was-cus - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: type: ClusterIP selector: @@ -36,7 +36,7 @@ metadata: name: was-pro labels: app.kubernetes.io/name: was-pro - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: type: ClusterIP selector: @@ -52,7 +52,7 @@ metadata: name: was-sys labels: app.kubernetes.io/name: was-sys - app.kubernetes.io/part-of: axhub-datmt + app.kubernetes.io/part-of: axhub-dasmt spec: type: ClusterIP selector: diff --git a/k8s/overlays/dev/kustomization.yaml b/k8s/overlays/dev/kustomization.yaml index 58121185f..f585497ba 100644 --- a/k8s/overlays/dev/kustomization.yaml +++ b/k8s/overlays/dev/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: axhub-datmt-dev +namespace: axhub-dasmt-dev resources: - ../../base @@ -13,14 +13,14 @@ labels: images: - name: was-sal - newName: image-registry.openshift-image-registry.svc:5000/axhub-datmt-dev/was-sal + newName: image-registry.openshift-image-registry.svc:5000/axhub-dasmt-dev/was-sal newTag: latest - name: was-cus - newName: image-registry.openshift-image-registry.svc:5000/axhub-datmt-dev/was-cus + newName: image-registry.openshift-image-registry.svc:5000/axhub-dasmt-dev/was-cus newTag: latest - name: was-pro - newName: image-registry.openshift-image-registry.svc:5000/axhub-datmt-dev/was-pro + newName: image-registry.openshift-image-registry.svc:5000/axhub-dasmt-dev/was-pro newTag: latest - name: was-sys - newName: image-registry.openshift-image-registry.svc:5000/axhub-datmt-dev/was-sys + newName: image-registry.openshift-image-registry.svc:5000/axhub-dasmt-dev/was-sys newTag: latest diff --git a/settings.gradle b/settings.gradle index f85da64cf..df9274894 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'dat-was-datmt' +rootProject.name = 'dat-was-dasmt' include 'dat-was-lib' include 'dat-was-cus'