feat: 整合dispatch-docker, dispatch-kubernetes模块到dispatch #9548

TencentBlueKing · Nov 9, 2023 · 2553f56 · 2553f56
1 parent d81cbe3
commit 2553f56
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/helm-charts/core/ci/base/default_env.yaml b/helm-charts/core/ci/base/default_env.yaml
@@ -31,10 +31,12 @@ bkCiClusterTag: devops
 bkCiRepositoryGithubServer: repository
 bkCiDockerRoutingType: KUBERNETES
 bkCiDockerJobQuotaEnable: false
+bkCiBcsEnable: false
 bkCiBcsCpu: 8.0
 bkCiBcsMemory: 16048
 bkCiKubernetesCpu: 8
 bkCiKubernetesMemory: 16048
+bkCiKubernetesEnable: true
 bkCiKubernetesHost: http://kubernetes-manager
 bkCiKubernetesToken: landun
 bkCiDevopsToken: devops

diff --git a/scripts/bkenv.properties b/scripts/bkenv.properties
@@ -197,6 +197,8 @@ BK_CI_REDIS_SSL=false
 BK_CI_REDIS_SENTINEL_ADDR=
 # BK_CI_REDIS_SENTINEL_MASTER_NAME无默认值. 无需修改.
 BK_CI_REDIS_SENTINEL_MASTER_NAME=
+# BK_CI_BCS_ENABLE无默认值，是否开启蓝鲸bcs资源调度，按需修改
+BK_CI_BCS_ENABLE=false
 # BK_CI_BCS_HOST无默认值，BCS API地址，按需修改
 BK_CI_BCS_HOST=
 # BK_CI_BCS_TOKEN无默认值，BCS API token，按需修改
@@ -205,6 +207,8 @@ BK_CI_BCS_TOKEN=
 BK_CI_BCS_CPU=16.0
 # BK_CI_BCS_MEMORY默认为32769，BCS构建机默认容器内存配额，按需修改
 BK_CI_BCS_MEMORY=32769
+# BK_CI_KUBERNETES_ENABLE无默认值，是否开启kubernetes资源调度，按需修改
+BK_CI_KUBERNETES_ENABLE=true
 # BK_CI_KUBERNETES_HOST无默认值，KUBERNETES API地址，按需修改
 BK_CI_KUBERNETES_HOST=
 # BK_CI_KUBERNETES_TOKEN无默认值，KUBERNETES API token，按需修改

diff --git a/support-files/templates/#etc#ci#application-dispatch.yml b/support-files/templates/#etc#ci#application-dispatch.yml
@@ -30,7 +30,7 @@ dispatch:
 
 # kubernetes-dispatch集群配置
 kubernetes:
-  enable: true
+  enable: __BK_CI_KUBERNETES_ENABLE__
   apiUrl: __BK_CI_KUBERNETES_HOST__
   token: __BK_CI_KUBERNETES_TOKEN__
   entrypoint: /data/devops/config/init.sh
@@ -49,7 +49,7 @@ kubernetes:
 
 # 对接蓝鲸BCS容器调度集群需要用到的配置
 bcs:
-  enable: false
+  enable: __BK_CI_BCS_ENABLE__
   apiUrl: __BK_CI_BCS_HOST__
   token: __BK_CI_BCS_TOKEN__
   entrypoint: /tools/bcs_init.sh