Skip to content

Commit bcb1103

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #6583 from devtron-labs/main-sync-develop-19may
sync: Main sync develop
2 parents 87f37cb + 7229c14 commit bcb1103

File tree

110 files changed

+15160
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+15160
-152
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
## v1.6.0
2+
3+
## Enhancements
4+
- feat: added support for relabelings in servicemonitor (#6562)
5+
## Bugs
6+
- fix: rest handler missing return statements (#6545)
7+
- fix: chart name fixed in chart reference table (#6543)
8+
- fix: error pg.ErrNoRow on base deployment template update (#6533)
9+
## Others
10+
- chore: rollout reference chart 5-1-0 (#6573)
11+
- misc: updated ucid-cm and added prehook (#6557)
12+
- chore: pipeline timeline alter sql (#6541)

‎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.5.1
3+
appVersion: 1.6.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.92
14+
version: 0.22.94
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/devtron-bom.yaml‎

Lines changed: 16 additions & 13 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.5.1"
13+
release: "v1.6.0"
1414
registry: ""
1515
image: "inception"
1616
tag: "473deaa4-185-21582"
@@ -35,13 +35,13 @@ components:
3535
ENABLE_RESOURCE_SCAN: "true"
3636
FEATURE_CODE_MIRROR_ENABLE: "true"
3737
registry: ""
38-
image: "dashboard:0fc42ac3-690-32105"
38+
image: "dashboard:c5dfd7aa-690-32907"
3939
imagePullPolicy: IfNotPresent
4040
healthPort: 8080
4141
devtron:
4242
registry: ""
43-
image: "hyperion:e4fc95a9-280-32767"
44-
cicdImage: "devtron:e4fc95a9-434-32763"
43+
image: "hyperion:667bd63f-280-32953"
44+
cicdImage: "devtron:667bd63f-434-32952"
4545
imagePullPolicy: IfNotPresent
4646
customOverrides: {}
4747
podSecurityContext:
@@ -55,7 +55,7 @@ components:
5555
healthPort: 8080
5656
ciRunner:
5757
registry: ""
58-
image: "ci-runner:c49b4aa5-138-32101"
58+
image: "ci-runner:da156379-138-32911"
5959
argocdDexServer:
6060
registry: ""
6161
image: "dex:v2.30.2"
@@ -64,7 +64,7 @@ components:
6464
authenticator: "authenticator:e414faff-393-13273"
6565
kubelink:
6666
registry: ""
67-
image: "kubelink:c49b4aa5-564-32098"
67+
image: "kubelink:da156379-564-32903"
6868
imagePullPolicy: IfNotPresent
6969
configs:
7070
ENABLE_HELM_RELEASE_CACHE: "true"
@@ -91,7 +91,7 @@ components:
9191
healthPort: 50052
9292
kubewatch:
9393
registry: ""
94-
image: "kubewatch:c49b4aa5-419-32097"
94+
image: "kubewatch:da156379-419-32900"
9595
imagePullPolicy: IfNotPresent
9696
healthPort: 8080
9797
configs:
@@ -119,7 +119,7 @@ components:
119119
image: postgres_exporter:v0.10.1
120120
gitsensor:
121121
registry: ""
122-
image: "git-sensor:c49b4aa5-200-32099"
122+
image: "git-sensor:da156379-200-32905"
123123
imagePullPolicy: IfNotPresent
124124
serviceMonitor:
125125
enabled: false
@@ -138,7 +138,7 @@ components:
138138
# Values for lens
139139
lens:
140140
registry: ""
141-
image: "lens:c49b4aa5-333-32100"
141+
image: "lens:da156379-333-32910"
142142
imagePullPolicy: IfNotPresent
143143
configs:
144144
GIT_SENSOR_PROTOCOL: GRPC
@@ -174,6 +174,8 @@ components:
174174
kubectlImage: "kubectl:latest"
175175
duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0
176176
entMigratorImage: "devtron-utils:geni-v1.1.4"
177+
configs:
178+
PG_ADDR: postgresql-postgresql.devtroncd
177179
envVars:
178180
devtron:
179181
DB_NAME: "orchestrator"
@@ -185,8 +187,10 @@ components:
185187
DB_NAME: "lens"
186188
chartSync:
187189
registry: ""
188-
image: chart-sync:c49b4aa5-836-32103
190+
image: chart-sync:da156379-836-32914
189191
schedule: "0 19 * * *"
192+
extraConfigs:
193+
PG_ADDR: postgresql-postgresql.devtroncd
190194
podSecurityContext:
191195
fsGroup: 1001
192196
runAsGroup: 1001
@@ -195,7 +199,6 @@ components:
195199
allowPrivilegeEscalation: false
196200
runAsNonRoot: true
197201
runAsUser: 1001
198-
extraConfigs: {}
199202
# values for argocd integration
200203
argo-cd:
201204
global:
@@ -215,7 +218,7 @@ workflowController:
215218
IMDSv1ExecutorImage: "argoexec:v3.0.7"
216219
security:
217220
imageScanner:
218-
image: "image-scanner:c49b4aa5-141-32102"
221+
image: "image-scanner:da156379-141-32912"
219222
healthPort: 8080
220223
configs:
221224
TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
@@ -226,7 +229,7 @@ security:
226229
tag: 4.3.6
227230
# Values for notifier integration
228231
notifier:
229-
image: "notifier:56798239-372-32072"
232+
image: "notifier:99e2f3cd-372-32893"
230233
healthPort: 3000
231234
minio:
232235
image: "minio:RELEASE.2021-02-14T04-01-33Z"

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ spec:
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 }}
3434
env:
35-
- name: PG_ADDR
36-
value: postgresql-postgresql.devtroncd
3735
- name: PG_DATABASE
3836
value: orchestrator
3937
- name: PG_USER
4038
value: postgres
4139
envFrom:
40+
- configMapRef:
41+
name: app-sync-cm
4242
- secretRef:
4343
name: devtron-secret
4444
- configMapRef:
@@ -80,8 +80,6 @@ spec:
8080
image: {{ include "common.image" (dict "component" $.Values.components.chartSync "global" $.Values.global ) }}
8181
{{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.chartSync.containerSecurityContext "global" $.Values.global) | indent 12 }}
8282
env:
83-
- name: PG_ADDR
84-
value: postgresql-postgresql.devtroncd
8583
- name: PG_DATABASE
8684
value: orchestrator
8785
- name: PG_USER

‎charts/devtron/templates/devtron.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data:
1818
PG_ADDR: postgresql-postgresql.devtroncd
1919
{{- end }}
2020
PG_PORT: "5432"
21-
HELM_CLIENT_URL: kubelink-service:50051
21+
HELM_CLIENT_URL: kubelink-service-headless:50051
2222
DASHBOARD_PORT: "80"
2323
DASHBOARD_HOST: dashboard-service.devtroncd
2424
PG_DATABASE: orchestrator
@@ -353,4 +353,4 @@ spec:
353353
matchLabels:
354354
app: devtron
355355
{{- end }}
356-
{{- end }}
356+
{{- end }}

‎charts/devtron/templates/kubelink.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ kind: Service
123123
metadata:
124124
labels:
125125
app: kubelink
126-
name: kubelink-service
126+
name: kubelink-service-headless
127127
namespace: devtroncd
128128
annotations:
129129
"helm.sh/resource-policy": keep
@@ -137,4 +137,5 @@ spec:
137137
app: kubelink
138138
sessionAffinity: None
139139
type: ClusterIP
140-
{{- end }}
140+
clusterIP: None
141+
{{- end }}

‎charts/devtron/templates/migrator.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- name: PG_USER
2828
value: postgres
2929
- name: PG_ADDR
30-
value: postgresql-postgresql.devtroncd
30+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
3131
- name: DB_PORT
3232
value: "5432"
3333
- name: PG_DATABASE
@@ -80,7 +80,7 @@ spec:
8080
- name: DB_USER_NAME
8181
value: postgres
8282
- name: DB_HOST
83-
value: postgresql-postgresql.devtroncd
83+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
8484
- name: DB_PORT
8585
value: "5432"
8686
- name: DB_NAME
@@ -186,7 +186,7 @@ spec:
186186
- name: DB_USER_NAME
187187
value: postgres
188188
- name: DB_HOST
189-
value: postgresql-postgresql.devtroncd
189+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
190190
- name: DB_PORT
191191
value: "5432"
192192
- name: DB_NAME
@@ -273,7 +273,7 @@ spec:
273273
- name: DB_USER_NAME
274274
value: postgres
275275
- name: DB_HOST
276-
value: postgresql-postgresql.devtroncd
276+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
277277
- name: DB_PORT
278278
value: "5432"
279279
- name: DB_NAME
@@ -355,7 +355,7 @@ spec:
355355
- name: DB_USER_NAME
356356
value: postgres
357357
- name: DB_HOST
358-
value: postgresql-postgresql.devtroncd
358+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
359359
- name: DB_PORT
360360
value: "5432"
361361
- name: DB_NAME
@@ -430,7 +430,7 @@ spec:
430430
- name: DB_USER_NAME
431431
value: postgres
432432
- name: DB_HOST
433-
value: postgresql-postgresql.devtroncd
433+
value: {{ .configs.PG_ADDR | default "postgresql-postgresql.devtroncd" }}
434434
- name: DB_PORT
435435
value: "5432"
436436
- name: DB_NAME

‎charts/devtron/templates/minio.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@ data:
129129
createBucket devtron-ci-log none false true
130130
createBucket devtron-ci-cache none false true
131131
{{- end }}
132+
{{- if ne ($.Values.minio.retention | int) 0 }}
133+
${MC} ilm add myminio/devtron-ci-cache --expiry-days {{ $.Values.minio.retention }}
134+
${MC} ilm ls myminio/devtron-ci-cache
135+
{{- else }}
136+
echo "No Lifecycle Policy Specified"
137+
{{- end }}
132138
{{- end }}
133139
---
134140
apiVersion: rbac.authorization.k8s.io/v1

‎charts/devtron/values.yaml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ global:
2828
extraManifests: []
2929
installer:
3030
repo: "devtron-labs/devtron"
31-
release: "v1.5.1"
31+
release: "v1.6.0"
3232
registry: ""
3333
image: inception
3434
tag: 473deaa4-185-21582
@@ -82,13 +82,13 @@ components:
8282
ENABLE_RESOURCE_SCAN: "true"
8383
FEATURE_CODE_MIRROR_ENABLE: "true"
8484
registry: ""
85-
image: "dashboard:0fc42ac3-690-32105"
85+
image: "dashboard:c5dfd7aa-690-32907"
8686
imagePullPolicy: IfNotPresent
8787
healthPort: 8080
8888
devtron:
8989
registry: ""
90-
image: "hyperion:e4fc95a9-280-32767"
91-
cicdImage: "devtron:e4fc95a9-434-32763"
90+
image: "hyperion:667bd63f-280-32953"
91+
cicdImage: "devtron:667bd63f-434-32952"
9292
imagePullPolicy: IfNotPresent
9393
customOverrides: {}
9494
healthPort: 8080
@@ -123,7 +123,7 @@ components:
123123
# - devtron.example.com
124124
ciRunner:
125125
registry: ""
126-
image: "ci-runner:c49b4aa5-138-32101"
126+
image: "ci-runner:da156379-138-32911"
127127
argocdDexServer:
128128
registry: ""
129129
image: "dex:v2.30.2"
@@ -132,7 +132,7 @@ components:
132132
authenticator: "authenticator:e414faff-393-13273"
133133
kubelink:
134134
registry: ""
135-
image: "kubelink:c49b4aa5-564-32098"
135+
image: "kubelink:da156379-564-32903"
136136
imagePullPolicy: IfNotPresent
137137
healthPort: 50052
138138
podSecurityContext:
@@ -159,7 +159,7 @@ components:
159159
keyName: postgresql-password
160160
kubewatch:
161161
registry: ""
162-
image: "kubewatch:c49b4aa5-419-32097"
162+
image: "kubewatch:da156379-419-32900"
163163
imagePullPolicy: IfNotPresent
164164
healthPort: 8080
165165
configs:
@@ -189,7 +189,7 @@ components:
189189
volumeSize: "20Gi"
190190
gitsensor:
191191
registry: ""
192-
image: "git-sensor:c49b4aa5-200-32099"
192+
image: "git-sensor:da156379-200-32905"
193193
imagePullPolicy: IfNotPresent
194194
serviceMonitor:
195195
enabled: false
@@ -208,7 +208,7 @@ components:
208208
# Values for lens
209209
lens:
210210
registry: ""
211-
image: "lens:c49b4aa5-333-32100"
211+
image: "lens:da156379-333-32910"
212212
imagePullPolicy: IfNotPresent
213213
secrets: {}
214214
resources: {}
@@ -246,6 +246,8 @@ components:
246246
kubectlImage: "kubectl:latest"
247247
duplicateChartImage: devtron-utils:dup-chart-repo-v1.1.0
248248
entMigratorImage: "devtron-utils:geni-v1.1.4"
249+
configs:
250+
PG_ADDR: postgresql-postgresql.devtroncd
249251
envVars:
250252
devtron:
251253
DB_NAME: "orchestrator"
@@ -257,9 +259,10 @@ components:
257259
DB_NAME: "lens"
258260
chartSync:
259261
registry: ""
260-
image: chart-sync:c49b4aa5-836-32103
262+
image: chart-sync:da156379-836-32914
261263
schedule: "0 19 * * *"
262-
extraConfigs: {}
264+
extraConfigs:
265+
PG_ADDR: postgresql-postgresql.devtroncd
263266
podSecurityContext:
264267
fsGroup: 1001
265268
runAsGroup: 1001
@@ -411,7 +414,7 @@ argo-cd:
411414
security:
412415
enabled: false
413416
imageScanner:
414-
image: "image-scanner:c49b4aa5-141-32102"
417+
image: "image-scanner:da156379-141-32912"
415418
healthPort: 8080
416419
configs:
417420
TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
@@ -430,7 +433,7 @@ security:
430433
notifier:
431434
enabled: false
432435
imagePullPolicy: IfNotPresent
433-
image: "notifier:56798239-372-32072"
436+
image: "notifier:99e2f3cd-372-32893"
434437
configs:
435438
CD_ENVIRONMENT: PROD
436439
DB: orchestrator
@@ -446,6 +449,7 @@ notifier:
446449
# Set enable to true if you want to use minio for storing cache and logs
447450
minio:
448451
enabled: false
452+
retention: 30
449453
replicaCount: 1
450454
image: "minio:RELEASE.2021-02-14T04-01-33Z"
451455
imagePullPolicy: IfNotPresent

0 commit comments

Comments
 (0)