소스 업데이트
All checks were successful
Deploy Tools / deploy (push) Successful in 1m24s

This commit is contained in:
jade
2026-08-31 09:57:03 +09:00
parent 0fcbef043b
commit 6a6592f2d5
10 changed files with 44 additions and 44 deletions

View File

@@ -15,11 +15,11 @@ public class RecruitmentFeeDisclosureDataRequest {
@Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED)
@Pattern(regexp = "^[0-9]{4}$") @Pattern(regexp = "^[0-9]{4}$")
private Integer year; private String year;
@Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1") @Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1")
@Pattern(regexp = "^[1-4]$") @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") @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}$") @Pattern(regexp = "^[0-9]{4}-[0-9]{2}-[0-9]{2}$")

View File

@@ -13,11 +13,11 @@ public class ONBTI2370_I {
@Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "조회할 연도 (형식: ^[0-9]{4}$) (예시: 2023, 2024)", example = "2023", requiredMode = Schema.RequiredMode.REQUIRED)
@Pattern(regexp = "^[0-9]{4}$") @Pattern(regexp = "^[0-9]{4}$")
private Integer year; private String year;
@Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1") @Schema(description = "조회할 분기 (1-4) (형식: ^[1-4]$) (예시: 1, 2, 3, 4)", example = "1")
@Pattern(regexp = "^[1-4]$") @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") @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}$") @Pattern(regexp = "^[0-9]{4}-[0-9]{2}-[0-9]{2}$")

View File

@@ -12,7 +12,7 @@ services:
was-sal: was-sal:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-sal/Dockerfile dockerfile: dat-was-sal/Dockerfile
ports: ports:
- "8282:8082" - "8282:8082"
@@ -30,7 +30,7 @@ services:
was-cus: was-cus:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-cus/Dockerfile dockerfile: dat-was-cus/Dockerfile
ports: ports:
- "8284:8084" - "8284:8084"
@@ -48,7 +48,7 @@ services:
was-pro: was-pro:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-pro/Dockerfile dockerfile: dat-was-pro/Dockerfile
ports: ports:
- "8285:8085" - "8285:8085"
@@ -66,7 +66,7 @@ services:
was-sys: was-sys:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-sys/Dockerfile dockerfile: dat-was-sys/Dockerfile
ports: ports:
- "8286:8086" - "8286:8086"

View File

@@ -13,7 +13,7 @@ services:
was-sal: was-sal:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-sal/Dockerfile dockerfile: dat-was-sal/Dockerfile
ports: ports:
- "127.0.0.1:9282:8082" - "127.0.0.1:9282:8082"
@@ -32,7 +32,7 @@ services:
was-cus: was-cus:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-cus/Dockerfile dockerfile: dat-was-cus/Dockerfile
ports: ports:
- "127.0.0.1:9284:8084" - "127.0.0.1:9284:8084"
@@ -51,7 +51,7 @@ services:
was-pro: was-pro:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-pro/Dockerfile dockerfile: dat-was-pro/Dockerfile
ports: ports:
- "127.0.0.1:9285:8085" - "127.0.0.1:9285:8085"
@@ -70,7 +70,7 @@ services:
was-sys: was-sys:
build: build:
context: ./dat-was-datmt context: ./dat-was-dasmt
dockerfile: dat-was-sys/Dockerfile dockerfile: dat-was-sys/Dockerfile
ports: ports:
- "127.0.0.1:9286:8086" - "127.0.0.1:9286:8086"

View File

@@ -1,4 +1,4 @@
# dat-was-datmt OpenShift 배포 # dat-was-dasmt OpenShift 배포
이 매니페스트는 `was-sal`, `was-cus`, `was-pro`, `was-sys`를 Gateway 전용 내부 Service로 배포합니다. OpenShift Route는 만들지 않습니다. 이 매니페스트는 `was-sal`, `was-cus`, `was-pro`, `was-sys`를 Gateway 전용 내부 Service로 배포합니다. OpenShift Route는 만들지 않습니다.
@@ -9,7 +9,7 @@
3. Secret 값은 Git에 저장하지 말고, 배포 namespace에서 별도로 만듭니다. 3. Secret 값은 Git에 저장하지 말고, 배포 namespace에서 별도로 만듭니다.
```powershell ```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`가 정상 해석됩니다. `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 kustomize k8s/overlays/dev | oc apply --dry-run=client -f - oc kustomize k8s/overlays/dev | oc apply --dry-run=client -f -
oc apply -k k8s/overlays/dev 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 연결 확인
Gateway가 같은 namespace에 있다면 `http://was-sal:8082`, `http://was-cus:8084`, `http://was-pro:8085`, `http://was-sys:8086`로 호출합니다. 다른 namespace에 있으면 `was-<module>.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-<module>.axhub-dasmt-dev.svc` FQDN을 사용하고 NetworkPolicy에서 Gateway namespace의 ingress를 허용합니다.
현재 애플리케이션에는 Actuator health endpoint가 없으므로 TCP readiness/liveness probe를 사용합니다. Actuator를 추가한 뒤에는 HTTP health probe로 바꾸는 것을 권장합니다. 현재 애플리케이션에는 Actuator health endpoint가 없으므로 TCP readiness/liveness probe를 사용합니다. Actuator를 추가한 뒤에는 HTTP health probe로 바꾸는 것을 권장합니다.

View File

@@ -1,9 +1,9 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: datmt-runtime-config name: dasmt-runtime-config
labels: labels:
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
data: data:
SPRING_PROFILES_ACTIVE: dev SPRING_PROFILES_ACTIVE: dev
TZ: Asia/Seoul TZ: Asia/Seoul

View File

@@ -4,7 +4,7 @@ metadata:
name: was-sal name: was-sal
labels: labels:
app.kubernetes.io/name: was-sal app.kubernetes.io/name: was-sal
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -14,7 +14,7 @@ spec:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: was-sal app.kubernetes.io/name: was-sal
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
containers: containers:
- name: was-sal - name: was-sal
@@ -25,9 +25,9 @@ spec:
containerPort: 8082 containerPort: 8082
envFrom: envFrom:
- configMapRef: - configMapRef:
name: datmt-runtime-config name: dasmt-runtime-config
- secretRef: - secretRef:
name: datmt-runtime-secrets name: dasmt-runtime-secrets
env: env:
- name: AXHUB_TOOL_URL - name: AXHUB_TOOL_URL
value: http://was-sal:8082 value: http://was-sal:8082
@@ -65,7 +65,7 @@ metadata:
name: was-cus name: was-cus
labels: labels:
app.kubernetes.io/name: was-cus app.kubernetes.io/name: was-cus
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -75,7 +75,7 @@ spec:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: was-cus app.kubernetes.io/name: was-cus
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
containers: containers:
- name: was-cus - name: was-cus
@@ -86,9 +86,9 @@ spec:
containerPort: 8084 containerPort: 8084
envFrom: envFrom:
- configMapRef: - configMapRef:
name: datmt-runtime-config name: dasmt-runtime-config
- secretRef: - secretRef:
name: datmt-runtime-secrets name: dasmt-runtime-secrets
env: env:
- name: AXHUB_TOOL_URL - name: AXHUB_TOOL_URL
value: http://was-cus:8084 value: http://was-cus:8084
@@ -126,7 +126,7 @@ metadata:
name: was-pro name: was-pro
labels: labels:
app.kubernetes.io/name: was-pro app.kubernetes.io/name: was-pro
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -136,7 +136,7 @@ spec:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: was-pro app.kubernetes.io/name: was-pro
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
containers: containers:
- name: was-pro - name: was-pro
@@ -147,9 +147,9 @@ spec:
containerPort: 8085 containerPort: 8085
envFrom: envFrom:
- configMapRef: - configMapRef:
name: datmt-runtime-config name: dasmt-runtime-config
- secretRef: - secretRef:
name: datmt-runtime-secrets name: dasmt-runtime-secrets
env: env:
- name: AXHUB_TOOL_URL - name: AXHUB_TOOL_URL
value: http://was-pro:8085 value: http://was-pro:8085
@@ -187,7 +187,7 @@ metadata:
name: was-sys name: was-sys
labels: labels:
app.kubernetes.io/name: was-sys app.kubernetes.io/name: was-sys
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@@ -197,7 +197,7 @@ spec:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: was-sys app.kubernetes.io/name: was-sys
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
containers: containers:
- name: was-sys - name: was-sys
@@ -208,9 +208,9 @@ spec:
containerPort: 8086 containerPort: 8086
envFrom: envFrom:
- configMapRef: - configMapRef:
name: datmt-runtime-config name: dasmt-runtime-config
- secretRef: - secretRef:
name: datmt-runtime-secrets name: dasmt-runtime-secrets
env: env:
- name: AXHUB_TOOL_URL - name: AXHUB_TOOL_URL
value: http://was-sys:8086 value: http://was-sys:8086

View File

@@ -4,7 +4,7 @@ metadata:
name: was-sal name: was-sal
labels: labels:
app.kubernetes.io/name: was-sal app.kubernetes.io/name: was-sal
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
@@ -20,7 +20,7 @@ metadata:
name: was-cus name: was-cus
labels: labels:
app.kubernetes.io/name: was-cus app.kubernetes.io/name: was-cus
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
@@ -36,7 +36,7 @@ metadata:
name: was-pro name: was-pro
labels: labels:
app.kubernetes.io/name: was-pro app.kubernetes.io/name: was-pro
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
@@ -52,7 +52,7 @@ metadata:
name: was-sys name: was-sys
labels: labels:
app.kubernetes.io/name: was-sys app.kubernetes.io/name: was-sys
app.kubernetes.io/part-of: axhub-datmt app.kubernetes.io/part-of: axhub-dasmt
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:

View File

@@ -1,7 +1,7 @@
apiVersion: kustomize.config.k8s.io/v1beta1 apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
namespace: axhub-datmt-dev namespace: axhub-dasmt-dev
resources: resources:
- ../../base - ../../base
@@ -13,14 +13,14 @@ labels:
images: images:
- name: was-sal - 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 newTag: latest
- name: was-cus - 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 newTag: latest
- name: was-pro - 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 newTag: latest
- name: was-sys - 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 newTag: latest

View File

@@ -1,4 +1,4 @@
rootProject.name = 'dat-was-datmt' rootProject.name = 'dat-was-dasmt'
include 'dat-was-lib' include 'dat-was-lib'
include 'dat-was-cus' include 'dat-was-cus'