Skip to content

Commit 3b9a56b

Browse files
Merge pull request #6426 from devtron-labs/main-sync-rc30
sync: Main sync rc30
2 parents 39e45ec + ca52511 commit 3b9a56b

File tree

14 files changed

+27
-57
lines changed

14 files changed

+27
-57
lines changed

USERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Currently, Devtron is being used by the following organizations:
1414
8. [Chitale Bandhu](https://www.chitalebandhu.in/)
1515
9. [Comcast](https://corporate.comcast.com/)
1616
10. [Delhivery](https://www.delhivery.com/)
17-
11. [Emplus](https://www.empuls.io/)
17+
11. [Empuls](https://www.empuls.io/)
1818
12. [EMT Madrid](https://www.emtmadrid.es/Home)
1919
13. [Encircle Marketing](https://encircle-marketing.com/)
2020
14. [FTL Express](https://www.ftl-express.com/)

charts/devtron/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: devtron-operator
3-
appVersion: 1.3.0
3+
appVersion: 1.3.1
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.83
14+
version: 0.22.86
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

charts/devtron/devtron-bom.yaml

Lines changed: 2 additions & 2 deletions
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.3.0"
13+
release: "v1.3.1"
1414
registry: ""
1515
image: "inception"
1616
tag: "473deaa4-185-21582"
@@ -71,7 +71,7 @@ components:
7171
keyName: postgresql-password
7272
kubewatch:
7373
registry: ""
74-
image: "kubewatch:0dde3b1a-419-30080"
74+
image: "kubewatch:0dde3b1a-419-30285"
7575
imagePullPolicy: IfNotPresent
7676
configs:
7777
devtroncd_NAMESPACE: "devtron-ci"

charts/devtron/templates/kubewatch.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ rules:
3030
- persistentvolumes
3131
- events
3232
- workflows
33+
- secrets
3334
verbs:
3435
- list
3536
- watch
@@ -221,4 +222,4 @@ spec:
221222
revisionHistoryLimit: 3
222223
{{- end }}
223224
{{- end }}
224-
{{- end }}
225+
{{- end }}

charts/devtron/templates/postgresql.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,11 +575,11 @@ spec:
575575
secretKeyRef:
576576
name: postgresql-postgresql
577577
key: postgresql-password
578+
- name: DATA_SOURCE_USER
579+
value: postgres
578580
envFrom:
579581
- configMapRef:
580582
name: devtron-common-cm
581-
- name: DATA_SOURCE_USER
582-
value: postgres
583583
{{- if .postgresExporter }}
584584
{{- if .postgresExporter.resources }}
585585
resources:

charts/devtron/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ global:
3131
extraManifests: []
3232
installer:
3333
repo: "devtron-labs/devtron"
34-
release: "v1.3.0"
34+
release: "v1.3.1"
3535
registry: ""
3636
image: inception
3737
tag: 473deaa4-185-21582
@@ -142,7 +142,7 @@ components:
142142
keyName: postgresql-password
143143
kubewatch:
144144
registry: ""
145-
image: "kubewatch:0dde3b1a-419-30080"
145+
image: "kubewatch:0dde3b1a-419-30285"
146146
imagePullPolicy: IfNotPresent
147147
configs:
148148
devtroncd_NAMESPACE: "devtron-ci"

go.mod

Lines changed: 2 additions & 2 deletions
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-20250220070353-8b4fe6516dfc
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250220070353-8b4fe6516dfc
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c
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

Lines changed: 4 additions & 4 deletions
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-20250220070353-8b4fe6516dfc h1:M22DIqq9eJSP8vHyT2RJJOJXHwPdtCppuvuyVeDTXt0=
796-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250220070353-8b4fe6516dfc/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250220070353-8b4fe6516dfc h1:KpPXUJQ+zz9SdV+BHov3ORB2kyW79d+aLL3AHnlKZYc=
798-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250220070353-8b4fe6516dfc/go.mod h1:1QJJLpgJSkb5Jm9xPeKAk+kXb0QgBOOOgJj0cgYhAVA=
795+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c h1:4RhCBihmoekyyYLGBF9uK3+u1vD9BZLTnLhG2nT57Ng=
796+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c/go.mod h1:5lv4Wfj5ERhhvDGXe2IeES6qxjvUVCcohaRwKnWBMNo=
797+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c h1:Gwt5ITeOJwGyca1VgdHxlbgpjfnFVigpyaTq4q+YQhE=
798+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c/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

Lines changed: 1 addition & 1 deletion
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.3.0/manifests/installation-script
7+
url: https://raw.githubusercontent.com/devtron-labs/devtron/v1.3.1/manifests/installation-script

manifests/installation-script

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LTAG="v1.3.0";
1+
LTAG="v1.3.1";
22
REPO_RAW_URL="https://raw.githubusercontent.com/devtron-labs/devtron/";
33

44
log("executed devtron setup installation");

manifests/release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
stable -1 v1.3.0
1+
stable -1 v1.3.1

manifests/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.3.0
1+
v1.3.1

releasenotes.md

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,6 @@
1-
## v1.3.0
1+
## v1.3.1
22

33
## Bugs
4-
- fix: panic fixes (#6411)
5-
- fix: auto pre-cd not getting triggered (if cd is manual) after webhook ci event is captured (#6407)
6-
- fix: Base update (#6405)
7-
- fix: devtron apps deployed via helm showing in helm apps list (#6397)
8-
- fix: when a helm app is managed by argocd then skip argo app update when same name ext helm app is installed (#6389)
9-
- fix: upgraded to go-git/v5 v5.13.0 (#6388)
10-
- fix: fix for ci cd workflow fake success status and multiple post/pre cd success notifications (#6370)
11-
- fix: fix for while cloning app or workflow when external secret is present in any pipeline then that pipeline is not cloned (#6368)
12-
- fix: fix for while cloning app or workflow when external secret is present in any pipeline then that pipeline is not cloned (#6366)
13-
- fix: buildx driver opt using k8s driver even if not enabled (#6349)
14-
- fix: Auto trigger even if pre-cd fails (#6338)
15-
- fix: role group listing fix (#6343)
16-
- fix: sql injection fixes (#6334)
17-
- fix: role group k8s permissions duplication (#6336)
18-
## Enhancements
19-
- feat: hibernate devtron app (#6356)
20-
- feat: separate build worker status timeline (#6320)
21-
- feat: send notification with chosen config (#6331)
22-
- feat: sql script changes for operation audit (#6342)
23-
## Documentation
24-
- doc: updated devtron user list in users.md (#6363)
25-
## Others
26-
- misc: pipeline listing in app Group (#6410)
27-
- misc: Notif back com (#6398)
28-
- sync: Main sync develop (#6396)
29-
- sync: vendor update on release 29 (#6395)
30-
- sync: Release candidate v0.29.0 (#6394)
31-
- sync: Main sync develop (#6375)
32-
- misc: common-lib change (#6347)
33-
- sync: Release candidate v0.28.0 (#6340)
34-
- misc: Fix typo: Cronjob → CronJob (#6335)
35-
- sync: Main sync develop (#6358)
4+
- fix: unable to fetch live build logs
365

376

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,15 @@ github.com/davecgh/go-spew/spew
340340
# github.com/deckarep/golang-set v1.8.0
341341
## explicit; go 1.17
342342
github.com/deckarep/golang-set
343-
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250220070353-8b4fe6516dfc
343+
# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c
344344
## explicit; go 1.21
345345
github.com/devtron-labs/authenticator/apiToken
346346
github.com/devtron-labs/authenticator/client
347347
github.com/devtron-labs/authenticator/jwt
348348
github.com/devtron-labs/authenticator/middleware
349349
github.com/devtron-labs/authenticator/oidc
350350
github.com/devtron-labs/authenticator/password
351-
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250220070353-8b4fe6516dfc
351+
# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c
352352
## explicit; go 1.21
353353
github.com/devtron-labs/common-lib/async
354354
github.com/devtron-labs/common-lib/blob-storage
@@ -2219,8 +2219,8 @@ xorm.io/xorm/log
22192219
xorm.io/xorm/names
22202220
xorm.io/xorm/schemas
22212221
xorm.io/xorm/tags
2222-
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250220070353-8b4fe6516dfc
2223-
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250220070353-8b4fe6516dfc
2222+
# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250225082115-9384f9d0b86c
2223+
# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250225082115-9384f9d0b86c
22242224
# github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
22252225
# github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
22262226
# k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)