From 715dc15edb7b184fed2f1a0d9e4984d0edecae64 Mon Sep 17 00:00:00 2001
From: iSecloud <869820505@qq.com>
Date: Wed, 8 Jan 2025 21:39:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(backend):=20=E9=85=8D=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E9=9B=85=E9=80=80=E5=87=BA=E6=97=B6=E9=97=B4=20#8977?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helm-charts/bk-dbm/Chart.lock                               | 6 +++---
 helm-charts/bk-dbm/Chart.yaml                               | 2 +-
 helm-charts/bk-dbm/charts/dbm/Chart.yaml                    | 2 +-
 .../dbm/templates/deployments/celery/celery-worker.yaml     | 1 +
 .../dbm/templates/deployments/celery/pipeline-worker.yaml   | 1 +
 helm-charts/bk-dbm/values.yaml                              | 3 +++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/helm-charts/bk-dbm/Chart.lock b/helm-charts/bk-dbm/Chart.lock
index 9c20c8c5bd..ad2bd73e0b 100644
--- a/helm-charts/bk-dbm/Chart.lock
+++ b/helm-charts/bk-dbm/Chart.lock
@@ -19,7 +19,7 @@ dependencies:
   version: 7.9.8
 - name: dbm
   repository: file://charts/dbm
-  version: 0.1.44
+  version: 0.1.45
 - name: dbconfig
   repository: file://charts/dbconfig
   version: 0.1.13
@@ -65,5 +65,5 @@ dependencies:
 - name: db-dbha
   repository: file://charts/db-dbha
   version: 0.1.0
-digest: sha256:293e4133fc64f236159a34fdbc0ab61a732ef1fa5f7b76fa91c3de18d1c59d48
-generated: "2024-09-25T19:33:01.490734+08:00"
+digest: sha256:4569713d2f5d7645e6e9e6a33424e0a6ea226da1623acddcea7ee55c5e5af43e
+generated: "2025-01-09T10:17:34.916203+08:00"
diff --git a/helm-charts/bk-dbm/Chart.yaml b/helm-charts/bk-dbm/Chart.yaml
index a2e20da227..b66f4efd91 100644
--- a/helm-charts/bk-dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/Chart.yaml
@@ -27,7 +27,7 @@ dependencies:
   - condition: dbm.enabled
     name: dbm
     repository: file://charts/dbm
-    version: 0.1.44
+    version: 0.1.45
   - condition: dbconfig.enabled
     name: dbconfig
     repository: file://charts/dbconfig
diff --git a/helm-charts/bk-dbm/charts/dbm/Chart.yaml b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
index 6cc4c47e8f..3dc896c3b5 100644
--- a/helm-charts/bk-dbm/charts/dbm/Chart.yaml
+++ b/helm-charts/bk-dbm/charts/dbm/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 1.5.0-alpha.1556
 description: A Helm chart for dbm
 name: dbm
 type: application
-version: 0.1.44
+version: 0.1.45
diff --git a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml
index 6e0976481c..677b259c41 100644
--- a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml
+++ b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/celery-worker.yaml
@@ -31,6 +31,7 @@ spec:
       serviceAccountName: {{ include "dbm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds.worker }}
       containers:
         - name: "{{ .Chart.Name }}-celery"
           securityContext:
diff --git a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml
index 013179284a..f760620852 100644
--- a/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml
+++ b/helm-charts/bk-dbm/charts/dbm/templates/deployments/celery/pipeline-worker.yaml
@@ -31,6 +31,7 @@ spec:
       serviceAccountName: {{ include "dbm.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds.worker }}
       containers:
         - name: "{{ .Chart.Name }}-celery-pipeline"
           securityContext:
diff --git a/helm-charts/bk-dbm/values.yaml b/helm-charts/bk-dbm/values.yaml
index 1350ceeadc..f0c2c89216 100644
--- a/helm-charts/bk-dbm/values.yaml
+++ b/helm-charts/bk-dbm/values.yaml
@@ -94,6 +94,9 @@ dbm:
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
 
+  terminationGracePeriodSeconds:
+    worker: 60
+
   serviceAccount:
     # Specifies whether a service account should be created
     create: true