Merge pull request #6375 from devtron-labs/main-sync-develop-10feb

vikramdevtron · web-flow · commit 10d9e9086cd3 · 2025-02-10T12:12:20.000+05:30
sync: Main sync develop
diff --git a/CHANGELOG/release-notes-v1.2.2.md b/CHANGELOG/release-notes-v1.2.2.md
@@ -0,0 +1,6 @@
+## v1.2.2
+
+## Bugs
+- fix: Failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci  (#6361)
+
+
diff --git a/charts/devtron/Chart.yaml b/charts/devtron/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 1.2.1
+appVersion: 1.2.2
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.81
+version: 0.22.82
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
diff --git a/charts/devtron/devtron-bom.yaml b/charts/devtron/devtron-bom.yaml
@@ -10,7 +10,7 @@ global:
   containerRegistry: "quay.io/devtron"
 extraManifests: []
 installer:
-  release: "v1.2.1"
+  release: "v1.2.2"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -38,8 +38,8 @@ components:
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:69603019-280-29389"
-    cicdImage: "devtron:69603019-434-29388"
+    image: "hyperion:a9968961-280-29449"
+    cicdImage: "devtron:a9968961-434-29448"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
   ciRunner:
diff --git a/charts/devtron/values.yaml b/charts/devtron/values.yaml
@@ -24,7 +24,7 @@ global:
 extraManifests: []
 installer:
   repo: "devtron-labs/devtron"
-  release: "v1.2.1"
+  release: "v1.2.2"
   registry: ""
   image: inception
   tag: 473deaa4-185-21582
@@ -81,8 +81,8 @@ components:
     imagePullPolicy: IfNotPresent
   devtron:
     registry: ""
-    image: "hyperion:69603019-280-29389"
-    cicdImage: "devtron:69603019-434-29388"
+    image: "hyperion:a9968961-280-29449"
+    cicdImage: "devtron:a9968961-434-29448"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     serviceMonitor:
diff --git a/go.mod b/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-20250205062151-43fa5137f565
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
 	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
diff --git a/go.sum b/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-20250205062151-43fa5137f565 h1:9hEDO9lEgHW73WvsCEUZHM1IbssX1X7LR/n2it71JU0=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565 h1:OZlu0xClOijctMwFa5APd9XDrQamTUqNhiRXXcN2XFM=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884 h1:wI12BFM1NmAkfCfl0pMQHREuI5Xs0XvuQ8K7Rz39z/8=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884 h1:bEc/5jYG7PlNwRopPks+waUyRQYrY5tiRwOXpzsyhGc=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884/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=
diff --git a/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml
@@ -4,4 +4,4 @@ metadata:
   name: installer-devtron
   namespace: devtroncd
 spec:
-  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.1/manifests/installation-script
+  url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.2/manifests/installation-script
diff --git a/manifests/installation-script b/manifests/installation-script
@@ -1,4 +1,4 @@
-LTAG="v1.2.1";
+LTAG="v1.2.2";
 REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
 
 log("executed devtron setup installation");
diff --git a/manifests/release.txt b/manifests/release.txt
@@ -1 +1 @@
-stable -1 v1.2.1
+stable -1 v1.2.2
diff --git a/manifests/version.txt b/manifests/version.txt
@@ -1 +1 @@
-v1.2.0
+v1.2.2
diff --git a/manifests/yamls/devtron.yaml b/manifests/yamls/devtron.yaml
@@ -169,7 +169,7 @@ spec:
         runAsUser: 1000
       containers:
         - name: devtron
-          image: "quay.io/devtron/devtron:69603019-434-29388"
+          image: "quay.io/devtron/devtron:a9968961-434-29448"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 1000
diff --git a/pkg/eventProcessor/in/WorkflowEventProcessorService.go b/pkg/eventProcessor/in/WorkflowEventProcessorService.go
@@ -170,6 +170,9 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
 			return
 		}
 		wfr.IsArtifactUploaded = cdStageCompleteEvent.IsArtifactUploaded
+		// currently, CD_STAGE_COMPLETE_TOPIC is published from ci-runner only for pre/post CD success or failure events.
+		// no other wfr status are sent other than these two.
+		// a check is in place for all terminal states to ensure future compatibility.
 		if !slices.Contains(cdWorkflowModelBean.WfrTerminalStatusList, wfr.Status) {
 			impl.logger.Debugw("event received from ci runner, updating workflow runner status as succeeded", "savedWorkflowRunnerId", wfr.Id, "oldStatus", wfr.Status, "podStatus", wfr.PodStatus)
 			if cdStageCompleteEvent.IsFailed {
@@ -182,18 +185,17 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
 				impl.logger.Errorw("update cd-wf-runner failed for id ", "cdWfrId", wfr.Id, "err", err)
 				return
 			}
-
-			triggerContext := triggerBean.TriggerContext{
-				ReferenceId: pointer.String(msg.MsgId),
-			}
-			impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
 		} else {
 			err = impl.cdWorkflowRunnerService.UpdateIsArtifactUploaded(wfr.Id, cdStageCompleteEvent.IsArtifactUploaded)
 			if err != nil {
 				impl.logger.Errorw("error in updating isArtifactUploaded", "cdWfrId", wfr.Id, "err", err)
 				return
 			}
 		}
+		triggerContext := triggerBean.TriggerContext{
+			ReferenceId: pointer.String(msg.MsgId),
+		}
+		impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
 	}
 
 	// add required logging here
diff --git a/pkg/pipeline/CdHandler.go b/pkg/pipeline/CdHandler.go
@@ -832,6 +832,7 @@ func (impl *CdHandlerImpl) converterWFR(wfr pipelineConfig.CdWorkflowRunner) pip
 		workflow.TargetPlatforms = utils.ConvertTargetPlatformStringToObject(wfr.CdWorkflow.CiArtifact.TargetPlatforms)
 		workflow.PipelineId = wfr.CdWorkflow.PipelineId
 		workflow.CiArtifactId = wfr.CdWorkflow.CiArtifactId
+		// TODO: FIXME :- if wfr status is terminal then only migrate isArtifactUploaded flag.
 		isArtifactUploaded, isMigrationRequired := wfr.GetIsArtifactUploaded()
 		if isMigrationRequired {
 			// Migrate isArtifactUploaded. For old records, set isArtifactUploaded -> Uploaded
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,6 +1,6 @@
-## v1.2.1
+## v1.2.2
 
 ## Bugs
-- fix: Auto cd trigger even if pre-cd fails (#6338)
+- fix: Failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci  (#6361)
 
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -336,15 +336,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-20250205062151-43fa5137f565
+# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
 ## 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-20250205062151-43fa5137f565
+# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
 ## explicit; go 1.21
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/blob-storage
@@ -2215,8 +2215,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-20250205062151-43fa5137f565
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565
+# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
 # 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

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +## v1.2.2
++
 +## Bugs
 +- fix: Failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci  (#6361)
++
++