diff --git a/.github/workflows/dev-pr-check-store.yml b/.github/workflows/dev-pr-check-store.yml index 17756098..6f90a128 100644 --- a/.github/workflows/dev-pr-check-store.yml +++ b/.github/workflows/dev-pr-check-store.yml @@ -94,7 +94,7 @@ jobs: run: chmod +x gradlew - name: Check code formatting - run: ./gradlew checkstyleMain checkstyleTest + run: ./gradlew checkstyleMain checkstyleTest --parallel --build-cache --configure-on-demand continue-on-error: true - name: Run tests diff --git a/infra/argo/.keep b/infra/argo/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/infra/argo/blue-green.yaml b/infra/argo/blue-green.yaml new file mode 100644 index 00000000..52cab865 --- /dev/null +++ b/infra/argo/blue-green.yaml @@ -0,0 +1,22 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Rollout +metadata: + name: test-rollout +spec: + replicas: 2 + selector: + matchLabels: + app: test-rollout + template: + metadata: + labels: + app: test-rollout + spec: + containers: + - name: nginx + image: nginx:stable-alpine + strategy: + canary: + steps: + - setWeight: 20 + - pause: {} \ No newline at end of file diff --git a/infra/argo/test-rollout.yaml b/infra/argo/test-rollout.yaml new file mode 100644 index 00000000..d8b596e2 --- /dev/null +++ b/infra/argo/test-rollout.yaml @@ -0,0 +1,24 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Rollout +metadata: + name: test-rollout +spec: + replicas: 2 + selector: + matchLabels: + app: test-rollout + template: + metadata: + labels: + app: test-rollout + spec: + containers: + - name: nginx + image: nginx:stable-alpine + strategy: + canary: + steps: + - setWeight: 20 + - pause: {} + + diff --git a/run_k3d.sh b/run_k3d.sh index f918f288..237b0f57 100755 --- a/run_k3d.sh +++ b/run_k3d.sh @@ -105,14 +105,15 @@ install_argocd() { kubectl create namespace argocd --dry-run=client -o yaml | kubectl apply -f - # Install ArgoCD - # [수정] --server-side 추가하여 에러 발생하지 않도록 했음 - kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml --server-side + kubectl apply -n argocd --server-side -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml log_info "Waiting for ArgoCD to be ready..." kubectl wait --for=condition=available deployment/argocd-server -n argocd --timeout=300s # Apply ArgoCD NodePort service - kubectl apply -f "$SCRIPT_DIR/infra/argo/argocd-ingress.yaml" + if [ -f "$SCRIPT_DIR/infra/argo/argocd-ingress.yaml" ]; then + kubectl apply -f "$SCRIPT_DIR/infra/argo/argocd-ingress.yaml" + fi # Get ArgoCD admin password log_info "ArgoCD installed successfully!" diff --git a/spot-payment/src/main/java/com/example/Spot/payments/application/service/PaymentService.java b/spot-payment/src/main/java/com/example/Spot/payments/application/service/PaymentService.java index 3e38f97f..b5fc6396 100644 --- a/spot-payment/src/main/java/com/example/Spot/payments/application/service/PaymentService.java +++ b/spot-payment/src/main/java/com/example/Spot/payments/application/service/PaymentService.java @@ -40,7 +40,6 @@ public PaymentResponseDto.SavedPaymentHistory savePaymentHistory(PaymentRequestD return paymentApprovalService.savePaymentHistory(request); } - // ******* // // 결제 취소 // // ******* // diff --git a/spot-payment/src/main/java/com/example/Spot/payments/application/service/command/PaymentApprovalService.java b/spot-payment/src/main/java/com/example/Spot/payments/application/service/command/PaymentApprovalService.java index c8ce156f..0def329e 100644 --- a/spot-payment/src/main/java/com/example/Spot/payments/application/service/command/PaymentApprovalService.java +++ b/spot-payment/src/main/java/com/example/Spot/payments/application/service/command/PaymentApprovalService.java @@ -34,10 +34,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -/** - * 결제 승인 관련 Command Service (CQRS - Command) - * 결제 생성, 승인, 결제 내역 저장 담당 - */ @Slf4j @Service @RequiredArgsConstructor diff --git a/spot-payment/src/main/java/com/example/Spot/payments/infrastructure/aop/PaymentAspect.java b/spot-payment/src/main/java/com/example/Spot/payments/infrastructure/aop/PaymentAspect.java index 1629ba55..13a617cc 100644 --- a/spot-payment/src/main/java/com/example/Spot/payments/infrastructure/aop/PaymentAspect.java +++ b/spot-payment/src/main/java/com/example/Spot/payments/infrastructure/aop/PaymentAspect.java @@ -86,7 +86,7 @@ public Object handlePaymentBillingApproveStatus(ProceedingJoinPoint joinPoint, P return result; } catch (Exception e) { - // 잠시 막아둠 02.04. + // 잠시 막아둠 - 02.04. // paymentHistoryService.recordFailure(paymentId, e); throw e; }