Skip to content

Commit 10d9e90

Browse files
Merge pull request #6375 from devtron-labs/main-sync-develop-10feb
sync: Main sync develop
2 parents 71c8fea + c7f511a commit 10d9e90

15 files changed

+39
-30
lines changed

CHANGELOG/release-notes-v1.2.2.md

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

charts/devtron/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 1.2.1
3+
appVersion: 1.2.2
44
description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
55
keywords:
66
- Devtron
@@ -11,7 +11,7 @@ keywords:
1111
- argocd
1212
- Hyperion
1313
engine: gotpl
14-
version: 0.22.81
14+
version: 0.22.82
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

charts/devtron/devtron-bom.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ global:
1010
containerRegistry: "quay.io/devtron"
1111
extraManifests: []
1212
installer:
13-
release: "v1.2.1"
13+
release: "v1.2.2"
1414
registry: ""
1515
image: "inception"
1616
tag: "473deaa4-185-21582"
@@ -38,8 +38,8 @@ components:
3838
imagePullPolicy: IfNotPresent
3939
devtron:
4040
registry: ""
41-
image: "hyperion:69603019-280-29389"
42-
cicdImage: "devtron:69603019-434-29388"
41+
image: "hyperion:a9968961-280-29449"
42+
cicdImage: "devtron:a9968961-434-29448"
4343
imagePullPolicy: IfNotPresent
4444
customOverrides: {}
4545
ciRunner:

charts/devtron/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ global:
2424
extraManifests: []
2525
installer:
2626
repo: "devtron-labs/devtron"
27-
release: "v1.2.1"
27+
release: "v1.2.2"
2828
registry: ""
2929
image: inception
3030
tag: 473deaa4-185-21582
@@ -81,8 +81,8 @@ components:
8181
imagePullPolicy: IfNotPresent
8282
devtron:
8383
registry: ""
84-
image: "hyperion:69603019-280-29389"
85-
cicdImage: "devtron:69603019-434-29388"
84+
image: "hyperion:a9968961-280-29449"
85+
cicdImage: "devtron:a9968961-434-29448"
8686
imagePullPolicy: IfNotPresent
8787
customOverrides: {}
8888
serviceMonitor:

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
k8s.io/api => k8s.io/api v0.29.7

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -792,10 +792,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
792792
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
793793
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
794794
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
795-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565 h1:9hEDO9lEgHW73WvsCEUZHM1IbssX1X7LR/n2it71JU0=
796-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565 h1:OZlu0xClOijctMwFa5APd9XDrQamTUqNhiRXXcN2XFM=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
795+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884 h1:wI12BFM1NmAkfCfl0pMQHREuI5Xs0XvuQ8K7Rz39z/8=
796+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884 h1:bEc/5jYG7PlNwRopPks+waUyRQYrY5tiRwOXpzsyhGc=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
799799
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
800800
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
801801
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

manifests/install/devtron-installer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ metadata:
44
name: installer-devtron
55
namespace: devtroncd
66
spec:
7-
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.1/manifests/installation-script
7+
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.2.2/manifests/installation-script

manifests/installation-script

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LTAG="v1.2.1";
1+
LTAG="v1.2.2";
22
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
33

44
log("executed devtron setup installation");

manifests/release.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stable -1 v1.2.1
1+
stable -1 v1.2.2

manifests/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.2.0
1+
v1.2.2

manifests/yamls/devtron.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ spec:
169169
runAsUser: 1000
170170
containers:
171171
- name: devtron
172-
image: "quay.io/devtron/devtron:69603019-434-29388"
172+
image: "quay.io/devtron/devtron:a9968961-434-29448"
173173
securityContext:
174174
allowPrivilegeEscalation: false
175175
runAsUser: 1000

pkg/eventProcessor/in/WorkflowEventProcessorService.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
170170
return
171171
}
172172
wfr.IsArtifactUploaded = cdStageCompleteEvent.IsArtifactUploaded
173+
// currently, CD_STAGE_COMPLETE_TOPIC is published from ci-runner only for pre/post CD success or failure events.
174+
// no other wfr status are sent other than these two.
175+
// a check is in place for all terminal states to ensure future compatibility.
173176
if !slices.Contains(cdWorkflowModelBean.WfrTerminalStatusList, wfr.Status) {
174177
impl.logger.Debugw("event received from ci runner, updating workflow runner status as succeeded", "savedWorkflowRunnerId", wfr.Id, "oldStatus", wfr.Status, "podStatus", wfr.PodStatus)
175178
if cdStageCompleteEvent.IsFailed {
@@ -182,18 +185,17 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
182185
impl.logger.Errorw("update cd-wf-runner failed for id ", "cdWfrId", wfr.Id, "err", err)
183186
return
184187
}
185-
186-
triggerContext := triggerBean.TriggerContext{
187-
ReferenceId: pointer.String(msg.MsgId),
188-
}
189-
impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
190188
} else {
191189
err = impl.cdWorkflowRunnerService.UpdateIsArtifactUploaded(wfr.Id, cdStageCompleteEvent.IsArtifactUploaded)
192190
if err != nil {
193191
impl.logger.Errorw("error in updating isArtifactUploaded", "cdWfrId", wfr.Id, "err", err)
194192
return
195193
}
196194
}
195+
triggerContext := triggerBean.TriggerContext{
196+
ReferenceId: pointer.String(msg.MsgId),
197+
}
198+
impl.handleCDStageCompleteEvent(triggerContext, cdStageCompleteEvent, wfr)
197199
}
198200

199201
// add required logging here

pkg/pipeline/CdHandler.go

+1
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ func (impl *CdHandlerImpl) converterWFR(wfr pipelineConfig.CdWorkflowRunner) pip
832832
workflow.TargetPlatforms = utils.ConvertTargetPlatformStringToObject(wfr.CdWorkflow.CiArtifact.TargetPlatforms)
833833
workflow.PipelineId = wfr.CdWorkflow.PipelineId
834834
workflow.CiArtifactId = wfr.CdWorkflow.CiArtifactId
835+
// TODO: FIXME :- if wfr status is terminal then only migrate isArtifactUploaded flag.
835836
isArtifactUploaded, isMigrationRequired := wfr.GetIsArtifactUploaded()
836837
if isMigrationRequired {
837838
// Migrate isArtifactUploaded. For old records, set isArtifactUploaded -> Uploaded

releasenotes.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## v1.2.1
1+
## v1.2.2
22

33
## Bugs
4-
- fix: Auto cd trigger even if pre-cd fails (#6338)
4+
- fix: Failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci (#6361)
55

66

vendor/modules.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,15 @@ github.com/davecgh/go-spew/spew
336336
# github.com/deckarep/golang-set v1.8.0
337337
## explicit; go 1.17
338338
github.com/deckarep/golang-set
339-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565
339+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
340340
## explicit; go 1.21
341341
github.com/devtron-labs/authenticator/apiToken
342342
github.com/devtron-labs/authenticator/client
343343
github.com/devtron-labs/authenticator/jwt
344344
github.com/devtron-labs/authenticator/middleware
345345
github.com/devtron-labs/authenticator/oidc
346346
github.com/devtron-labs/authenticator/password
347-
# 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
347+
# 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
348348
## explicit; go 1.21
349349
github.com/devtron-labs/common-lib/async
350350
github.com/devtron-labs/common-lib/blob-storage
@@ -2215,8 +2215,8 @@ xorm.io/xorm/log
22152215
xorm.io/xorm/names
22162216
xorm.io/xorm/schemas
22172217
xorm.io/xorm/tags
2218-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250205062151-43fa5137f565
2219-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250205062151-43fa5137f565
2218+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
2219+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
22202220
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22212221
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22222222
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)