Skip to content

Commit e32a164

Browse files
committed
improve vm deploy job's DockerRegistryID
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent 4dce15f commit e32a164

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

  • pkg/microservice/aslan/core/workflow/service/workflow/controller/job

pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,12 @@ func (j VMDeployJobController) ToTask(taskID int64) ([]*commonmodels.JobTask, er
270270
originS3StorageSubfolder = s3Storage.Subfolder
271271
}
272272

273-
registry, err := commonservice.FindRegistryById(j.jobSpec.DockerRegistryID, true, log.SugaredLogger())
274-
if err != nil {
275-
return resp, fmt.Errorf("find registry: %s error: %v", j.jobSpec.DockerRegistryID, err)
273+
var registry *commonmodels.RegistryNamespace
274+
if j.jobSpec.DockerRegistryID != "" {
275+
registry, err = commonservice.FindRegistryById(j.jobSpec.DockerRegistryID, true, log.SugaredLogger())
276+
if err != nil {
277+
return resp, fmt.Errorf("find registry: %s error: %v", j.jobSpec.DockerRegistryID, err)
278+
}
276279
}
277280

278281
buildSvc := commonservice.NewBuildService()
@@ -663,9 +666,11 @@ func getVMDeployJobVariables(vmDeploy *commonmodels.ServiceAndVMDeploy, buildInf
663666
ret = append(ret, prepareDefaultWorkflowTaskEnvs(project, workflowName, workflowDisplayName, infrastructure, taskID)...)
664667

665668
// registry envs
666-
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
667-
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
668-
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})
669+
if registry != nil {
670+
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_HOST", Value: registry.RegAddr, IsCredential: false})
671+
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_AK", Value: registry.AccessKey, IsCredential: false})
672+
ret = append(ret, &commonmodels.KeyVal{Key: "DOCKER_REGISTRY_SK", Value: registry.SecretKey, IsCredential: true})
673+
}
669674

670675
// repo envs
671676
ret = append(ret, getReposVariables(buildInfo.DeployRepos)...)

0 commit comments

Comments
 (0)