Skip to content

Commit 652d92d

Browse files
vikramdevtronShivam-nagar23systemsdtbadal773Badal Kumar Prusty
authored
sync: Main sync RC (#6679)
* panic fixes (#6657) * fix-cd-pipeline-check (#6658) * release: PR for v1.7.0 (#6667) * Updated release-notes files * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * removed init-container from git-sensor (#6605) Co-authored-by: Badal Kumar Prusty <[email protected]> * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * feat: added support for loadBalancerIP (#6617) * added support for loadBalancerIP * removed default value for loadBalancerIP --------- Co-authored-by: Badal Kumar Prusty <[email protected]> * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * Updated release notes * set fsGroup to allow non-root app to write to PVC (#6664) Co-authored-by: Badal Kumar Prusty <[email protected]> * misc: Shifted the dbConfigs under global (#6621) * Shifted the dbConfigs under global * updated the configurations for external database support * handled casbin migration case for database name * added support for custom annotations for ci-runner cd-runner and devtron * switched the conditioning to handle devtron-bom.yaml * removed check of values.global from postgresql.yaml * Updated kubewatch to a4fc9044-419-33852 tag in values file * Updated kubelink to a4fc9044-564-33855 tag in values file * Updated devtron to c8e75fb-434-33854 tag in values file * added support for nfs (#6665) Co-authored-by: Badal Kumar Prusty <[email protected]> * Updated lens to a4fc9044-333-33874 tag in values file * Updated git-sensor to a4fc9044-200-33872 tag in values file * Updated dashboard to a85f2624-690-33873 tag in values file * Updated ci-runner to a4fc9044-138-33875 tag in values file * Updated notifier to 19d654ff-372-33876 tag in values file * Updated image-scanner to a4fc9044-141-33877 tag in values file * Updated chart-sync to a4fc9044-836-33878 tag in values file * Updated hyperion to c8e75fb-280-33879 tag in values file * Updated the nfs condition * Updated the version in scripts * updated release-notes file * Updated releasenotes.md * Updated release-notes-v1.7.0.md * finalized releasenotes --------- Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> Co-authored-by: akshatsinha007 <[email protected]> Co-authored-by: akshatsinha007 <[email protected]> * vendor update on rc --------- Co-authored-by: Shivam Nagar <[email protected]> Co-authored-by: systemsdt <[email protected]> Co-authored-by: Badal Kumar <[email protected]> Co-authored-by: Badal Kumar Prusty <[email protected]> Co-authored-by: akshatsinha007 <[email protected]> Co-authored-by: akshatsinha007 <[email protected]>
1 parent 969281d commit 652d92d

27 files changed

+268
-194
lines changed

‎CHANGELOG/release-notes-v1.7.0.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## v1.7.0
2+
3+
## Enhancements
4+
- feat: Added Cronjob chart 1-6-0 (#6650)
5+
- feat: wf logs (#6606)
6+
- feat: Enable selection of all CI pipelines at once when the Environment filter is applied in Notifications (#6526)
7+
## Bugs
8+
- fix: app workflow cd pipleine check (#6658)
9+
- fix: panic fixes on concurrent delete request (#6657)
10+
- fix: panic fix on concurrent deletion request (#6644)
11+
- fix: duplicate entries in deployment history without override (#6637)
12+
- fix: overriden pipeline ids filtering in case of material deletion (#6636)
13+
- fix: prevent deletion of git material used in overridden CI templates (#6633)
14+
- fix: ea mode fixes (#6624)
15+
- fix: stack Manager issues (#6619)
16+
- fix: Change ci to webhook fix (#6626)
17+
- fix: oci chart deployment values.yaml and requirement.yaml not compatible (#6620)
18+
- fix: panic fix installedApp type timeline update (#6614)
19+
- fix: workflow getting incorrectly deleted in case of webhook and unreachable cluster's cd pipeline (#6602)
20+
- fix: add safety checks to prevent index-out-of-range panics in CdHandler (#6597)
21+
- fix: reverted telemetry connection error (#6587)
22+
- fix: anomalies in deployment status timeline (#6569)
23+
- fix: scoped var complex type resolution not working in patch type overrides (#6572)
24+
## Others
25+
- chore: when a cluster event occurs, create config map instead of secret (#6607)
26+
- chore: Gpu workload chart (#6608)
27+
- misc: update sample dockerfiles use non-root user (UID 2002) and base images (#6512)
28+
- misc: wire in EA (#6616)
29+
- chore: removed multi-arch section from readme (#6613)
30+
- chore: git sensor grpc lb policy change (#6610)
31+
- misc: go routines wrapped into panic safe function (#6589)
32+
- chore: http transport service refactoring (#6592)
33+
- misc: GetConfigDBObj in tx (#6584)

‎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.6.0
3+
appVersion: 1.7.0
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.94
14+
version: 0.22.95
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/devtron-bom.yaml‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ global:
88
runAsUser: 1000
99
runAsNonRoot: true
1010
containerRegistry: "quay.io/devtron"
11+
dbConfig:
12+
PG_ADDR: postgresql-postgresql.devtroncd
13+
PG_PORT: "5432"
14+
PG_USER: postgres
15+
PG_DATABASE: orchestrator
1116
extraManifests: []
1217
installer:
13-
release: "v1.6.0"
18+
release: "v1.7.0"
1419
registry: ""
1520
image: "inception"
1621
tag: "473deaa4-185-21582"
@@ -35,13 +40,13 @@ components:
3540
ENABLE_RESOURCE_SCAN: "true"
3641
FEATURE_CODE_MIRROR_ENABLE: "true"
3742
registry: ""
38-
image: "dashboard:c5dfd7aa-690-32907"
43+
image: "dashboard:a85f2624-690-33873"
3944
imagePullPolicy: IfNotPresent
4045
healthPort: 8080
4146
devtron:
4247
registry: ""
43-
image: "hyperion:667bd63f-280-32953"
44-
cicdImage: "devtron:667bd63f-434-32952"
48+
image: "hyperion:c8e75fb3-280-33879"
49+
cicdImage: "devtron:c8e75fb3-434-33854"
4550
imagePullPolicy: IfNotPresent
4651
customOverrides: {}
4752
podSecurityContext:
@@ -55,7 +60,7 @@ components:
5560
healthPort: 8080
5661
ciRunner:
5762
registry: ""
58-
image: "ci-runner:da156379-138-32911"
63+
image: "ci-runner:a4fc9044-138-33875"
5964
argocdDexServer:
6065
registry: ""
6166
image: "dex:v2.30.2"
@@ -64,19 +69,15 @@ components:
6469
authenticator: "authenticator:e414faff-393-13273"
6570
kubelink:
6671
registry: ""
67-
image: "kubelink:da156379-564-32903"
72+
image: "kubelink:a4fc9044-564-33855"
6873
imagePullPolicy: IfNotPresent
6974
configs:
7075
ENABLE_HELM_RELEASE_CACHE: "true"
7176
USE_CUSTOM_HTTP_TRANSPORT: "true"
7277
MANIFEST_FETCH_BATCH_SIZE: "2"
7378
NATS_MSG_PROCESSING_BATCH_SIZE: "1"
7479
NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
75-
PG_ADDR: postgresql-postgresql.devtroncd
76-
PG_DATABASE: orchestrator
7780
PG_LOG_QUERY: "true"
78-
PG_PORT: "5432"
79-
PG_USER: postgres
8081
dbconfig:
8182
secretName: postgresql-postgresql
8283
keyName: postgresql-password
@@ -91,7 +92,7 @@ components:
9192
healthPort: 50052
9293
kubewatch:
9394
registry: ""
94-
image: "kubewatch:da156379-419-32900"
95+
image: "kubewatch:a4fc9044-419-33852"
9596
imagePullPolicy: IfNotPresent
9697
healthPort: 8080
9798
configs:
@@ -101,11 +102,7 @@ components:
101102
ACD_NAMESPACE: "devtroncd"
102103
ACD_INFORMER: "true"
103104
NATS_STREAM_MAX_AGE: "10800"
104-
PG_ADDR: postgresql-postgresql.devtroncd
105-
PG_DATABASE: orchestrator
106105
PG_LOG_QUERY: "true"
107-
PG_PORT: "5432"
108-
PG_USER: postgres
109106
CLUSTER_ARGO_CD_TYPE: "ALL_CLUSTER"
110107
dbconfig:
111108
secretName: postgresql-postgresql
@@ -119,15 +116,14 @@ components:
119116
image: postgres_exporter:v0.10.1
120117
gitsensor:
121118
registry: ""
122-
image: "git-sensor:da156379-200-32905"
119+
image: "git-sensor:a4fc9044-200-33872"
123120
imagePullPolicy: IfNotPresent
124121
serviceMonitor:
125122
enabled: false
126123
persistence:
127124
volumeSize: 2Gi
128125
configs:
129-
PG_ADDR: postgresql-postgresql.devtroncd
130-
PG_USER: postgres
126+
PG_DATABASE: git_sensor
131127
COMMIT_STATS_TIMEOUT_IN_SEC: "2"
132128
ENABLE_FILE_STATS: "true"
133129
USE_GIT_CLI: "true"
@@ -138,15 +134,12 @@ components:
138134
# Values for lens
139135
lens:
140136
registry: ""
141-
image: "lens:da156379-333-32910"
137+
image: "lens:a4fc9044-333-33874"
142138
imagePullPolicy: IfNotPresent
143139
configs:
144140
GIT_SENSOR_PROTOCOL: GRPC
145141
GIT_SENSOR_URL: git-sensor-service.devtroncd:90
146142
NATS_SERVER_HOST: nats://devtron-nats.devtroncd:4222
147-
PG_ADDR: postgresql-postgresql.devtroncd
148-
PG_PORT: "5432"
149-
PG_USER: postgres
150143
PG_DATABASE: lens
151144
dbconfig:
152145
secretName: postgresql-postgresql
@@ -174,23 +167,10 @@ components:
174167
kubectlImage: "kubectl:latest"
175168
duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0
176169
entMigratorImage: "devtron-utils:geni-v1.1.4"
177-
configs:
178-
PG_ADDR: postgresql-postgresql.devtroncd
179-
envVars:
180-
devtron:
181-
DB_NAME: "orchestrator"
182-
casbin:
183-
DB_NAME: "casbin"
184-
gitsensor:
185-
DB_NAME: "git_sensor"
186-
lens:
187-
DB_NAME: "lens"
188170
chartSync:
189171
registry: ""
190-
image: chart-sync:da156379-836-32914
172+
image: chart-sync:a4fc9044-836-33878
191173
schedule: "0 19 * * *"
192-
extraConfigs:
193-
PG_ADDR: postgresql-postgresql.devtroncd
194174
podSecurityContext:
195175
fsGroup: 1001
196176
runAsGroup: 1001
@@ -218,7 +198,7 @@ workflowController:
218198
IMDSv1ExecutorImage: "argoexec:v3.0.7"
219199
security:
220200
imageScanner:
221-
image: "image-scanner:da156379-141-32912"
201+
image: "image-scanner:a4fc9044-141-33877"
222202
healthPort: 8080
223203
configs:
224204
TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
@@ -229,7 +209,7 @@ security:
229209
tag: 4.3.6
230210
# Values for notifier integration
231211
notifier:
232-
image: "notifier:99e2f3cd-372-32893"
212+
image: "notifier:19d654ff-372-33876"
233213
healthPort: 3000
234214
minio:
235215
image: "minio:RELEASE.2021-02-14T04-01-33Z"
@@ -256,10 +236,7 @@ devtronEnterprise:
256236
image: "casbin:f6ff5f74-064b67e5-462-30822"
257237
imagePullPolicy: IfNotPresent
258238
configs:
259-
PG_ADDR: postgresql-postgresql.devtroncd
260239
PG_DATABASE: casbin
261-
PG_PORT: "5432"
262-
PG_USER: postgres
263240
dbconfig:
264241
secretName: postgresql-postgresql
265242
keyName: postgresql-password

‎charts/devtron/templates/app-sync-job.yaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ spec:
3131
- name: chart-sync
3232
image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}
3333
{{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 8 }}
34-
env:
35-
- name: PG_DATABASE
36-
value: orchestrator
37-
- name: PG_USER
38-
value: postgres
3934
envFrom:
4035
- configMapRef:
4136
name: app-sync-cm
@@ -79,11 +74,6 @@ spec:
7974
- name: chart-sync
8075
image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}
8176
{{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 12 }}
82-
env:
83-
- name: PG_DATABASE
84-
value: orchestrator
85-
- name: PG_USER
86-
value: postgres
8777
envFrom:
8878
- secretRef:
8979
name: devtron-secret
@@ -110,6 +100,7 @@ metadata:
110100
app: app-sync-cronjob
111101
release: devtron
112102
data:
103+
{{ toYaml $.Values.global.dbConfig | indent 2 }}
113104
{{- if $.Values.components.chartSync.extraConfigs }}
114105
{{ toYaml $.Values.components.chartSync.extraConfigs | indent 2 }}
115106
{{- end }}

‎charts/devtron/templates/casbin.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ metadata:
9696
release: casbin
9797
{{- if .configs }}
9898
data:
99+
{{ toYaml $.Values.global.dbConfig | indent 2 }}
99100
{{ toYaml .configs | indent 2 }}
100101
{{- end }}
101102
---

‎charts/devtron/templates/configmap-secret.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,13 @@ data:
206206
apiVersion: v1
207207
kind: Secret
208208
data:
209+
{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
210+
postgresql-password: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
211+
{{- else }}
209212
postgresql-password: {{ $postgresPwd }}
210-
POSTGRES_USER: cG9zdGdyZXM=
211-
POSTGRES_DB: b3JjaGVzdHJhdG9y
213+
{{- end }}
214+
POSTGRES_USER: {{ $.Values.global.dbConfig.PG_USER | b64enc }}
215+
POSTGRES_DB: {{ $.Values.global.dbConfig.PG_DATABASE | b64enc }}
212216
metadata:
213217
name: postgresql-postgresql
214218
labels:
@@ -224,7 +228,11 @@ type: Opaque
224228
apiVersion: v1
225229
kind: Secret
226230
data:
231+
{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
232+
DB_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
233+
{{- else }}
227234
DB_PASSWORD: {{ $postgresPwd }}
235+
{{- end }}
228236
metadata:
229237
name: postgresql-migrator
230238
labels:
@@ -248,7 +256,11 @@ metadata:
248256
"helm.sh/hook-weight": "-3"
249257
"helm.sh/resource-policy": keep
250258
data:
259+
{{- if and $.Values.global.externalPostgres $.Values.global.externalPostgres.enabled }}
260+
PG_PASSWORD: {{ $.Values.global.externalPostgres.PG_PASSWORD | b64enc }}
261+
{{- else }}
251262
PG_PASSWORD: {{ $postgresPwd }}
263+
{{- end }}
252264
{{- if $.Values.installer.modules }}
253265
{{- if has "cicd" $.Values.installer.modules }}
254266
EXTERNAL_CI_API_SECRET: {{ $EXTERNAL_CI_API_SECRET }}

‎charts/devtron/templates/devtron-service.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ spec:
3030
{{- if .loadBalancerSourceRanges }}
3131
loadBalancerSourceRanges:
3232
{{ toYaml .loadBalancerSourceRanges | nindent 4}}
33+
{{- end }}
34+
{{- if .loadBalancerIP }}
35+
loadBalancerIP: {{ .loadBalancerIP }}
3336
{{- end }}
3437
selector:
3538
app: devtron

‎charts/devtron/templates/devtron.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ data:
1313
DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
1414
DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
1515
FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE: "true"
16-
PG_USER: postgres
17-
{{- if not $.Values.devtronEnterprise.enabled }}
18-
PG_ADDR: postgresql-postgresql.devtroncd
19-
{{- end }}
20-
PG_PORT: "5432"
16+
{{ toYaml $.Values.global.dbConfig | indent 2 }}
2117
HELM_CLIENT_URL: kubelink-service-headless:50051
2218
DASHBOARD_PORT: "80"
2319
DASHBOARD_HOST: dashboard-service.devtroncd
24-
PG_DATABASE: orchestrator
2520
DEX_HOST: http://argocd-dex-server.devtroncd
2621
DEX_PORT: "5556"
2722
APP_SYNC_IMAGE: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}

‎charts/devtron/templates/gitsensor.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ metadata:
2525
release: devtron
2626
{{- if .configs }}
2727
data:
28+
{{ toYaml $.Values.global.dbConfig | indent 2 }}
2829
{{ toYaml .configs | indent 2 }}
2930
{{- end }}
3031

@@ -75,6 +76,7 @@ spec:
7576
runAsUser: 1000
7677
serviceAccountName: devtron-default-sa
7778
{{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.components.gitsensor.nodeSelector "tolerations" $.Values.components.gitsensor.tolerations "imagePullSecrets" $.Values.components.gitsensor.imagePullSecrets "global" $.Values.global) | indent 6 }}
79+
{{- if not (and $.Values.nfs $.Values.nfs.enabled) }}
7880
initContainers:
7981
- command:
8082
- /bin/sh
@@ -93,7 +95,8 @@ spec:
9395
terminationMessagePolicy: File
9496
volumeMounts:
9597
- mountPath: /git-base/
96-
name: git-volume
98+
name: git-volume
99+
{{- end }}
97100
containers:
98101
- name: git-sensor
99102
image: {{ include "common.image" (dict "component" $.Values.components.gitsensor "global" $.Values.global) }}
@@ -186,4 +189,4 @@ spec:
186189
{{- end }}
187190
{{- end }}
188191
{{- end }}
189-
{{- end }}
192+
{{- end }}

‎charts/devtron/templates/kubelink.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ metadata:
2727
"helm.sh/resource-policy": keep
2828
{{- if .configs }}
2929
data:
30+
{{ toYaml $.Values.global.dbConfig | indent 2 }}
3031
{{ toYaml .configs | indent 2 }}
3132
{{- if $.Values.installer.modules }}
3233
{{- if has "cicd" $.Values.installer.modules }}

0 commit comments

Comments
 (0)