Skip to content

fix: Deploying currently Active image using TriggerDeploy API from devtctl tool is broken #4056

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 5 commits into from
Oct 10, 2023
Merged

fix: Deploying currently Active image using TriggerDeploy API from devtctl tool is broken #4056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bca5314
check for release exist or not for helm
Ashish-devtron Oct 10, 2023
ebc95a4
return appDetail on err
Ashish-devtron Oct 10, 2023
87a1d07
not exist check for helm
Ashish-devtron Oct 10, 2023
c918c79
Merge branch 'main' into helm-bulk-deploy-fix
Ashish-devtron Oct 10, 2023
ee5bf1f
make constant for strings
Ashish-devtron Oct 10, 2023
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
3 changes: 3 additions & 0 deletions pkg/bean/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,9 @@ const (
NOT_YET_DELETED Status = "Not yet deleted"
)

const RELEASE_NOT_EXIST = "release not exist"
const NOT_FOUND = "not found"

func (a CdPatchAction) String() string {
return [...]string{"CREATE", "DELETE", "CD_UPDATE"}[a]
}
Expand Down
8 changes: 7 additions & 1 deletion pkg/pipeline/PipelineBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,8 @@ func (impl *PipelineBuilderImpl) FetchDeletedApp(ctx context.Context,
if err != nil {
impl.logger.Errorw("error in getting application detail", "err", err, "deploymentAppName", deploymentAppName)
}
if err != nil && strings.Contains(err.Error(), "not found") {

if err != nil && checkAppReleaseNotExist(err) {
successfulPipelines = impl.appendToDeploymentChangeStatusList(
successfulPipelines,
pipeline,
Expand Down Expand Up @@ -1942,3 +1943,8 @@ func (impl *PipelineBuilderImpl) buildResponses() []bean.ResponseSchemaObject {
responseSchemaObjects = append(responseSchemaObjects, response401)
return responseSchemaObjects
}

func checkAppReleaseNotExist(err error) bool {
// RELEASE_NOT_EXIST check for helm App and NOT_FOUND check for argo app
return strings.Contains(err.Error(), bean.NOT_FOUND) || strings.Contains(err.Error(), bean.RELEASE_NOT_EXIST)
}