Skip to content

Commit 4b47f81

Browse files
prakarsh-dtprakarsh-dt
authored
Merge pull request #215 from devtron-labs/sync-2024-03-13-100213-1331953
feat: Syncing Repo from branch sync-2024-03-13-100213-1331953
2 parents 1331953 + 5d794e0 commit 4b47f81

File tree

7 files changed

+273
-30
lines changed

7 files changed

+273
-30
lines changed

‎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: 0.6.27
3+
appVersion: 0.6.28
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.69
14+
version: 0.22.70
1515
sources:
1616
- https://github.com/devtron-labs/charts
1717
dependencies:

‎charts/devtron/devtron-bom.yaml‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ global:
99
runAsNonRoot: true
1010

1111
installer:
12-
release: "v0.6.27"
12+
release: "v0.6.28"
1313
image: "quay.io/devtron/inception"
14-
tag: "a9820f38-185-20840"
14+
tag: "473deaa4-185-21582"
1515

1616
components:
1717
dashboard:
18-
image: "quay.io/devtron/dashboard:796b9e98-325-20868"
18+
image: "quay.io/devtron/dashboard:9429b066-325-21529"
1919
config:
2020
extraConfigs:
2121
USE_V2: "true"
@@ -26,17 +26,18 @@ components:
2626
ENABLE_CI_JOB: "true"
2727
GLOBAL_API_TIMEOUT: "60000"
2828
TRIGGER_API_TIMEOUT: "60000"
29+
ENABLE_EXTERNAL_ARGO_CD: "false"
2930
devtron:
30-
image: "quay.io/devtron/hyperion:2feec2a7-280-20864"
31-
cicdImage: "quay.io/devtron/devtron:2feec2a7-434-20865"
31+
image: "quay.io/devtron/hyperion:ca439071-280-21596"
32+
cicdImage: "quay.io/devtron/devtron:ca439071-434-21597"
3233
customOverrides:
33-
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d4dadb96-138-20830"
34+
DEFAULT_CI_IMAGE: "quay.io/devtron/ci-runner:d5f875c7-138-21576"
3435
argocdDexServer:
3536
image: "ghcr.io/dexidp/dex:v2.30.2"
3637
initContainer:
3738
authenticator: "quay.io/devtron/authenticator:e414faff-393-13273"
3839
kubelink:
39-
image: "quay.io/devtron/kubelink:b3a017d2-564-20648"
40+
image: "quay.io/devtron/kubelink:7c66e0fc-564-21516"
4041
configs:
4142
ENABLE_HELM_RELEASE_CACHE: "true"
4243
MANIFEST_FETCH_BATCH_SIZE: "2"
@@ -50,11 +51,20 @@ components:
5051
dbconfig:
5152
secretName: postgresql-postgresql
5253
keyName: postgresql-password
54+
kubewatch:
55+
image: "quay.io/devtron/kubewatch:91c2cece-419-21178"
56+
imagePullPolicy: IfNotPresent
57+
configs:
58+
devtroncd_NAMESPACE: "devtron-ci"
59+
CI_INFORMER: "true"
60+
ACD_NAMESPACE: "devtroncd"
61+
ACD_INFORMER: "true"
62+
NATS_STREAM_MAX_AGE: "10800"
5363
postgres:
5464
image: "quay.io/devtron/postgres:11.9.0-debian-10-r26"
5565
armImage: "quay.io/devtron/postgres:11.9"
5666
gitsensor:
57-
image: "quay.io/devtron/git-sensor:7f704db3-200-20777"
67+
image: "quay.io/devtron/git-sensor:4bacf5f7-200-21575"
5868
imagePullPolicy: "IfNotPresent"
5969
serviceMonitor:
6070
enabled: false
@@ -65,12 +75,12 @@ components:
6575
PG_USER: postgres
6676
COMMIT_STATS_TIMEOUT_IN_SEC: "2"
6777
ENABLE_FILE_STATS: "true"
68-
USE_GIT_CLI: "false"
78+
USE_GIT_CLI: "true"
6979
dbconfig:
7080
secretName: postgresql-postgresql
7181
keyName: postgresql-password
7282
lens:
73-
image: "quay.io/devtron/lens:98130668-333-20295"
83+
image: "quay.io/devtron/lens:70577aaa-333-21179"
7484
imagePullPolicy: IfNotPresent
7585
configs:
7686
GIT_SENSOR_PROTOCOL: GRPC
@@ -121,7 +131,7 @@ workflowController:
121131

122132
security:
123133
imageScanner:
124-
image: "quay.io/devtron/image-scanner:28f95d21-334-20763"
134+
image: "quay.io/devtron/image-scanner:bdbcef05-334-21577"
125135

126136
notifier:
127137
image: "quay.io/devtron/notifier:e4ffc71a-372-20776"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
{{- end }}
3232
containers:
3333
- name: chart-sync
34-
image: quay.io/devtron/chart-sync:98957687-150-19133
34+
image: quay.io/devtron/chart-sync:d0dcc590-373-21074
3535
{{- if and $.Values.global $.Values.global.containerSecurityContext }}
3636
securityContext:
3737
{{- toYaml $.Values.global.containerSecurityContext | nindent 10 }}
@@ -80,7 +80,7 @@ spec:
8080
{{- end }}
8181
containers:
8282
- name: chart-sync
83-
image: quay.io/devtron/chart-sync:98957687-150-19133
83+
image: quay.io/devtron/chart-sync:d0dcc590-373-21074
8484
{{- if and $.Values.global $.Values.global.containerSecurityContext }}
8585
securityContext:
8686
{{- toYaml $.Values.global.containerSecurityContext | nindent 14 }}

‎charts/devtron/templates/devtron.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data:
1818
PG_DATABASE: orchestrator
1919
DEX_HOST: http://argocd-dex-server.devtroncd
2020
DEX_PORT: "5556"
21-
APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:98957687-150-19133"
21+
APP_SYNC_IMAGE: "quay.io/devtron/chart-sync:d0dcc590-373-21074"
2222
{{- if $.Values.installer.modules }}
2323
{{- if has "cicd" $.Values.installer.modules }}
2424
USE_ARTIFACT_LISTING_API_V2: "true"
@@ -29,6 +29,7 @@ data:
2929
IMAGE_SCAN_MAX_RETRIES: "3"
3030
IMAGE_SCAN_RETRY_DELAY: "5"
3131
CONSUMER_CONFIG_JSON: '{"DEVTRON-CHART-INSTALL-DURABLE":{"natsMsgProcessingBatchSize":1}}'
32+
USE_GIT_CLI : "true"
3233
{{- if $.Values.configs }}
3334
{{- if or ($.Values.minio.enabled) ($.Values.configs.BLOB_STORAGE_PROVIDER) }}
3435
BLOB_STORAGE_ENABLED: "true"

‎charts/devtron/templates/kubewatch.yaml‎

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
{{- if $.Values.installer.modules }}
2+
{{- if has "cicd" $.Values.installer.modules }}
3+
{{- with .Values.components.kubewatch }}
4+
apiVersion: v1
5+
kind: ServiceAccount
6+
metadata:
7+
labels:
8+
app: kubewatch
9+
release: devtron
10+
name: kubewatch
11+
---
12+
apiVersion: rbac.authorization.k8s.io/v1
13+
kind: ClusterRole
14+
metadata:
15+
labels:
16+
app: kubewatch
17+
release: devtron
18+
name: kubewatch
19+
rules:
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- pods
24+
- namespaces
25+
- services
26+
- deployments
27+
- replicationcontrollers
28+
- replicasets
29+
- daemonsets
30+
- persistentvolumes
31+
- events
32+
- workflows
33+
verbs:
34+
- list
35+
- watch
36+
- get
37+
- apiGroups:
38+
- apps
39+
resources:
40+
- daemonsets
41+
- deployments
42+
- deployments/scale
43+
- replicasets
44+
- replicasets/scale
45+
- statefulsets
46+
verbs:
47+
- get
48+
- list
49+
- watch
50+
- apiGroups:
51+
- extensions
52+
resources:
53+
- daemonsets
54+
- deployments
55+
- deployments/scale
56+
- replicasets
57+
- replicasets/scale
58+
- replicationcontrollers/scale
59+
verbs:
60+
- get
61+
- list
62+
- watch
63+
- apiGroups:
64+
- batch
65+
resources:
66+
- cronjobs
67+
- jobs
68+
verbs:
69+
- get
70+
- list
71+
- watch
72+
- apiGroups:
73+
- argoproj.io
74+
resources:
75+
- workflows
76+
- applications
77+
verbs:
78+
- get
79+
- list
80+
- watch
81+
---
82+
apiVersion: rbac.authorization.k8s.io/v1
83+
kind: ClusterRoleBinding
84+
metadata:
85+
labels:
86+
app: kubewatch
87+
release: devtron
88+
name: kubewatch
89+
roleRef:
90+
apiGroup: rbac.authorization.k8s.io
91+
kind: ClusterRole
92+
name: kubewatch
93+
subjects:
94+
- kind: ServiceAccount
95+
name: kubewatch
96+
namespace: devtroncd
97+
---
98+
apiVersion: v1
99+
kind: Secret
100+
metadata:
101+
name: kubewatch-secret
102+
labels:
103+
release: devtron
104+
app: kubewatch
105+
type: Opaque
106+
{{- if .secrets }}
107+
data:
108+
{{- range $k, $v := .secrets }}
109+
{{ $k }}: {{ $v | b64enc }}
110+
{{- end }}
111+
{{- end }}
112+
---
113+
apiVersion: v1
114+
kind: ConfigMap
115+
metadata:
116+
name: kubewatch-resources-cm
117+
labels:
118+
release: devtron
119+
app: kubewatch
120+
data:
121+
.kubewatch.yaml: |
122+
handler:
123+
webhook:
124+
enabled: false
125+
url: http://devtroncd-event-handler-service-prod.devtroncd/event
126+
127+
resource:
128+
daemonset: false
129+
deployment: false
130+
events: true
131+
job: false
132+
persistentvolume: false
133+
pod: false
134+
replicaset: false
135+
replicationcontroller: false
136+
services: false
137+
---
138+
apiVersion: v1
139+
kind: ConfigMap
140+
metadata:
141+
name: kubewatch-cm
142+
labels:
143+
release: devtron
144+
app: kubewatch
145+
data:
146+
{{- if .configs}}
147+
{{ toYaml .configs | indent 2 }}
148+
{{- end }}
149+
---
150+
apiVersion: apps/v1
151+
kind: Deployment
152+
metadata:
153+
name: kubewatch
154+
labels:
155+
app: kubewatch
156+
release: devtron
157+
spec:
158+
selector:
159+
matchLabels:
160+
app: kubewatch
161+
release: devtron
162+
replicas: 1
163+
minReadySeconds: 60
164+
template:
165+
metadata:
166+
labels:
167+
app: kubewatch
168+
release: devtron
169+
spec:
170+
terminationGracePeriodSeconds: 30
171+
restartPolicy: Always
172+
serviceAccountName: kubewatch
173+
{{- if and $.Values.global $.Values.global.podSecurityContext }}
174+
securityContext:
175+
{{- toYaml $.Values.global.podSecurityContext | nindent 8 }}
176+
{{- end }}
177+
containers:
178+
- name: kubewatch
179+
image: {{ .image }}
180+
imagePullPolicy: {{ .imagePullPolicy }}
181+
{{- if and $.Values.global $.Values.global.containerSecurityContext }}
182+
securityContext:
183+
{{- toYaml $.Values.global.containerSecurityContext | nindent 12 }}
184+
{{- end }}
185+
ports:
186+
- name: app
187+
containerPort: 3000
188+
protocol: TCP
189+
env:
190+
- name: POD_NAME
191+
valueFrom:
192+
fieldRef:
193+
fieldPath: metadata.name
194+
{{- if .dbconfig }}
195+
- name: DB_PWD
196+
valueFrom:
197+
secretKeyRef:
198+
name: {{ .dbconfig.secretName }}
199+
key: {{ .dbconfig.keyName }}
200+
{{- end }}
201+
envFrom:
202+
- configMapRef:
203+
name: kubewatch-cm
204+
- secretRef:
205+
name: kubewatch-secret
206+
volumeMounts:
207+
- name: kubewatch-resources-config
208+
mountPath: /root/.kubewatch.yaml
209+
subPath: .kubewatch.yaml
210+
{{- if .resources }}
211+
resources:
212+
{{ toYaml .resources | indent 12 }}
213+
{{- end }}
214+
volumes:
215+
- name: kubewatch-resources-config
216+
configMap:
217+
name: kubewatch-resources-cm
218+
revisionHistoryLimit: 3
219+
{{- end }}
220+
{{- end }}
221+
{{- end }}

‎charts/devtron/templates/notifier.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ spec:
100100
- secretRef:
101101
name: notifier-secret
102102
volumeMounts: []
103-
volumes: []
104-
revisionHistoryLimit: 3
105103
{{- if .resources }}
106104
resources:
107105
{{ toYaml .resources | indent 12 }}
108106
{{- end }}
107+
volumes: []
108+
revisionHistoryLimit: 3
109109
{{- end }}
110110
{{- end }}
111111
{{- end }}

0 commit comments

Comments
 (0)