Merge pull request #1134 from wangyu096/feature/rolling

feature: 原子操作能力支持滚动执行 #446
TencentBlueKing · Jul 15, 2022 · 08484a3 · 08484a3
2 parents a0e8079 + 04537a6
commit 08484a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java b/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
@@ -1307,7 +1307,7 @@ public TaskInstanceDTO createTaskInstanceForRedo(Long appId, Long taskInstanceId
             UserOperationEnum.START));
 
         // 启动作业
-        startTask(taskInstanceId);
+        startTask(taskInstance.getId());
 
         return taskInstance;
     }

diff --git a/support-files/kubernetes/charts/bk-job/Chart.yaml b/support-files/kubernetes/charts/bk-job/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: "bk-job"
 description: The BK-JOB is a ops script management and execution system with the capability of dealing with multiple tasks simultaneously.
 type: application
-version: 0.3.0-rc.5
-appVersion: "3.6.0-rc.5"
+version: 0.3.0-rc.6
+appVersion: "3.6.0-rc.6"
 
 dependencies:
 - name: common

diff --git a/support-files/kubernetes/charts/bk-job/values.yaml b/support-files/kubernetes/charts/bk-job/values.yaml
@@ -645,7 +645,7 @@ gatewayConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-gateway
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -733,7 +733,7 @@ manageConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-manage
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -791,7 +791,7 @@ executeConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-execute
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -842,7 +842,7 @@ crontabConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-crontab
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -902,7 +902,7 @@ logsvrConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-logsvr
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -957,7 +957,7 @@ backupConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-backup
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1007,7 +1007,7 @@ analysisConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-analysis
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1057,7 +1057,7 @@ fileGatewayConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-file-gateway
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1107,7 +1107,7 @@ fileWorkerConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-file-worker
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1180,7 +1180,7 @@ frontendConfig:
   image:
     registry: hub.bktencent.com
     repository: blueking/job-frontend
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     pullPolicy: IfNotPresent
     pullSecrets: []
   replicaCount: 1
@@ -1241,7 +1241,7 @@ migration:
     # 镜像拉取仓库组织与镜像名称
     repository: "blueking/job-migration"
     # 镜像标签
-    tag: 3.6.0-rc.5
+    tag: 3.6.0-rc.6
     # 镜像拉取策略
     pullPolicy: IfNotPresent