Merge pull request #6433 from devtron-labs/ecr-error-han

prkhrkat · web-flow · commit 93273977f94e · 2025-03-05T18:56:29.000+05:30
fix: createDockerRepoIfNeeded error handling
diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go
@@ -1111,9 +1111,9 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCiConf(createRequest *bean.CiConf
 			}
 			if !ciPipeline.IsExternal { //pipeline is not [linked, webhook] and overridden, then create template override
 				err = impl.createDockerRepoIfNeeded(ciPipeline.DockerConfigOverride.DockerRegistry, ciPipeline.DockerConfigOverride.DockerRepository)
+				// silently ignoring the error, since we don't want to fail the pipeline creation
 				if err != nil {
-					impl.logger.Errorw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)
-					return nil, err
+					impl.logger.Warnw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)
 				}
 				err := impl.ciTemplateService.Save(ciTemplateBean)
 				if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1111,9 +1111,9 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCiConf(createRequest *bean.CiConf`
`1111`	`1111`	`}`
`1112`	`1112`	`if !ciPipeline.IsExternal { //pipeline is not [linked, webhook] and overridden, then create template override`
`1113`	`1113`	`err = impl.createDockerRepoIfNeeded(ciPipeline.DockerConfigOverride.DockerRegistry, ciPipeline.DockerConfigOverride.DockerRepository)`
	`1114`	`+ // silently ignoring the error, since we don't want to fail the pipeline creation`
`1114`	`1115`	`if err != nil {`
`1115`		`- impl.logger.Errorw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)`
`1116`		`- return nil, err`
	`1116`	`+ impl.logger.Warnw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)`
`1117`	`1117`	`}`
`1118`	`1118`	`err := impl.ciTemplateService.Save(ciTemplateBean)`
`1119`	`1119`	`if err != nil {`