Skip to content

fix: deploymentApp creation check update #2600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2022
Merged

fix: deploymentApp creation check update #2600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions pkg/app/AppService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,12 @@ func (impl AppServiceImpl) createArgoApplicationIfRequired(appId int, appName st
if err != nil {
return "", err
}
//update cd pipeline to mark deployment app created
_, err = impl.updatePipeline(pipeline, userId)
if err != nil {
impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err)
return "", err
}
return argoAppName, nil
}
}
Expand Down Expand Up @@ -943,7 +949,7 @@ func (impl AppServiceImpl) TriggerRelease(overrideRequest *bean.ValuesOverrideRe

// ACD app creation STARTS HERE, it will use existing if already created
impl.logger.Debugw("new pipeline found", "pipeline", pipeline)
name, err := impl.createArgoApplicationIfRequired(overrideRequest.AppId, pipeline.App.AppName, envOverride, pipeline, deployedBy)
name, err := impl.createArgoApplicationIfRequired(overrideRequest.AppId, pipeline.App.AppName, envOverride, pipeline, overrideRequest.UserId)
if err != nil {
impl.logger.Errorw("acd application create error on cd trigger", "err", err, "req", overrideRequest)
return 0, err
Expand Down Expand Up @@ -1039,13 +1045,6 @@ func (impl AppServiceImpl) TriggerRelease(overrideRequest *bean.ValuesOverrideRe
}
}

//update cd pipeline to mark deployment app created
_, err = impl.updatePipeline(pipeline, overrideRequest.UserId)
if err != nil {
impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err)
return 0, err
}

go impl.WriteCDTriggerEvent(overrideRequest, pipeline, envOverride, materialInfoMap, artifact, releaseId, pipelineOverrideId)
if artifact.ScanEnabled {
_ = impl.MarkImageScanDeployed(overrideRequest.AppId, envOverride.TargetEnvironment, artifact.ImageDigest, pipeline.Environment.ClusterId)
Expand Down Expand Up @@ -1931,6 +1930,12 @@ func (impl AppServiceImpl) createHelmAppForCdPipeline(overrideRequest *bean.Valu
return false, err
}
isSuccess = helmResponse.Success
//update cd pipeline to mark deployment app created
_, err = impl.updatePipeline(pipeline, overrideRequest.UserId)
if err != nil {
impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err)
return false, err
}
}

// update deployment status, used in deployment history
Expand Down