第三方构建机DockerUi界面支持 TencentBlueKing#10962

tangruotian · Sep 13, 2024 · c213537 · c213537
1 parent 7dab682
commit c213537
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 19 deletions.
diff --git a/...ipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/DispatchTransfer.kt b/...ipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/DispatchTransfer.kt
@@ -35,6 +35,7 @@ import com.tencent.devops.common.pipeline.enums.VMBaseOS
 import com.tencent.devops.common.pipeline.type.DispatchType
 import com.tencent.devops.common.pipeline.type.agent.Credential
 import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentDockerInfo
+import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentDockerInfoStoreImage
 import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentEnvDispatchType
 import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentIDDispatchType
 import com.tencent.devops.process.pojo.BuildTemplateAcrossInfo
@@ -185,10 +186,19 @@ class DispatchTransfer @Autowired(required = false) constructor(
                     password = info.password,
                     credentialId = info.credId,
                     acrossTemplateId = info.acrossTemplateId,
-                    jobId = job.id
+                    jobId = job.id,
+                    credentialProjectId = null
                 ),
                 options = info.options,
-                imagePullPolicy = info.imagePullPolicy
+                imagePullPolicy = info.imagePullPolicy,
+                storeImage = if (info.imageCode != null && info.imageVersion != null) {
+                    ThirdPartyAgentDockerInfoStoreImage(
+                        imageCode = info.imageCode,
+                        imageVersion = info.imageVersion
+                    )
+                } else {
+                    null
+                }
             )
         } else null
     }

diff --git a/...line-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v2/utils/StreamDispatchUtils.kt b/...line-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v2/utils/StreamDispatchUtils.kt
@@ -129,10 +129,12 @@ object StreamDispatchUtils {
                     password = info.password,
                     credentialId = info.credId,
                     acrossTemplateId = info.acrossTemplateId,
-                    jobId = job.id
+                    jobId = job.id,
+                    credentialProjectId = null
                 ),
                 options = info.options,
-                imagePullPolicy = info.imagePullPolicy
+                imagePullPolicy = info.imagePullPolicy,
+                storeImage = null
             )
 
             return ThirdPartyAgentEnvDispatchType(

diff --git a/...rc/main/kotlin/com/tencent/devops/common/pipeline/type/agent/ThirdPartyAgentDockerInfo.kt b/...rc/main/kotlin/com/tencent/devops/common/pipeline/type/agent/ThirdPartyAgentDockerInfo.kt
@@ -3,14 +3,17 @@ package com.tencent.devops.common.pipeline.type.agent
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.tencent.devops.common.api.util.EnvUtils
+import com.tencent.devops.common.pipeline.type.docker.ImageType
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class ThirdPartyAgentDockerInfo(
     var image: String,
     var credential: Credential?,
     var options: DockerOptions?,
-    var imagePullPolicy: String?
+    var imagePullPolicy: String?,
+    val imageType: ImageType? = ImageType.THIRD,
+    val storeImage: ThirdPartyAgentDockerInfoStoreImage?
 )
 
 fun ThirdPartyAgentDockerInfo.replaceField(variables: Map<String, String>) {
@@ -51,7 +54,8 @@ data class Credential(
     var credentialId: String?,
     // 跨项目使用凭据相关信息
     val acrossTemplateId: String?,
-    val jobId: String?
+    val jobId: String?,
+    var credentialProjectId: String?
 )
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -63,6 +67,13 @@ data class DockerOptions(
     var privileged: Boolean?
 )
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+data class ThirdPartyAgentDockerInfoStoreImage(
+    val imageCode: String,
+    val imageVersion: String
+)
+
 // 第三方构建机docker类型，调度使用，会带有调度相关信息
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/...ch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/utils/ThirdPartyAgentUtils.kt b/...ch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/utils/ThirdPartyAgentUtils.kt
@@ -17,7 +17,7 @@ object ThirdPartyAgentUtils {
         val tickets = try {
             DispatchCommonUtils.getCredential(
                 client = client,
-                projectId = projectId,
+                projectId = credInfo.credentialProjectId ?: projectId,
                 credentialId = credInfo.credentialId!!,
                 type = CredentialType.USERNAME_PASSWORD
             )

diff --git a/...e/src/main/kotlin/com/tencent/devops/process/engine/atom/parser/DispatchTypeParserImpl.kt b/...e/src/main/kotlin/com/tencent/devops/process/engine/atom/parser/DispatchTypeParserImpl.kt
@@ -33,6 +33,8 @@ import com.tencent.devops.common.pipeline.matrix.DispatchInfo
 import com.tencent.devops.common.pipeline.matrix.SampleDispatchInfo
 import com.tencent.devops.common.pipeline.type.DispatchType
 import com.tencent.devops.common.pipeline.type.StoreDispatchType
+import com.tencent.devops.common.pipeline.type.agent.Credential
+import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentDispatch
 import com.tencent.devops.common.pipeline.type.docker.ImageType
 import com.tencent.devops.common.pipeline.type.kubernetes.KubernetesDispatchType
 import com.tencent.devops.process.engine.service.store.StoreImageHelper
@@ -41,6 +43,7 @@ import com.tencent.devops.process.service.BuildVariableService
 import com.tencent.devops.process.service.PipelineBuildTemplateAcrossInfoService
 import com.tencent.devops.process.yaml.pojo.StreamDispatchInfo
 import com.tencent.devops.process.yaml.v2.utils.StreamDispatchUtils
+import com.tencent.devops.store.pojo.image.response.ImageRepoInfo
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 
@@ -64,6 +67,37 @@ class DispatchTypeParserImpl @Autowired constructor(
         buildId: String,
         dispatchType: DispatchType
     ) {
+        // 针对第三方构建机docker场景处理
+        if (dispatchType is ThirdPartyAgentDispatch && dispatchType.dockerInfo?.storeImage != null) {
+            val dockerInfo = dispatchType.dockerInfo!!
+            // 从商店获取镜像真实信息
+            val imageRepoInfo = storeImageHelper.getImageRepoInfo(
+                userId = userId,
+                projectId = projectId,
+                pipelineId = pipelineId,
+                buildId = buildId,
+                imageCode = dockerInfo.storeImage!!.imageCode,
+                imageVersion = dockerInfo.storeImage!!.imageVersion,
+                defaultPrefix = ""
+            )
+            val completeImageName = getCompleteImageName(imageRepoInfo)
+            // 镜像来源替换为原始来源
+            dockerInfo.image = completeImageName
+            if (dockerInfo.credential == null) {
+                Credential(
+                    credentialId = imageRepoInfo.ticketId,
+                    credentialProjectId = imageRepoInfo.ticketProject,
+                    jobId = null,
+                    acrossTemplateId = null,
+                    user = null,
+                    password = null
+                ).also { dockerInfo.credential = it }
+            } else {
+                dockerInfo.credential!!.credentialId = imageRepoInfo.ticketId
+                dockerInfo.credential!!.credentialProjectId = imageRepoInfo.ticketProject
+            }
+        }
+
         if (dispatchType !is StoreDispatchType) {
             return
         }
@@ -81,18 +115,7 @@ class DispatchTypeParserImpl @Autowired constructor(
                 defaultPrefix = ""
             )
 
-            val completeImageName = if (ImageType.BKDEVOPS == imageRepoInfo.sourceType) {
-                // 蓝盾项目源镜像
-                imageRepoInfo.repoName
-            } else {
-                // 第三方源镜像
-                // dockerhub镜像名称不带斜杠前缀
-                if (imageRepoInfo.repoUrl.isBlank()) {
-                    imageRepoInfo.repoName
-                } else {
-                    "${imageRepoInfo.repoUrl}/${imageRepoInfo.repoName}"
-                }
-            } + ":" + imageRepoInfo.repoTag
+            val completeImageName = getCompleteImageName(imageRepoInfo)
             // 镜像来源替换为原始来源
             dispatchType.imageType = imageRepoInfo.sourceType
             dispatchType.value = completeImageName
@@ -110,6 +133,20 @@ class DispatchTypeParserImpl @Autowired constructor(
         }
     }
 
+    private fun getCompleteImageName(imageRepoInfo: ImageRepoInfo) =
+        if (ImageType.BKDEVOPS == imageRepoInfo.sourceType) {
+            // 蓝盾项目源镜像
+            imageRepoInfo.repoName
+        } else {
+            // 第三方源镜像
+            // dockerhub镜像名称不带斜杠前缀
+            if (imageRepoInfo.repoUrl.isBlank()) {
+                imageRepoInfo.repoName
+            } else {
+                "${imageRepoInfo.repoUrl}/${imageRepoInfo.repoName}"
+            }
+        } + ":" + imageRepoInfo.repoTag
+
     override fun parseInfo(
         projectId: String,
         pipelineId: String,