Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dev-pr-check-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file removed infra/argo/.keep
Empty file.
22 changes: 22 additions & 0 deletions infra/argo/blue-green.yaml
Original file line number Diff line number Diff line change
@@ -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: {}
24 changes: 24 additions & 0 deletions infra/argo/test-rollout.yaml
Original file line number Diff line number Diff line change
@@ -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: {}


7 changes: 4 additions & 3 deletions run_k3d.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public PaymentResponseDto.SavedPaymentHistory savePaymentHistory(PaymentRequestD
return paymentApprovalService.savePaymentHistory(request);
}


// ******* //
// 결제 취소 //
// ******* //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

/**
* 결제 승인 관련 Command Service (CQRS - Command)
* 결제 생성, 승인, 결제 내역 저장 담당
*/
@Slf4j
@Service
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading