From 706567af2f6c899074c407098e32a667933d1169 Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 5 Mar 2025 18:43:12 +0530 Subject: [PATCH 1/3] createDockerRepoIfNeeded error handling --- pkg/pipeline/CiCdPipelineOrchestrator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go index 5cb81e2372..ce64ced42f 100644 --- 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 ignore 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 } err := impl.ciTemplateService.Save(ciTemplateBean) if err != nil { From 698950f293180ca1c6b0b0a8f50ac6d5c212c9ee Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 5 Mar 2025 18:44:57 +0530 Subject: [PATCH 2/3] createDockerRepoIfNeeded error handling --- pkg/pipeline/CiCdPipelineOrchestrator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go index ce64ced42f..ae6d99a63b 100644 --- a/pkg/pipeline/CiCdPipelineOrchestrator.go +++ b/pkg/pipeline/CiCdPipelineOrchestrator.go @@ -1111,7 +1111,7 @@ 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 ignore the error, since we don't want to fail the pipeline creation + // 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) } From 34dd56c3e8231e15b98888431e6324c5ce9bfa5b Mon Sep 17 00:00:00 2001 From: prakhar katiyar Date: Wed, 5 Mar 2025 18:53:48 +0530 Subject: [PATCH 3/3] createDockerRepoIfNeeded error handling --- pkg/pipeline/CiCdPipelineOrchestrator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go index ae6d99a63b..6f58d9a8fc 100644 --- a/pkg/pipeline/CiCdPipelineOrchestrator.go +++ b/pkg/pipeline/CiCdPipelineOrchestrator.go @@ -1113,7 +1113,7 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCiConf(createRequest *bean.CiConf 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) + impl.logger.Warnw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository) } err := impl.ciTemplateService.Save(ciTemplateBean) if err != nil {