Merge branch 'develop' into argo-cd-corrupt-data-fix

Author: prakash100198

USERS.md

@@ -5,20 +5,34 @@ As the community grows, we want to keep track of the users and organizations usi
 Currently, Devtron is being used by the following organizations:
 
 1. [73strings](https://www.73strings.com/)
-2. [Ather Energy](https://www.atherenergy.com/)
-3. [BharatPe](https://bharatpe.com/)
-4. [Birdeye](https://birdeye.com/)
-5. [Bluecopa](https://www.bluecopa.com/) 
-6. [Chitale Bandhu](https://www.chitalebandhu.in/) 
-7. [Centricity](https://centricity.co.in/) 
-8. [Delhivery](https://www.delhivery.com/)
-9. [KHELGroup](https://thekhelgroup.com/)
-10. [Lemnisk](https://www.lemnisk.co/) 
-11. [OTPLess](https://otpless.com/)
-12. [Spinny](https://www.spinny.com/)
-13. [Tata 1Mg](https://www.1mg.com/)
-14. [TravClan](https://www.travclan.com/) 
-15. [Xoxoday](https://www.xoxoday.com/)
-
-
-
+2. [Apica](https://www.apica.io/)
+3. [Ather Energy](https://www.atherenergy.com/)
+4. [BharatPe](https://bharatpe.com/)
+5. [Birdeye](https://birdeye.com/)
+6. [Bluecopa](https://www.bluecopa.com/) 
+7. [Careers 360](https://www.careers360.com/)
+8. [Chitale Bandhu](https://www.chitalebandhu.in/) 
+9.  [Comcast](https://corporate.comcast.com/)
+10. [Delhivery](https://www.delhivery.com/)
+11. [Emplus](https://www.empuls.io/)
+12. [EMT Madrid](https://www.emtmadrid.es/Home)
+13. [Encircle Marketing](https://encircle-marketing.com/)
+14. [FTL Express](https://www.ftl-express.com/)
+15. [Genwise](https://www.genwise.club/)
+16. [HCL Tech](https://www.hcltech.com/)
+17. [Indiamart](https://www.indiamart.com/)
+18. [IPCortex](https://ipcortex.co.uk/)
+19. [Jivi.ai](https://www.jivi.ai/)
+20. [KHELGroup](https://thekhelgroup.com/)
+21. [Kenny LLC](https://kennyl.dev/)
+22. [Lemnisk](https://www.lemnisk.co/) 
+23. [MobileID](https://www.mobileid.ch/en)
+24. [OTPLess](https://otpless.com/)
+25. [University of Albany](https://www.albany.edu/)
+26. [Shiprocket](https://www.shiprocket.in/)
+27. [Spinny](https://www.spinny.com/)
+28. [Tata 1Mg](https://www.1mg.com/)
+29. [Texas Tech University](https://www.ttu.edu/)
+30. [TravClan](https://www.travclan.com/) 
+31. [Xoxoday](https://www.xoxoday.com/)
+32. [Zupee](https://www.zupee.com/)

go.mod

@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213131231-78d5428a91dd
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213131231-78d5428a91dd
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7

go.sum

@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa h1:nPRI806dXm2ZAr43D0wLKU9x7Hca2HS92PKKR24eI7s=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa h1:K4+f7607iFdQFndqva4P6T5dACC9d840hPwmiVkcnAQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213131231-78d5428a91dd h1:ZJ7N6UNrb1CVXhFSKtCkjlz63SxDrMp3z28CDl/xyeQ=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213131231-78d5428a91dd/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213131231-78d5428a91dd h1:9f19EbIVaWIEI5lPXL3ybB88FFZSRvcT5RmbAINr31M=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213131231-78d5428a91dd/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

pkg/eventProcessor/in/WorkflowEventProcessorService.go

@@ -444,12 +444,14 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDWorkflowStatusUpdate() error
 			impl.logger.Error("err", err)
 			return
 		}
+
 		if stateChanged {
 			wfr, err := impl.cdWorkflowRepository.FindWorkflowRunnerById(wfrId)
 			if err != nil {
 				impl.logger.Errorw("could not get wf runner", "wfrId", wfrId, "err", err)
 				return
 			}
+
 			if wfrStatus == string(v1alpha1.NodeFailed) || wfrStatus == string(v1alpha1.NodeError) {
 				if len(wfr.ImagePathReservationIds) > 0 {
 					err := impl.cdHandler.DeactivateImageReservationPathsOnFailure(wfr.ImagePathReservationIds)
@@ -458,22 +460,28 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDWorkflowStatusUpdate() error
 					}
 				}
 			}
-			if wfrStatus == string(v1alpha1.NodeSucceeded) || wfrStatus == string(v1alpha1.NodeFailed) || wfrStatus == string(v1alpha1.NodeError) {
-				eventType := eventUtil.EventType(0)
-				if wfrStatus == string(v1alpha1.NodeSucceeded) {
-					eventType = eventUtil.Success
-				} else if wfrStatus == string(v1alpha1.NodeFailed) || wfrStatus == string(v1alpha1.NodeError) {
-					eventType = eventUtil.Fail
-				}
 
+			wfStatusInEvent := string(wfStatus.Phase)
+			if wfStatusInEvent == string(v1alpha1.NodeSucceeded) || wfStatusInEvent == string(v1alpha1.NodeFailed) || wfStatusInEvent == string(v1alpha1.NodeError) {
+				// the re-trigger should only happen when we get a pod deleted event.
 				if wfr != nil && executors.CheckIfReTriggerRequired(wfrStatus, wfStatus.Message, wfr.Status) {
 					err = impl.workflowDagExecutor.HandleCdStageReTrigger(wfr)
 					if err != nil {
-						//check if this log required or not
+						// check if this log required or not
 						impl.logger.Errorw("error in HandleCdStageReTrigger", "workflowRunnerId", wfr.Id, "workflowStatus", wfrStatus, "workflowStatusMessage", wfStatus.Message, "error", err)
 					}
 					impl.logger.Debugw("re-triggered cd stage", "workflowRunnerId", wfr.Id, "workflowStatus", wfrStatus, "workflowStatusMessage", wfStatus.Message)
 				} else {
+					// we send this notification on *workflow_runner* status, both success and failure
+					// during workflow runner failure, particularly when failure occurred due to pod deletion , we get two events from kubewatch.
+					// event1: with failure status + exit-code [need to send notification]
+					// event2: with failure status + pod deletion message [skip notification]
+					eventType := eventUtil.EventType(0)
+					if wfStatusInEvent == string(v1alpha1.NodeSucceeded) {
+						eventType = eventUtil.Success
+					} else if wfStatusInEvent == string(v1alpha1.NodeFailed) || wfStatusInEvent == string(v1alpha1.NodeError) {
+						eventType = eventUtil.Fail
+					}
 					impl.sendPrePostCdNotificationEvent(eventType, wfr)
 				}
 			}

pkg/pipeline/CdHandler.go

@@ -312,6 +312,7 @@ func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus v1alpha1.WorkflowStatus
 		if string(v1alpha1.NodeError) == savedWorkflow.Status || string(v1alpha1.NodeFailed) == savedWorkflow.Status {
 			impl.Logger.Warnw("cd stage failed for workflow: ", "wfId", savedWorkflow.Id)
 		}
+		return savedWorkflow.Id, savedWorkflow.Status, true, nil
 	}
 	return savedWorkflow.Id, savedWorkflow.Status, false, nil
 }

pkg/pipeline/workflowStatus/WorkflowStageStatusService.go

@@ -134,7 +134,7 @@ func (impl *WorkFlowStageStatusServiceImpl) updatePodStages(currentWorkflowStage
 					stage.Status = bean2.WORKFLOW_STAGE_STATUS_SUCCEEDED
 					stage.EndTime = time.Now().Format(bean3.LayoutRFC3339)
 				}
-			case string(v1alpha1.NodeFailed), string(v1alpha1.NodeError):
+			case string(v1alpha1.NodeFailed), string(v1alpha1.NodeError), string(v1alpha1.NodeSkipped):
 				if stage.Status == bean2.WORKFLOW_STAGE_STATUS_RUNNING ||
 					stage.Status == bean2.WORKFLOW_STAGE_STATUS_NOT_STARTED ||
 					stage.Status == bean2.WORKFLOW_STAGE_STATUS_UNKNOWN {

pkg/pipeline/workflowStatus/repository/WorkflowStageRepository.go

@@ -25,7 +25,7 @@ type WorkflowExecutionStage struct {
 	Id           int                         `sql:"id,pk"`
 	StageName    bean.WorkflowStageName      `sql:"stage_name,notnull"` // same as app name
 	Status       bean.WorkflowStageStatus    `sql:"status"`
-	StatusFor    bean.WorkflowStageStatusFor `sql:"status_type"`
+	StatusFor    bean.WorkflowStageStatusFor `sql:"status_for"`
 	Message      string                      `sql:"message"`
 	Metadata     string                      `sql:"metadata"`
 	WorkflowId   int                         `sql:"workflow_id,notnull"`

scripts/sql/32002900_build_worker_status.down.sql

@@ -1,3 +1,2 @@
-DROP SEQUENCE IF EXISTS id_seq_workflow_execution_stage;
-
-DROP TABLE IF EXISTS public.workflow_execution_stage CASCADE;
+DROP TABLE IF EXISTS public.workflow_execution_stage CASCADE;
+DROP SEQUENCE IF EXISTS id_seq_workflow_execution_stage;

vendor/modules.txt

@@ -340,15 +340,15 @@ github.com/davecgh/go-spew/spew
 # github.com/deckarep/golang-set v1.8.0
 ## explicit; go 1.17
 github.com/deckarep/golang-set
-# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa
+# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213131231-78d5428a91dd
 ## explicit; go 1.21
 github.com/devtron-labs/authenticator/apiToken
 github.com/devtron-labs/authenticator/client
 github.com/devtron-labs/authenticator/jwt
 github.com/devtron-labs/authenticator/middleware
 github.com/devtron-labs/authenticator/oidc
 github.com/devtron-labs/authenticator/password
-# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa
+# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213131231-78d5428a91dd
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/blob-storage
@@ -2219,8 +2219,8 @@ xorm.io/xorm/log
 xorm.io/xorm/names
 xorm.io/xorm/schemas
 xorm.io/xorm/tags
-# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa
+# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250213131231-78d5428a91dd
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250213131231-78d5428a91dd
 # github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 # github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 # k8s.io/api => k8s.io/api v0.29.7