Skip to content

Commit 1110005

Browse files
dheethShubham9t9Shubham9t9
authored
FEAT: Resources for small number of applications through helm (#2487)
* resource-changes (#2476) * resource-changes * updated values for migrator and nats Co-authored-by: Shubham9t9 <shubhamkumar47022@gmai.com> * Updated and fixed resources for microservices * Fixed app-sync-job indentation * Fixed nil pointers * Update and rename resource-values.yaml to resources-small.yaml * Removed hyperion reference from resources-small.yaml * Updated images from main branch * Updated default resources in install.yaml * Updated resources for devtron and kubelink * Updated resources for git-sensor migration job * Fixed image error * Changed back curl image to prevent immutable error * Updated chart version Co-authored-by: Shubham Kumar <87755583+Shubham9t9@users.noreply.github.com> Co-authored-by: Shubham9t9 <shubhamkumar47022@gmai.com>
1 parent 10a51d5 commit 1110005

File tree

12 files changed

+621
-26
lines changed

12 files changed

+621
-26
lines changed

‎charts/devtron/resources-small.yaml‎

Lines changed: 224 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,224 @@
1+
installer:
2+
resources:
3+
limits:
4+
cpu: "100m"
5+
memory: 250Mi
6+
requests:
7+
cpu: "100m"
8+
memory: 250Mi
9+
components:
10+
lens:
11+
resources:
12+
limits:
13+
cpu: "25m"
14+
memory: 50Mi
15+
requests:
16+
cpu: "25m"
17+
memory: 50Mi
18+
19+
natsServer:
20+
nats:
21+
resources:
22+
limits:
23+
cpu: "50m"
24+
memory: 100Mi
25+
requests:
26+
cpu: "50m"
27+
memory: 100Mi
28+
reloader:
29+
resources:
30+
limits:
31+
cpu: "10m"
32+
memory: 20Mi
33+
requests:
34+
cpu: "10m"
35+
memory: 20Mi
36+
metrics:
37+
resources:
38+
limits:
39+
cpu: "25m"
40+
memory: 50Mi
41+
requests:
42+
cpu: "25m"
43+
memory: 50Mi
44+
45+
devtronHousekeeping:
46+
resources:
47+
limits:
48+
cpu: "50m"
49+
memory: 50Mi
50+
requests:
51+
cpu: "50m"
52+
memory: 50Mi
53+
54+
gitSensor:
55+
resources:
56+
limits:
57+
cpu: "100m"
58+
memory: 200Mi
59+
requests:
60+
cpu: "100m"
61+
memory: 200Mi
62+
63+
kubewatch:
64+
resources:
65+
limits:
66+
cpu: "25m"
67+
memory: 50Mi
68+
requests:
69+
cpu: "25m"
70+
memory: 50Mi
71+
72+
argoRollout:
73+
resources:
74+
limits:
75+
cpu: "25m"
76+
memory: 50Mi
77+
requests:
78+
cpu: "25m"
79+
memory: 50Mi
80+
81+
dashboard:
82+
resources:
83+
limits:
84+
cpu: "25m"
85+
memory: 50Mi
86+
requests:
87+
cpu: "25m"
88+
memory: 50Mi
89+
90+
devtron:
91+
resources:
92+
limits:
93+
cpu: "50m"
94+
memory: 200Mi
95+
requests:
96+
cpu: "50m"
97+
memory: 100Mi
98+
99+
argocdDexServer:
100+
resources:
101+
limits:
102+
cpu: "25m"
103+
memory: 50Mi
104+
requests:
105+
cpu: "25m"
106+
memory: 50Mi
107+
initContainer:
108+
resources:
109+
limits:
110+
cpu: "10m"
111+
memory: 20Mi
112+
requests:
113+
cpu: "10m"
114+
memory: 20Mi
115+
116+
kubelink:
117+
resources:
118+
limits:
119+
cpu: "150m"
120+
memory: 400Mi
121+
requests:
122+
cpu: "150m"
123+
memory: 300Mi
124+
125+
postgres:
126+
resources:
127+
limits:
128+
cpu: "100m"
129+
memory: 200Mi
130+
requests:
131+
cpu: "100m"
132+
memory: 200Mi
133+
initContainer:
134+
resources:
135+
limits:
136+
cpu: "10m"
137+
memory: 20Mi
138+
requests:
139+
cpu: "10m"
140+
memory: 20Mi
141+
postgresExporter:
142+
resources:
143+
limits:
144+
cpu: "10m"
145+
memory: 20Mi
146+
requests:
147+
cpu: "10m"
148+
memory: 20Mi
149+
150+
migrator:
151+
devtron:
152+
resources:
153+
limits:
154+
cpu: "100m"
155+
memory: 250Mi
156+
requests:
157+
cpu: "100m"
158+
memory: 250Mi
159+
casbin:
160+
resources:
161+
limits:
162+
cpu: "25m"
163+
memory: 50Mi
164+
requests:
165+
cpu: "25m"
166+
memory: 50Mi
167+
initContainer:
168+
resources:
169+
limits:
170+
cpu: "100m"
171+
memory: 250Mi
172+
requests:
173+
cpu: "100m"
174+
memory: 250Mi
175+
lens:
176+
resources:
177+
limits:
178+
cpu: "25m"
179+
memory: 50Mi
180+
requests:
181+
cpu: "25m"
182+
memory: 50Mi
183+
gitSensor:
184+
resources:
185+
limits:
186+
cpu: "25m"
187+
memory: 50Mi
188+
requests:
189+
cpu: "25m"
190+
memory: 50Mi
191+
miscellaneous:
192+
resources:
193+
limits:
194+
cpu: "10m"
195+
memory: 20Mi
196+
requests:
197+
cpu: "10m"
198+
memory: 20Mi
199+
appSync:
200+
resources:
201+
limits:
202+
cpu: "50m"
203+
memory: 200Mi
204+
requests:
205+
cpu: "50m"
206+
memory: 200Mi
207+
initContainer:
208+
resources:
209+
limits:
210+
cpu: "25m"
211+
memory: 50Mi
212+
requests:
213+
cpu: "25m"
214+
memory: 50Mi
215+
216+
# Change below values for workflow controller
217+
workflowController:
218+
resources:
219+
limits:
220+
cpu: "25m"
221+
memory: 50Mi
222+
requests:
223+
cpu: "25m"
224+
memory: 50Mi

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

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,46 @@ kind: Job
88
metadata:
99
name: app-sync-job-{{ randAlphaNum 5 | lower }}
1010
spec:
11-
template:
12-
spec:
13-
serviceAccountName: devtron
14-
initContainers:
15-
- name: migration-wait
16-
image: "quay.io/devtron/kubectl:latest"
17-
command: ['sh', '-c', 'while [ ! $(kubectl -n devtroncd get $(kubectl -n devtroncd get job -l job=postgresql-migrate-devtron -o name) -o jsonpath="{.status.succeeded}") ]; do sleep 10; done']
18-
containers:
19-
- name: chart-sync
20-
image: quay.io/devtron/chart-sync:07ac8fd7-150-11120
21-
env:
22-
- name: PG_ADDR
23-
value: postgresql-postgresql.devtroncd
24-
- name: PG_DATABASE
25-
value: orchestrator
26-
- name: PG_USER
27-
value: postgres
28-
envFrom:
29-
- secretRef:
30-
name: devtron-secret
31-
restartPolicy: OnFailure
32-
backoffLimit: 4
11+
template:
12+
spec:
13+
serviceAccountName: devtron
14+
initContainers:
15+
- name: migration-wait
16+
image: "quay.io/devtron/kubectl:latest"
17+
command: ['sh', '-c', 'while [ ! $(kubectl -n devtroncd get $(kubectl -n devtroncd get job -l job=postgresql-migrate-devtron -o name) -o jsonpath="{.status.succeeded}") ]; do sleep 10; done']
18+
{{- if .Values.components.migrator }}
19+
{{- if .Values.components.migrator.appSync }}
20+
{{- if .Values.components.migrator.appSync.initContainer }}
21+
{{- if .Values.components.migrator.appSync.initContainer.resources }}
22+
resources:
23+
{{- toYaml .Values.components.migrator.appSync.initContainer.resources | nindent 10 }}
24+
{{- end }}
25+
{{- end }}
26+
{{- end }}
27+
{{- end }}
28+
containers:
29+
- name: chart-sync
30+
image: quay.io/devtron/chart-sync:07ac8fd7-150-11120
31+
env:
32+
- name: PG_ADDR
33+
value: postgresql-postgresql.devtroncd
34+
- name: PG_DATABASE
35+
value: orchestrator
36+
- name: PG_USER
37+
value: postgres
38+
envFrom:
39+
- secretRef:
40+
name: devtron-secret
41+
{{- if .Values.components.migrator }}
42+
{{- if .Values.components.migrator.appSync }}
43+
{{- if .Values.components.migrator.appSync.resources }}
44+
resources:
45+
{{- toYaml .Values.components.migrator.appSync.resources | nindent 14 }}
46+
{{- end }}
47+
{{- end }}
48+
{{- end }}
49+
restartPolicy: OnFailure
50+
backoffLimit: 4
3351
---
3452
{{- end }}
3553
{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}
@@ -50,7 +68,7 @@ spec:
5068
spec:
5169
containers:
5270
- name: chart-sync
53-
image: quay.io/devtron/chart-sync:07ac8fd7-150-11120
71+
image: quay.io/devtron/chart-sync:07ac8fd7-150-11120
5472
env:
5573
- name: PG_ADDR
5674
value: postgresql-postgresql.devtroncd
@@ -61,5 +79,13 @@ spec:
6179
envFrom:
6280
- secretRef:
6381
name: devtron-secret
82+
{{- if .Values.components.migrator }}
83+
{{- if .Values.components.migrator.appSync }}
84+
{{- if .Values.components.migrator.appSync.resources }}
85+
resources:
86+
{{- toYaml .Values.components.migrator.appSync.resources | nindent 14 }}
87+
{{- end }}
88+
{{- end }}
89+
{{- end }}
6490
restartPolicy: Never
6591
backoffLimit: 4

0 commit comments

Comments
 (0)