diff --git a/package.sh b/package.sh
index 8c83efda31..879ae47406 100644
--- a/package.sh
+++ b/package.sh
@@ -152,6 +152,7 @@ fi
cp -r support-files/bk-cmdb/ release/job/support-files/
cp -r support-files/bkiam/ release/job/support-files/
cp -r support-files/dependJarInfo/ release/job/support-files/
+cp support-files/javaagent/* release/job/backend/
# Package dependJarLists
if [[ -d "support-files/dependJarLists/" ]]; then
cp -r support-files/dependJarLists/ release/job/support-files/
diff --git a/src/backend/commons/common-service/src/main/resources/logback-spring.xml b/src/backend/commons/common-service/src/main/resources/logback-spring.xml
index 2f9636cb4f..b283f4080a 100644
--- a/src/backend/commons/common-service/src/main/resources/logback-spring.xml
+++ b/src/backend/commons/common-service/src/main/resources/logback-spring.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/support-files/kubernetes/images/lib/opentelemetry-javaagent.jar b/support-files/javaagent/opentelemetry-javaagent.jar
similarity index 100%
rename from support-files/kubernetes/images/lib/opentelemetry-javaagent.jar
rename to support-files/javaagent/opentelemetry-javaagent.jar
diff --git a/support-files/kubernetes/charts/bk-job/Chart.yaml b/support-files/kubernetes/charts/bk-job/Chart.yaml
index 04db4ce7e3..ffbb65825a 100644
--- 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.24
-appVersion: "3.6.0-rc.24"
+version: 0.3.0-rc.25
+appVersion: "3.6.0-rc.25"
dependencies:
- name: common
diff --git a/support-files/kubernetes/charts/bk-job/values.yaml b/support-files/kubernetes/charts/bk-job/values.yaml
index 56332c1eae..8e01316cd1 100644
--- a/support-files/kubernetes/charts/bk-job/values.yaml
+++ b/support-files/kubernetes/charts/bk-job/values.yaml
@@ -655,7 +655,7 @@ gatewayConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-gateway
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -743,7 +743,7 @@ manageConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-manage
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -801,7 +801,7 @@ executeConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-execute
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -852,7 +852,7 @@ crontabConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-crontab
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -912,7 +912,7 @@ logsvrConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-logsvr
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -967,7 +967,7 @@ backupConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-backup
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -1017,7 +1017,7 @@ analysisConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-analysis
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -1067,7 +1067,7 @@ fileGatewayConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-file-gateway
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -1117,7 +1117,7 @@ fileWorkerConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-file-worker
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -1190,7 +1190,7 @@ frontendConfig:
image:
registry: hub.bktencent.com
repository: blueking/job-frontend
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
pullPolicy: IfNotPresent
pullSecrets: []
replicaCount: 1
@@ -1251,7 +1251,7 @@ migration:
# 镜像拉取仓库组织与镜像名称
repository: "blueking/job-migration"
# 镜像标签
- tag: 3.6.0-rc.24
+ tag: 3.6.0-rc.25
# 镜像拉取策略
pullPolicy: IfNotPresent
diff --git a/support-files/kubernetes/images/build.sh b/support-files/kubernetes/images/build.sh
index 435b467964..f8aa95def9 100755
--- a/support-files/kubernetes/images/build.sh
+++ b/support-files/kubernetes/images/build.sh
@@ -197,7 +197,7 @@ build_backend_module () {
fi
rm -rf tmp/*
cp $BACKEND_DIR/release/$SERVICE-$VERSION.jar tmp/$SERVICE.jar
- cp lib/opentelemetry-javaagent.jar tmp/
+ cp $SUPPORT_FILES_DIR/javaagent/opentelemetry-javaagent.jar tmp/
cp backend/startup.sh tmp/
docker build -f backend/backend.Dockerfile -t $REGISTRY/$SERVICE:$VERSION tmp --network=host
if [[ $PUSH -eq 1 ]] ; then