Browse Source

修改jenkinsfile

yangliu 2 tháng trước cách đây
mục cha
commit
f73a8dd399
1 tập tin đã thay đổi với 15 bổ sung18 xóa
  1. 15 18
      Jenkinsfile

+ 15 - 18
Jenkinsfile

@@ -7,22 +7,22 @@ pipeline {
     }
 
     environment {
-        PROJECT_NAME       = 'portal-service-frontend'
-        NODE_ENV           = 'production'
-        HARBOR_HOST        = '8.130.28.21:81'
-        KUBECONFIG_PATH    = '/root/.kube/config'
-        NODE1_IP           = '172.27.73.147'
-        NODE2_IP           = '172.27.73.146'
-        HARBOR_USER        = 'admin'
-        HARBOR_PASS        = 'Hfln@1024'
+        PROJECT_NAME        = 'portal-service-frontend'
+        NODE_ENV            = 'production'
+        HARBOR_HOST         = '8.130.28.21:81'
+        KUBECONFIG_PATH     = '/root/.kube/config'
+        NODE1_IP            = '172.27.73.147'
+        NODE2_IP            = '172.27.73.146'
+        HARBOR_USER         = 'admin'
+        HARBOR_PASS         = 'Hfln@1024'
         HARBOR_RETENTION_ID = '1'
 
-        DOMAIN             = 'radar-power.asia'
-        TLS_CERT_PATH      = '/data/cert/radar-power.asia.pem'
-        TLS_KEY_PATH       = '/data/cert/radar-power.asia.key'
-        TLS_SECRET_NAME    = 'portal-tls'
+        DOMAIN              = 'radar-power.asia'
+        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 controller ingressClass 名称
+        INGRESS_CLASS       = 'nginx'  // 请确认你的 ingress controller ingressClass 名称
     }
 
     stages {
@@ -86,7 +86,6 @@ 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}
@@ -94,7 +93,6 @@ pipeline {
                         echo ">>> 命名空间 ${params.NAMESPACE} 已存在"
                     fi
 
-                    # 检查 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} \
@@ -143,13 +141,12 @@ metadata:
   name: ${env.PROJECT_NAME}
   namespace: ${params.NAMESPACE}
 spec:
-  type: NodePort
+  type: ClusterIP
   selector:
     app: ${env.PROJECT_NAME}
   ports:
   - port: 80
     targetPort: 80
-    nodePort: 30088
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -185,7 +182,7 @@ spec:
                         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 ">>> ✅ 部署完成,访问地址:https://${env.DOMAIN}/ (请确保 DNS 指向 Ingress 公网 IP 且 secret ${env.TLS_SECRET_NAME} 已创建)"
                 }
             }
         }