From 44c7b06d690b0dbf5543c66da54c8f5ec7622280 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 5 Feb 2025 18:24:30 +0530 Subject: [PATCH 1/4] handleCDStageCompleteEvent placed correctly, making it independent of the check that terminal state of a workflow is reached or not.. and minor comments added --- .../in/WorkflowEventProcessorService.go | 12 +++++++----- pkg/pipeline/CdHandler.go | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/eventProcessor/in/WorkflowEventProcessorService.go b/pkg/eventProcessor/in/WorkflowEventProcessorService.go index 7328c13825..e6b696136e 100644 --- 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,11 +185,6 @@ 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 { @@ -194,6 +192,10 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error { 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 index 89d24826e1..21196d5d60 100644 --- a/pkg/pipeline/CdHandler.go +++ b/pkg/pipeline/CdHandler.go @@ -785,6 +785,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 From 59d2a66a1546f71a3df97e706da9247a9150f514 Mon Sep 17 00:00:00 2001 From: systemsdt <129372406+systemsdt@users.noreply.github.com> Date: Wed, 5 Feb 2025 22:28:22 +0530 Subject: [PATCH 2/4] release: PR for v1.2.2 (#6354) * Updated release-notes files * Updated latest image of hyperion in installer * Updated release notes * Updated latest image of hyperion in installer * Updated release notes * Update beta-releasenotes.md * Update release.txt * Update beta-releasenotes.md * Updated latest image of hyperion in installer * Updated latest image of devtron in installer * Update version.txt * Update release.txt * Update installation-script * Update devtron-installer.yaml * Update values.yaml * Update devtron-bom.yaml * Update Chart.yaml * Updated release-notes files --------- Co-authored-by: Pawan Mehta <117346502+pawan-mehta-dt@users.noreply.github.com> Co-authored-by: ReleaseBot --- CHANGELOG/release-notes-v1.2.2.md | 6 ++++++ charts/devtron/Chart.yaml | 4 ++-- charts/devtron/devtron-bom.yaml | 6 +++--- charts/devtron/values.yaml | 6 +++--- manifests/install/devtron-installer.yaml | 2 +- manifests/installation-script | 2 +- manifests/release.txt | 2 +- manifests/version.txt | 2 +- manifests/yamls/devtron.yaml | 2 +- releasenotes.md | 4 ++-- 10 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 CHANGELOG/release-notes-v1.2.2.md diff --git a/CHANGELOG/release-notes-v1.2.2.md b/CHANGELOG/release-notes-v1.2.2.md new file mode 100644 index 0000000000..0b9d51b6f7 --- /dev/null +++ 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 index fd3d7ad51c..8deba3c33a 100644 --- 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 index 1e29c921b5..364534e714 100644 --- 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 index 5e6581d0d1..447466fe16 100644 --- 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/manifests/install/devtron-installer.yaml b/manifests/install/devtron-installer.yaml index 2b2721abe1..a9fde68b76 100644 --- 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 index ff3988c051..450b001610 100644 --- 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 index f6ea0f2d65..0a456fa5ca 100644 --- 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 index 79127d85a4..cc904638af 100644 --- 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 index 66d5930c61..c655421e97 100644 --- 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/releasenotes.md b/releasenotes.md index d6273a0ca9..0b9d51b6f7 100644 --- 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) From 93c99f7affd9a6675baec418fcba545ed5d4054a Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 7 Feb 2025 13:38:29 +0530 Subject: [PATCH 3/4] eso secret data clone fix --- pkg/appClone/AppCloneService.go | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkg/appClone/AppCloneService.go b/pkg/appClone/AppCloneService.go index 4daee21c85..44a1d7a409 100644 --- a/pkg/appClone/AppCloneService.go +++ b/pkg/appClone/AppCloneService.go @@ -548,19 +548,24 @@ func (impl *AppCloneServiceImpl) configDataClone(cfData []*bean3.ConfigData) []* var copiedData []*bean3.ConfigData for _, refdata := range cfData { data := &bean3.ConfigData{ - Name: refdata.Name, - Type: refdata.Type, - External: refdata.External, - MountPath: refdata.MountPath, - Data: refdata.Data, - DefaultData: refdata.DefaultData, - DefaultMountPath: refdata.DefaultMountPath, - Global: refdata.Global, - ExternalSecretType: refdata.ExternalSecretType, - FilePermission: refdata.FilePermission, - SubPath: refdata.SubPath, - ESOSubPath: refdata.ESOSubPath, - MergeStrategy: refdata.MergeStrategy, + Name: refdata.Name, + Type: refdata.Type, + External: refdata.External, + MountPath: refdata.MountPath, + Data: refdata.Data, + DefaultData: refdata.DefaultData, + DefaultMountPath: refdata.DefaultMountPath, + Global: refdata.Global, + ExternalSecretType: refdata.ExternalSecretType, + FilePermission: refdata.FilePermission, + SubPath: refdata.SubPath, + ESOSubPath: refdata.ESOSubPath, + MergeStrategy: refdata.MergeStrategy, + ESOSecretData: refdata.ESOSecretData, + DefaultESOSecretData: refdata.DefaultESOSecretData, + ExternalSecret: refdata.ExternalSecret, + DefaultExternalSecret: refdata.DefaultExternalSecret, + RoleARN: refdata.RoleARN, } copiedData = append(copiedData, data) } From c7f511a124b48c0f237df3a1015b5de9bc5003d4 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Mon, 10 Feb 2025 12:07:57 +0530 Subject: [PATCH 4/4] main sync develop and vendor update --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 5090e43b14..df88b945a9 100644 --- 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 index b7972b8060..d0b8f82530 100644 --- 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/vendor/modules.txt b/vendor/modules.txt index f0d590e37a..6c6184d29a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -336,7 +336,7 @@ 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 @@ -344,7 +344,7 @@ 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