Skip to content

Commit 924cc21

Browse files
authored
fix helm pipeline delete bug (#3245)
1 parent 3eddc50 commit 924cc21

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

pkg/pipeline/PipelineBuilder.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,12 +1814,16 @@ func (impl PipelineBuilderImpl) DeleteCdPipeline(pipeline *pipelineConfig.Pipeli
18141814
Namespace: pipeline.Environment.Namespace,
18151815
}
18161816
deleteResponse, err := impl.helmAppService.DeleteApplication(ctx, appIdentifier)
1817-
if err != nil {
1818-
impl.logger.Errorw("error in deleting helm application", "error", err, "appIdentifier", appIdentifier)
1819-
return err
1820-
}
1821-
if deleteResponse == nil || !deleteResponse.GetSuccess() {
1822-
return errors.New("delete application response unsuccessful")
1817+
if forceDelete {
1818+
impl.logger.Warnw("error while deletion of helm application, ignore error and delete from db since force delete req", "error", err, "pipelineId", pipeline.Id)
1819+
} else {
1820+
if err != nil {
1821+
impl.logger.Errorw("error in deleting helm application", "error", err, "appIdentifier", appIdentifier)
1822+
return err
1823+
}
1824+
if deleteResponse == nil || !deleteResponse.GetSuccess() {
1825+
return errors.New("delete application response unsuccessful")
1826+
}
18231827
}
18241828
}
18251829
}

0 commit comments

Comments
 (0)