From fcec7b09b1999d45cc69e4c04137846d9b4eaa72 Mon Sep 17 00:00:00 2001 From: sawyersong Date: Tue, 16 May 2023 12:09:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dkubernetes?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=AE=B9=E5=99=A8ID=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=20#8811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/KubernetesContainerService.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt b/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt index b08fe5e98db..a4c5c62c96c 100644 --- a/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt +++ b/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt @@ -83,6 +83,7 @@ import org.slf4j.LoggerFactory import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service +import java.util.Locale import java.util.stream.Collectors @Service("kubernetesContainerService") @@ -203,7 +204,7 @@ class KubernetesContainerService @Autowired constructor( KubernetesDockerRegistry(host, userName, password) } - val builderName = getOnlyName(userId) + val builderName = getOnlyName(buildId, vmSeqId) val taskId = kubernetesBuilderClient.createBuilder( buildId = buildId, vmSeqId = vmSeqId, @@ -405,13 +406,9 @@ class KubernetesContainerService @Autowired constructor( return DispatchTaskResp(kubernetesJobClient.buildAndPushImage(userId, info)) } - private fun getOnlyName(userId: String): String { - val subUserId = if (userId.length > 14) { - userId.substring(0 until 14) - } else { - userId - } - return "${subUserId.replace("_", "-")}${System.currentTimeMillis()}-" + - RandomStringUtils.randomAlphabetic(8).toLowerCase() + private fun getOnlyName(buildId: String, vmSeqId: String): String { + val hashHexString = "$buildId$vmSeqId".hashCode().toUInt().toString(16).padStart(8, '0') + return "$hashHexString-${System.currentTimeMillis()}-" + + RandomStringUtils.randomAlphabetic(8).lowercase(Locale.getDefault()) } } From 6d29549be0f97c43680a1acc3dc3c04ab2963711 Mon Sep 17 00:00:00 2001 From: sawyersong Date: Tue, 16 May 2023 16:00:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dkubernetes?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=AE=B9=E5=99=A8ID=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=20#8811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kubernetes/service/KubernetesContainerService.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt b/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt index a4c5c62c96c..1626f1adf70 100644 --- a/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt +++ b/src/backend/ci/core/dispatch-kubernetes/biz-dispatch-kubernetes/src/main/kotlin/com/tencent/devops/dispatch/kubernetes/service/KubernetesContainerService.kt @@ -204,7 +204,7 @@ class KubernetesContainerService @Autowired constructor( KubernetesDockerRegistry(host, userName, password) } - val builderName = getOnlyName(buildId, vmSeqId) + val builderName = getBuilderName() val taskId = kubernetesBuilderClient.createBuilder( buildId = buildId, vmSeqId = vmSeqId, @@ -406,9 +406,8 @@ class KubernetesContainerService @Autowired constructor( return DispatchTaskResp(kubernetesJobClient.buildAndPushImage(userId, info)) } - private fun getOnlyName(buildId: String, vmSeqId: String): String { - val hashHexString = "$buildId$vmSeqId".hashCode().toUInt().toString(16).padStart(8, '0') - return "$hashHexString-${System.currentTimeMillis()}-" + + private fun getBuilderName(): String { + return "build${System.currentTimeMillis()}-" + RandomStringUtils.randomAlphabetic(8).lowercase(Locale.getDefault()) } }