feat：代码库优化一期功能点 #9347

CHANGELOG/CHANGELOG-2.0.md

@@ -0,0 +1,17 @@
+<!-- BEGIN MUNGE: GENERATED_TOC -->
+- [v2.0.0-beta.28](#v200-beta28)
+   - [Changelog since v2.0.0-beta.27](#changelog-since-v200-beta27)
+
+<!-- END MUNGE: GENERATED_TOC -->
+
+
+
+<!-- NEW RELEASE NOTES ENTRY -->
+# v2.0.0-beta.28
+## Changelog since v2.0.0-beta.27
+#### 新增
+- [新增] 蓝盾国际化优化 [链接](http://github.com/TencentBlueKing/bk-ci/issues/8975)
+- [新增] 使用v4_app_pipeline_upload和v4_app_pipeline_copy接口时，部分设置参数缺失 [链接](http://github.com/TencentBlueKing/bk-ci/issues/9308)
+
+#### 优化
+- [优化] 优化标签组/标签重名时的报错提示 [链接](http://github.com/TencentBlueKing/bk-ci/issues/9312)

CHANGELOG/README.md

@@ -3,4 +3,4 @@
 - [CHANGELOG-1.10.md](./CHANGELOG-1.10.md)
 - [CHANGELOG-1.11.md](./CHANGELOG-1.11.md)
 - [CHANGELOG-1.12.md](./CHANGELOG-1.12.md)
-- [CHANGELOG-1.13.md](./CHANGELOG-1.13.md)
+- [CHANGELOG-2.0.md](./CHANGELOG-2.0.md)

helm-charts/core/ci/base/default_env.yaml

@@ -45,6 +45,7 @@ bkCiNotifyEmailSendChannel: blueking
 bkCiInitLocale: zh-CN
 bkCiRedisSsl: false
 bkCiEsHttps: false
+bkCiFrontendIndex: "rewrite .* /$subsystem/index.html break"
 bkCiDefaultLocale: zh_CN
 bkCiSupportLanguages: zh_CN,en_US
 bkEsbEnabled: false

helm-charts/core/ci/templates/init/init.bkrepo.yaml

@@ -89,6 +89,19 @@ spec:
                   curl -s -X PUT $REPO_INIT_GENERIC_METADATA_PATH/bk-store/static/file/$k -u {{ .Values.config.bkRepoUsername }}:{{ .Values.config.bkRepoPassword }} -H \"X-BKREPO-UID: {{ .Values.config.bkRepoUsername }}\" -H \"X-BKREPO-OVERWRITE: true\" --upload-file ${k}
                   echo -e ""
               done
+
+              # 打开制品库入口
+              services="project"
+              for service in $services
+              do
+                until curl --connect-timeout 3 -m 1 -s "http://{{ include "bkci.names.fullname" . }}-$service.{{ .Release.Namespace }}.svc.cluster.local" > nohup
+                do 
+                  echo "waiting for {{ include "bkci.names.fullname" . }}-$service";
+                  sleep 2;
+                done
+                echo "{{ include "bkci.names.fullname" . }}-$service is available";
+              done
+              curl -X PUT --header 'Content-Type: application/json' --header 'Accept: application/json' --header 'X-DEVOPS-UID: admin' -d '{"showProjectList": true,"showNav": true,"status": "ok","deleted": false,"iframeUrl": "http://{{ .Values.config.bkRepoHost }}/ui/"}' "http://{{ include "bkci.names.fullname" . }}-project.{{ .Release.Namespace }}/api/op/services/update/Repo"
       restartPolicy: Never
 {{- end -}}
 {{- end -}}

scripts/bkenv.properties

@@ -9,6 +9,8 @@ BK_CODECC_DATA_DIR=
 BK_CODECC_HOME=
 # BK_CODECC_PRIVATE_URL无默认值. 无需修改. 声明依赖, 蓝鲸环境下会自动填充. 其他环境无需填写.
 BK_CODECC_PRIVATE_URL=
+# BK_CODECC_PRIVATE_PROJECT_ID 项目ID
+BK_CODECC_PRIVATE_PROJECT_ID=
 # BK_CI_CODECC_OPENAPI_TOKEN无默认值. 获取CODECC任务回调接口TOKEN
 BK_CI_CODECC_OPENAPI_TOKEN=
 # BK_DOMAIN无默认值. 按需修改. 声明依赖, 蓝鲸环境下会自动填充. 其他环境需修改, 建议使用用户持有的公网域名(但解析为内网IP).
@@ -143,6 +145,8 @@ BK_ESB_ENABLED=false
 BK_ESB_HOST=
 # BK_CI_PUBLIC_PATH
 BK_CI_PUBLIC_PATH=
+# BK_CI_FRONTEND_INDEX
+BK_CI_FRONTEND_INDEX="rewrite .* /$subsystem/index.html break"
 
 ##########
 # 2-公共依赖

src/backend/ci/core/auth/biz-auth/src/main/kotlin/com/tencent/devops/auth/cron/AuthCronManager.kt

@@ -252,7 +252,7 @@ class AuthCronManager @Autowired constructor(
                             )
                         }
                         page++
-                    } while (resourceGroupConfigResult.size == PageUtil.DEFAULT_PAGE)
+                    } while (resourceGroupConfigResult.size == PageUtil.DEFAULT_PAGE_SIZE)
                     logger.info("init auth resource group config I18n end")
                 } finally {
                     redisLock.unlock()

src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt

@@ -45,7 +45,6 @@ import com.tencent.devops.dispatch.kubernetes.common.ENV_KEY_GATEWAY
 import com.tencent.devops.dispatch.kubernetes.common.ENV_KEY_PROJECT_ID
 import com.tencent.devops.dispatch.kubernetes.common.SLAVE_ENVIRONMENT
 import com.tencent.devops.dispatch.kubernetes.components.LogsPrinter
-import com.tencent.devops.dispatch.kubernetes.dao.DispatchKubernetesBuildDao
 import com.tencent.devops.dispatch.kubernetes.interfaces.ContainerService
 import com.tencent.devops.dispatch.kubernetes.pojo.BK_CONTAINER_BUILD_ERROR
 import com.tencent.devops.dispatch.kubernetes.pojo.BK_READY_CREATE_KUBERNETES_BUILD_MACHINE
@@ -61,6 +60,7 @@ import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesDockerRegistry
 import com.tencent.devops.dispatch.kubernetes.pojo.KubernetesResource
 import com.tencent.devops.dispatch.kubernetes.pojo.PodNameSelector
 import com.tencent.devops.dispatch.kubernetes.pojo.Pool
+import com.tencent.devops.dispatch.kubernetes.pojo.SpecialBuilderConfig
 import com.tencent.devops.dispatch.kubernetes.pojo.StartBuilderParams
 import com.tencent.devops.dispatch.kubernetes.pojo.StopBuilderParams
 import com.tencent.devops.dispatch.kubernetes.pojo.TaskStatusEnum
@@ -85,7 +85,6 @@ import com.tencent.devops.dispatch.kubernetes.pojo.isSuccess
 import com.tencent.devops.dispatch.kubernetes.pojo.readyToStart
 import com.tencent.devops.dispatch.kubernetes.utils.CommonUtils
 import org.apache.commons.lang3.RandomStringUtils
-import org.jooq.DSLContext
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
@@ -96,12 +95,10 @@ import java.util.stream.Collectors
 @Service("kubernetesContainerService")
 class KubernetesContainerService @Autowired constructor(
     private val logsPrinter: LogsPrinter,
-    private val dslContext: DSLContext,
     private val commonConfig: CommonConfig,
     private val kubernetesTaskClient: KubernetesTaskClient,
     private val kubernetesBuilderClient: KubernetesBuilderClient,
-    private val kubernetesJobClient: KubernetesJobClient,
-    private val dispatchKubernetesBuildDao: DispatchKubernetesBuildDao
+    private val kubernetesJobClient: KubernetesJobClient
 ) : ContainerService {
 
     companion object {
@@ -143,6 +140,9 @@ class KubernetesContainerService @Autowired constructor(
     @Value("\${kubernetes.gateway.webConsoleProxy}")
     val webConsoleProxy: String = ""
 
+    @Value("\${kubernetes.privateBuilderTaint:}")
+    val privateBuilderTaint: String = ""
+
     override fun getBuilderStatus(
         buildId: String,
         vmSeqId: String,
@@ -245,7 +245,8 @@ class KubernetesContainerService @Autowired constructor(
                     ),
                     command = listOf("/bin/sh", entrypoint),
                     nfs = null,
-                    privateBuilder = null,
+                    privateBuilder = if (privateBuilderTaint.isBlank()) null
+                    else SpecialBuilderConfig(privateBuilderTaint),
                     specialBuilder = null
                 )
             )

src/backend/ci/core/project/api-project/src/main/kotlin/com/tencent/devops/project/pojo/ProjectCreateInfo.kt

@@ -66,6 +66,8 @@ data class ProjectCreateInfo(
     val logoAddress: String? = null,
     @ApiModelProperty("项目性质")
     val authSecrecy: Int? = ProjectAuthSecrecyStatus.PUBLIC.value,
+    @ApiModelProperty("是否可用")
+    val enabled: Boolean = true,
     @ApiModelProperty("运营产品ID")
     val productId: Int? = null,
     @ApiModelProperty("运营产品名称")

src/backend/ci/core/project/biz-project/src/main/kotlin/com/tencent/devops/project/dao/ProjectDao.kt

@@ -371,7 +371,7 @@ class ProjectDao {
                 userDeptDetail.deptName,
                 userDeptDetail.centerName,
                 channelCode!!.name,
-                true,
+                projectCreateInfo.enabled,
                 projectCreateInfo.properties?.let {
                     JsonUtil.toJson(it, false)
                 },

src/backend/ci/core/store/biz-store-image-sample/src/main/kotlin/com/tencent/devops/store/service/image/impl/SampleImageInitService.kt

@@ -89,7 +89,8 @@ class SampleImageInitService @Autowired constructor(
                 projectCreateInfo = ProjectCreateInfo(
                     projectName = imageInitRequest?.projectCode ?: "Demo",
                     englishName = projectCode,
-                    description = imageInitRequest?.projectDesc ?: "demo project"
+                    description = imageInitRequest?.projectDesc ?: "demo project",
+                    enabled = false
                 )
             )
             if (createDemoProjectResult.isNotOk() || createDemoProjectResult.data != true) {

src/frontend/bk-permission/.bk.development.env

@@ -0,0 +1,4 @@
+# .bk.development.env 生产模式生效
+
+# 开发 port
+BK_APP_PORT = 5002

src/frontend/bk-permission/.bk.env

@@ -0,0 +1,4 @@
+# .env 所有环境生效的配置
+
+# 接口前缀
+BK_AJAX_URL_PREFIX = '/'

src/frontend/bk-permission/.bk.production.env

@@ -0,0 +1 @@
+# .bk.production.env 生产模式生效

src/frontend/bk-permission/.browserslistrc

@@ -0,0 +1,4 @@
+# Browsers that we support
+
+last 2 versions
+> 1%

src/frontend/bk-permission/.eslintignore

@@ -0,0 +1,6 @@
+dist
+public
+postcss.config.js
+bk.config.js
+paas-server
+mock-server

src/frontend/bk-permission/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['@blueking/eslint-config-bk/vue3'],
+};

src/frontend/bk-permission/.gitignore

@@ -0,0 +1,75 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.vscode
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+package-lock.json
+webpack-stats.json
+
+webpack_cache/
+
+test/unit/coverage
+
+*.bak*
+
+# Editor directories and files
+.DS_Store
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

src/frontend/bk-permission/.stylelintignore

@@ -0,0 +1 @@
+node_modules/

src/frontend/bk-permission/.stylelintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  defaultSeverity: 'error',
+  extends: ['@blueking/stylelint-config-bk'],
+}

src/frontend/bk-permission/README.md

@@ -0,0 +1,8 @@
+### bk-permission
+
+#### 用途
+蓝盾对接权限中心相关资源
+
+#### 使用方式
+```js
+```

src/frontend/bk-permission/babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  babelrcRoots: ['.'],
+  presets: [
+    "@blueking/babel-preset-bk"
+  ]
+}

src/frontend/bk-permission/bk.config.js

@@ -0,0 +1,39 @@
+const path = require('path');
+
+module.exports = {
+  host: process.env.BK_APP_HOST,
+  port: process.env.BK_APP_PORT,
+  publicPath: process.env.BK_STATIC_URL,
+  cache: true,
+  open: true,
+  replaceStatic: true,
+  target: 'lib',
+  configureWebpack: {
+    externals: {
+      vue: 'vue'
+    }
+  },
+  chainWebpack (config) {
+    config.module
+        .rule('svg')
+        .clear();
+
+    config.module
+        .rule('svg-inline')
+        .test(/\.(svg)(\?inline)?$/)
+        .set('type', 'asset/inline');
+
+    config.resolve
+      .modules
+        .clear()
+        .add('node_modules')
+        .add(path.join(__dirname, 'node_modules'))
+
+    config.resolveLoader
+      .modules
+        .clear()
+        .add('node_modules')
+        .add(path.join(__dirname, 'node_modules'))
+    return config;
+  }
+};