修改jenkinsfile

Jenkinsfile

@@ -8,7 +8,6 @@ pipeline {
 
     environment {
         PROJECT_NAME       = 'portal-service-frontend'
-        BUILD_DIR          = 'dist'
         NODE_ENV           = 'production'
         HARBOR_HOST        = '8.130.28.21:81'
         KUBECONFIG_PATH    = '/root/.kube/config'
@@ -22,11 +21,64 @@ pipeline {
         TLS_CERT_PATH      = '/data/cert/radar-power.asia.pem'
         TLS_KEY_PATH       = '/data/cert/radar-power.asia.key'
         TLS_SECRET_NAME    = 'portal-tls'
-        INGRESS_CLASS      = 'nginx'     // 新增 ingress class 环境变量
+
+        INGRESS_CLASS      = 'nginx'  // 请确认你的 ingress controller ingressClass 名称
     }
 
     stages {
-        // ... 省略前面步骤不变 ...
+        stage('🧬 初始化环境') {
+            steps {
+                script {
+                    env.HARBOR_PROJECT = params.env
+                    env.IMAGE_TAG = "${env.HARBOR_HOST}/${env.HARBOR_PROJECT}/${env.PROJECT_NAME}:${BUILD_NUMBER}"
+                    echo ">>> 环境：${params.env}, Harbor项目：${env.HARBOR_PROJECT}, K8s命名空间：${params.NAMESPACE}"
+                    echo ">>> IMAGE_TAG = ${env.IMAGE_TAG}"
+                }
+            }
+        }
+
+        stage('📥 拉取代码') {
+            steps {
+                checkout scm
+                echo "✅ 代码拉取成功"
+            }
+        }
+
+        stage('🔧 构建 Docker 镜像') {
+            steps {
+                script {
+                    sh """
+                        docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST}
+                        docker build --build-arg ENV=${params.env} -t ${env.IMAGE_TAG} .
+                    """
+                    echo "✅ 镜像构建成功：${env.IMAGE_TAG}"
+                }
+            }
+        }
+
+        stage('🚀 推送镜像到 Harbor') {
+            steps {
+                script {
+                    sh """
+                        docker push ${env.IMAGE_TAG}
+                        docker rmi ${env.IMAGE_TAG} || true
+                    """
+                    echo "✅ 镜像推送并本地清理完成"
+                }
+            }
+        }
+
+        stage('🔍 测试节点能否拉取镜像') {
+            steps {
+                script {
+                    echo ">>> 测试节点能否拉取镜像..."
+                    sh """
+                        ssh root@${env.NODE1_IP} "docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST} && docker pull ${env.IMAGE_TAG}" || echo '[❌ 节点 ${env.NODE1_IP} 拉取失败]'
+                        ssh root@${env.NODE2_IP} "docker login -u ${env.HARBOR_USER} -p ${env.HARBOR_PASS} ${env.HARBOR_HOST} && docker pull ${env.IMAGE_TAG}" || echo '[❌ 节点 ${env.NODE2_IP} 拉取失败]'
+                    """
+                }
+            }
+        }
 
         stage('📦 处理命名空间和 TLS Secret') {
             steps {
@@ -34,7 +86,7 @@ pipeline {
                     sh """
                     export KUBECONFIG=${env.KUBECONFIG_PATH}
 
-                    # 判断命名空间是否存在，不存在则创建
+                    # 检查命名空间是否存在
                     if ! kubectl get ns ${params.NAMESPACE} >/dev/null 2>&1; then
                         echo ">>> 命名空间 ${params.NAMESPACE} 不存在，正在创建..."
                         kubectl create namespace ${params.NAMESPACE}
@@ -42,7 +94,7 @@ pipeline {
                         echo ">>> 命名空间 ${params.NAMESPACE} 已存在"
                     fi
 
-                    # 判断 TLS Secret 是否存在，不存在则创建
+                    # 检查 TLS Secret 是否存在
                     if ! kubectl get secret ${env.TLS_SECRET_NAME} -n ${params.NAMESPACE} >/dev/null 2>&1; then
                         echo ">>> 未检测到 TLS Secret ${env.TLS_SECRET_NAME}，正在创建..."
                         kubectl create secret tls ${env.TLS_SECRET_NAME} \
@@ -60,34 +112,8 @@ pipeline {
         stage('📦 部署到 Kubernetes') {
             steps {
                 script {
-                    def ingressBlock = """---
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: ${env.PROJECT_NAME}
-  namespace: ${params.NAMESPACE}
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-spec:
-  ingressClassName: ${env.INGRESS_CLASS}       # 指定 ingressClassName
-  tls:
-  - hosts:
-    - ${env.DOMAIN}
-    secretName: ${env.TLS_SECRET_NAME}
-  rules:
-  - host: ${env.DOMAIN}
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: ${env.PROJECT_NAME}
-            port:
-              number: 80
-"""
-
-                    def deployYaml = """apiVersion: apps/v1
+                    def deployYaml = """
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ${env.PROJECT_NAME}
@@ -124,22 +150,83 @@ spec:
   - port: 80
     targetPort: 80
     nodePort: 30088
-${ingressBlock}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ${env.PROJECT_NAME}
+  namespace: ${params.NAMESPACE}
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /
+spec:
+  ingressClassName: ${env.INGRESS_CLASS}
+  tls:
+  - hosts:
+    - ${env.DOMAIN}
+    secretName: ${env.TLS_SECRET_NAME}
+  rules:
+  - host: ${env.DOMAIN}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: ${env.PROJECT_NAME}
+            port:
+              number: 80
 """
 
                     writeFile file: 'deploy.yaml', text: deployYaml
+
                     sh """
                         export KUBECONFIG=${env.KUBECONFIG_PATH}
                         kubectl apply -f deploy.yaml
                         kubectl rollout status deployment/${env.PROJECT_NAME} -n ${params.NAMESPACE} --timeout=120s || echo '[rollout timeout or incomplete]'
                     """
 
-                    echo ">>> ✅ 部署完成（含 Ingress），访问地址：https://${env.DOMAIN}/ （请确保 DNS 已指向 Ingress 公网 IP 且 secret ${env.TLS_SECRET_NAME} 已创建）"
+                    echo ">>> ✅ 部署完成（含 Ingress），访问地址：https://${env.DOMAIN}/ （请确保 DNS 指向 Ingress 公网 IP 且 secret ${env.TLS_SECRET_NAME} 已创建）"
+                }
+            }
+        }
+
+        stage('🧹 清理本地旧镜像（保留最新3个）') {
+            steps {
+                script {
+                    def baseImage = "${env.HARBOR_HOST}/${env.HARBOR_PROJECT}/${env.PROJECT_NAME}"
+                    sh """
+                        docker images ${baseImage} --format "{{.Repository}}:{{.Tag}}" \\
+                        | grep -v latest \\
+                        | sort -r -t ':' -k2 \\
+                        | tail -n +4 \\
+                        | xargs -r docker rmi || true
+                    """
+                    echo "✅ 本地旧镜像清理完成"
+                }
+            }
+        }
+
+        stage('🧼 清理 dangling 镜像') {
+            steps {
+                script {
+                    sh """
+                        docker images -f "dangling=true" -q | xargs -r docker rmi || true
+                    """
+                    echo "✅ 悬空镜像（<none>）清理完成"
                 }
             }
         }
 
-        // ... 其余步骤不变 ...
+        stage('🔁 触发 Harbor 镜像保留策略（可选）') {
+            steps {
+                script {
+                    sh """
+                        curl -u ${env.HARBOR_USER}:${env.HARBOR_PASS} -X POST "http://${env.HARBOR_HOST}/api/v2.0/retentions/${env.HARBOR_RETENTION_ID}/executions" || echo '[retention trigger failed]'
+                    """
+                    echo "✅ Harbor 镜像保留策略已触发（若配置）"
+                }
+            }
+        }
     }
 
     post {