From 1c461f65f43d8766b8a555eda5ad7a595b41a8f5 Mon Sep 17 00:00:00 2001
From: John Hanzu Kim <kros235@naver.com>
Date: Mon, 16 Jun 2025 18:08:52 +0900
Subject: [PATCH] Update Jenkinsfile

---
 smarketing-java/deployment/Jenkinsfile | 49 +++++++++++++++++++-------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile
index 52bb7e2..d6c554c 100644
--- a/smarketing-java/deployment/Jenkinsfile
+++ b/smarketing-java/deployment/Jenkinsfile
@@ -40,7 +40,6 @@ podTemplate(
             echo "팀 ID: ${props.teamid}"
         }
 
-        // 🔧 핵심 추가: AKS 설정 단계
         stage("Setup AKS") {
             container('azure-cli') {
                 withCredentials([azureServicePrincipal('azure-credentials')]) {
@@ -57,8 +56,13 @@ podTemplate(
                         echo "=== 네임스페이스 생성 ==="
                         kubectl create namespace ${namespace} --dry-run=client -o yaml | kubectl apply -f -
                         
-                        echo "=== 현재 컨텍스트 확인 ==="
-                        kubectl config current-context
+                        echo "=== Image Pull Secret 생성 ==="
+                        kubectl create secret docker-registry acr-secret \\
+                            --docker-server=${props.registry} \\
+                            --docker-username=acrdigitalgarage02 \\
+                            --docker-password=\$(az acr credential show --name acrdigitalgarage02 --query passwords[0].value -o tsv) \\
+                            --namespace=${namespace} \\
+                            --dry-run=client -o yaml | kubectl apply -f -
                     """
                 }
             }
@@ -163,22 +167,43 @@ podTemplate(
 
             container('azure-cli') {
                 sh """
-                    echo "=== kubectl 연결 상태 재확인 ==="
-                    kubectl cluster-info
-                    
                     echo "=== Manifest 적용 ==="
                     kubectl apply -f smarketing-java/deployment/${manifest}
 
-                    echo "=== Deployment 대기 ==="
-                    kubectl -n ${namespace} wait --for=condition=available deployment/member --timeout=300s
-                    kubectl -n ${namespace} wait --for=condition=available deployment/store --timeout=300s
-                    kubectl -n ${namespace} wait --for=condition=available deployment/marketing-content --timeout=300s
-                    kubectl -n ${namespace} wait --for=condition=available deployment/ai-recommend --timeout=300s
+                    echo "=== 배포 상태 즉시 확인 ==="
+                    kubectl -n ${namespace} get deployments
+                    kubectl -n ${namespace} get pods
+                    kubectl -n ${namespace} get events --sort-by='.lastTimestamp' | tail -20
                     
-                    echo "=== 배포 상태 확인 ==="
+                    echo "=== Pod 상세 정보 확인 ==="
+                    for pod in \$(kubectl -n ${namespace} get pods -o name); do
+                        echo "=== \$pod 상세 정보 ==="
+                        kubectl -n ${namespace} describe \$pod
+                        echo "=== \$pod 로그 ==="
+                        kubectl -n ${namespace} logs \$pod --tail=50 || echo "로그 없음"
+                        echo "================"
+                    done
+
+                    echo "=== Deployment 대기 (30초 timeout으로 단축) ==="
+                    timeout 30 kubectl -n ${namespace} wait --for=condition=available deployment/member --timeout=30s || echo "member deployment 대기 실패"
+                    timeout 30 kubectl -n ${namespace} wait --for=condition=available deployment/store --timeout=30s || echo "store deployment 대기 실패"
+                    timeout 30 kubectl -n ${namespace} wait --for=condition=available deployment/marketing-content --timeout=30s || echo "marketing-content deployment 대기 실패"
+                    timeout 30 kubectl -n ${namespace} wait --for=condition=available deployment/ai-recommend --timeout=30s || echo "ai-recommend deployment 대기 실패"
+                    
+                    echo "=== 최종 배포 상태 확인 ==="
                     kubectl -n ${namespace} get deployments
                     kubectl -n ${namespace} get pods
                     kubectl -n ${namespace} get services
+                    
+                    echo "=== 실패한 Pod가 있다면 상세 로그 ==="
+                    for pod in \$(kubectl -n ${namespace} get pods --field-selector=status.phase!=Running -o name 2>/dev/null || true); do
+                        if [ ! -z "\$pod" ]; then
+                            echo "=== 실패한 Pod: \$pod ==="
+                            kubectl -n ${namespace} describe \$pod
+                            kubectl -n ${namespace} logs \$pod --previous --tail=50 2>/dev/null || echo "이전 로그 없음"
+                            kubectl -n ${namespace} logs \$pod --tail=50 2>/dev/null || echo "현재 로그 없음"
+                        fi
+                    done
                 """
             }
         }