Merge pull request #9616 from yongyiduan/issue_9615

[bugfix] 默认prod集群router-tag判断有误 #9615
TencentBlueKing · Oct 27, 2023 · 641fb11 · 641fb11
2 parents 5e183e5 + 922f200
commit 641fb11
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...oject/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectTagService.kt b/...oject/biz-project/src/main/kotlin/com/tencent/devops/project/service/ProjectTagService.kt
@@ -344,7 +344,7 @@ class ProjectTagService @Autowired constructor(
         }
         // 容器化项目需要将本地tag中的kubernetes-去掉来比较
         val localTag = bkTag.getLocalTag()
-        val clusterTag = if (isContainerProject) localTag.replace("kubernetes-", "") else localTag
+        val clusterTag = localTag.replace("kubernetes-", "")
         // 默认集群是不会有routerTag的信息
         if (projectTag.isNullOrBlank()) {
             // 只有默认集群在routerTag为空的时候才返回true