From 96de0c20e5d3516d7a68a6d42f986ca3f2547a93 Mon Sep 17 00:00:00 2001 From: wangyu096 Date: Tue, 11 Jun 2024 12:15:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=BC=8F-?= =?UTF-8?q?=E5=8F=AA=E5=A4=87=E4=BB=BD=E4=B8=8D=E5=88=A0=E9=99=A4=20#3037?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../charts/bk-job/templates/job-assemble/configmap.yaml | 2 +- .../charts/bk-job/templates/job-backup/configmap.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml b/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml index 9d9880530c..e75664292e 100644 --- a/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml +++ b/support-files/kubernetes/charts/bk-job/templates/job-assemble/configmap.yaml @@ -259,7 +259,7 @@ data: idle-timeout: 600000 poolName: "job-backup" validationTimeout: 5000 - {{- if and .Values.backupConfig.archive.execute.enabled (eq .Values.backupConfig.archive.execute.mode "backupThenDelete") }} + {{- if and .Values.backupConfig.archive.execute.enabled (or (eq .Values.backupConfig.archive.execute.mode "backupThenDelete") (eq .Values.backupConfig.archive.execute.mode "backupOnly")) }} job-execute-archive: driver-class-name: {{ include "job.jdbcMysqlDriverClass" . }} type: com.zaxxer.hikari.HikariDataSource diff --git a/support-files/kubernetes/charts/bk-job/templates/job-backup/configmap.yaml b/support-files/kubernetes/charts/bk-job/templates/job-backup/configmap.yaml index f60b615cce..73c85c80a8 100644 --- a/support-files/kubernetes/charts/bk-job/templates/job-backup/configmap.yaml +++ b/support-files/kubernetes/charts/bk-job/templates/job-backup/configmap.yaml @@ -64,7 +64,7 @@ data: poolName: "job-execute" validationTimeout: 5000 {{- end }} - {{- if and .Values.backupConfig.archive.execute.enabled (eq .Values.backupConfig.archive.execute.mode "backupThenDelete") }} + {{- if and .Values.backupConfig.archive.execute.enabled (or (eq .Values.backupConfig.archive.execute.mode "backupThenDelete") (eq .Values.backupConfig.archive.execute.mode "backupOnly")) }} job-execute-archive: driver-class-name: {{ include "job.jdbcMysqlDriverClass" . }} type: com.zaxxer.hikari.HikariDataSource