feat: deployment cron updated

api/helm-app/HelmAppService.go

@@ -41,7 +41,7 @@ import (
 type HelmAppService interface {
 	ListHelmApplications(ctx context.Context, clusterIds []int, w http.ResponseWriter, token string, helmAuth func(token string, object string) bool)
 	GetApplicationDetail(ctx context.Context, app *AppIdentifier) (*AppDetail, error)
-	GetApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error)
+	GetApplicationAndReleaseStatus(ctx context.Context, app *AppIdentifier) (*AppStatus, error)
 	GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error)
 	HibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
 	UnHibernateApplication(ctx context.Context, app *AppIdentifier, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error)
@@ -274,8 +274,8 @@ func (impl *HelmAppServiceImpl) GetApplicationDetail(ctx context.Context, app *A
 	return impl.getApplicationDetail(ctx, app, nil)
 }
 
-func (impl *HelmAppServiceImpl) GetApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error) {
-	return impl.getApplicationStatus(ctx, app)
+func (impl *HelmAppServiceImpl) GetApplicationAndReleaseStatus(ctx context.Context, app *AppIdentifier) (*AppStatus, error) {
+	return impl.getApplicationAndReleaseStatus(ctx, app)
 }
 
 func (impl *HelmAppServiceImpl) GetApplicationDetailWithFilter(ctx context.Context, app *AppIdentifier, resourceTreeFilter *ResourceTreeFilter) (*AppDetail, error) {
@@ -318,12 +318,11 @@ func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *A
 	return appdetail, err
 }
 
-func (impl *HelmAppServiceImpl) getApplicationStatus(ctx context.Context, app *AppIdentifier) (string, error) {
-	applicationStatus := ""
+func (impl *HelmAppServiceImpl) getApplicationAndReleaseStatus(ctx context.Context, app *AppIdentifier) (*AppStatus, error) {
 	config, err := impl.GetClusterConf(app.ClusterId)
 	if err != nil {
 		impl.logger.Errorw("error in fetching cluster detail", "err", err)
-		return applicationStatus, err
+		return nil, err
 	}
 	req := &AppDetailRequest{
 		ClusterConfig: config,
@@ -333,10 +332,9 @@ func (impl *HelmAppServiceImpl) getApplicationStatus(ctx context.Context, app *A
 	appStatus, err := impl.helmAppClient.GetAppStatus(ctx, req)
 	if err != nil {
 		impl.logger.Errorw("error in fetching app status", "err", err)
-		return applicationStatus, err
+		return nil, err
 	}
-	applicationStatus = appStatus.ApplicationStatus
-	return applicationStatus, err
+	return appStatus, err
 }
 
 func (impl *HelmAppServiceImpl) GetDeploymentHistory(ctx context.Context, app *AppIdentifier) (*HelmAppDeploymentHistory, error) {

api/helm-app/applist.proto

@@ -82,6 +82,8 @@ message AppDetail{
 
 message AppStatus{
   string applicationStatus = 1;
+  string ReleaseStatus = 2;
+  google.protobuf.Timestamp LastDeployed = 3;
 }
 
 message ReleaseStatus {

internal/util/ErrorUtil.go

@@ -53,5 +53,5 @@ func GetGRPCErrorDetailedMessage(err error) string {
 	if errStatus, ok := status.FromError(err); ok {
 		return errStatus.Message()
 	}
-	return ""
+	return err.Error()
 }

pkg/pipeline/CdHandler.go

@@ -43,6 +43,7 @@ import (
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
 	bean2 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
+	serverBean "github.com/devtron-labs/devtron/pkg/server/bean"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/devtron-labs/devtron/pkg/user"
 	util3 "github.com/devtron-labs/devtron/util"
@@ -460,26 +461,36 @@ func (impl *CdHandlerImpl) CheckHelmAppStatusPeriodicallyAndUpdateInDb(helmPipel
 			Namespace:   wfr.CdWorkflow.Pipeline.Environment.Namespace,
 			ReleaseName: wfr.CdWorkflow.Pipeline.DeploymentAppName,
 		}
-		helmAppStatus, err := impl.helmAppService.GetApplicationStatus(context.Background(), appIdentifier)
+		helmInstalledDevtronApp, err := impl.helmAppService.GetApplicationAndReleaseStatus(context.Background(), appIdentifier)
 		if err != nil {
 			impl.Logger.Errorw("error in getting helm app release status ", "appIdentifier", appIdentifier, "err", err)
-			//return err
-			//skip this error and continue for next workflow status
-			impl.Logger.Warnw("found error, skipping helm apps status update for this trigger", "appIdentifier", appIdentifier, "err", err)
-
 			// Handle release not found errors
-			if !strings.Contains(err.Error(), "release: not found") {
+			if util.GetGRPCErrorDetailedMessage(err) != client.ErrReleaseNotFound {
+				//skip this error and continue for next workflow status
+				impl.Logger.Warnw("found error, skipping helm apps status update for this trigger", "appIdentifier", appIdentifier, "err", err)
 				continue
+			} else {
+				// If release not found, mark the deployment as failure
+				wfr.Status = pipelineConfig.WorkflowFailed
+				wfr.FinishedOn = time.Now()
 			}
-		}
-		if helmAppStatus == application.Healthy {
+		} else if helmInstalledDevtronApp.GetLastDeployed().AsTime().Before(wfr.StartedOn) {
+			//skip if there is no deployment after wfr.StartedOn and continue for next workflow status
+			impl.Logger.Warnw("release mismatched, skipping helm apps status update for this trigger", "appIdentifier", appIdentifier, "err", err)
+			continue
+		} else if helmInstalledDevtronApp.GetReleaseStatus() == serverBean.HelmReleaseStatusPendingInstall {
+			if time.Now().After(helmInstalledDevtronApp.GetLastDeployed().AsTime().Add(5 * time.Minute)) {
+				// If release status is in pending-install for more than 5 mins, then mark the deployment as failure
+				wfr.Status = pipelineConfig.WorkflowFailed
+				wfr.FinishedOn = time.Now()
+			} else {
+				wfr.Status = pipelineConfig.WorkflowInProgress
+			}
+		} else if helmInstalledDevtronApp.GetReleaseStatus() == serverBean.HelmReleaseStatusDeployed &&
+			helmInstalledDevtronApp.GetApplicationStatus() == application.Healthy {
+			// mark the deployment as succeed
 			wfr.Status = pipelineConfig.WorkflowSucceeded
 			wfr.FinishedOn = time.Now()
-
-		} else if err != nil && strings.Contains(err.Error(), "release: not found") {
-			// If release not found, mark the deployment as failure
-			wfr.Status = pipelineConfig.WorkflowFailed
-
 		} else {
 			wfr.Status = pipelineConfig.WorkflowInProgress
 		}
@@ -499,7 +510,7 @@ func (impl *CdHandlerImpl) CheckHelmAppStatusPeriodicallyAndUpdateInDb(helmPipel
 		}
 		util3.TriggerCDMetrics(cdMetrics, impl.config.ExposeCDMetrics)
 		impl.Logger.Infow("updated workflow runner status for helm app", "wfr", wfr)
-		if helmAppStatus == application.Healthy {
+		if wfr.Status == pipelineConfig.WorkflowSucceeded {
 			pipelineOverride, err := impl.pipelineOverrideRepository.FindLatestByCdWorkflowId(wfr.CdWorkflowId)
 			if err != nil {
 				impl.Logger.Errorw("error in getting latest pipeline override by cdWorkflowId", "err", err, "cdWorkflowId", wfr.CdWorkflowId)

pkg/pipeline/WorkflowDagExecutor.go

@@ -2205,7 +2205,7 @@ func (impl *WorkflowDagExecutorImpl) MarkCurrentDeploymentFailed(runner *pipelin
 	//update current WF with error status
 	impl.logger.Errorw("error in triggering cd WF, setting wf status as fail ", "wfId", runner.Id, "err", releaseErr)
 	runner.Status = pipelineConfig.WorkflowFailed
-	runner.Message = releaseErr.Error()
+	runner.Message = util.GetGRPCErrorDetailedMessage(releaseErr)
 	runner.FinishedOn = time.Now()
 	runner.UpdatedOn = time.Now()
 	runner.UpdatedBy = triggeredBy