Skip to content

Commit 5396b10

Browse files
authored
fix: default resource config (#1726)
1 parent bb4a757 commit 5396b10

File tree

15 files changed

+271
-295
lines changed

15 files changed

+271
-295
lines changed

helmfile.d/snippets/defaults.yaml

+172-34
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ environments:
243243
memory: 1Gi
244244
falcoCtlFollow:
245245
requests:
246-
cpu: 20m
246+
cpu: 100m
247247
memory: 16Mi
248248
limits:
249-
cpu: 50m
249+
cpu: 500m
250250
memory: 32Mi
251251
falcoCtlInstall:
252252
requests:
@@ -264,23 +264,67 @@ environments:
264264
memory: 256Mi
265265
falcoExporter:
266266
requests:
267-
cpu: 20m
267+
cpu: 100m
268268
memory: 16Mi
269269
limits:
270-
cpu: 50m
270+
cpu: 500m
271271
memory: 32Mi
272272
gitea:
273273
adminUsername: otomi-admin
274274
_rawValues: {}
275+
resources:
276+
gitea:
277+
limits:
278+
cpu: "1"
279+
memory: 1Gi
280+
requests:
281+
cpu: 100m
282+
memory: 128Mi
283+
memcached:
284+
limits:
285+
cpu: 250m
286+
memory: 256Mi
287+
requests:
288+
cpu: 100m
289+
memory: 128Mi
290+
memcachedMetrics:
291+
limits:
292+
cpu: 200m
293+
memory: 128M
294+
requests:
295+
cpu: 50m
296+
memory: 64M
297+
init:
298+
limits:
299+
cpu: 400m
300+
memory: 256Mi
301+
requests:
302+
cpu: 100m
303+
memory: 128Mi
275304
grafana:
276305
enabled: false
277306
resources:
278-
requests:
279-
cpu: 100m
280-
memory: 128Mi
281-
limits:
282-
cpu: 500m
283-
memory: 256Mi
307+
grafana:
308+
requests:
309+
cpu: 100m
310+
memory: 128Mi
311+
limits:
312+
cpu: 500m
313+
memory: 256Mi
314+
downloadDashboards:
315+
limits:
316+
cpu: 500m
317+
memory: 100Mi
318+
requests:
319+
cpu: 200m
320+
memory: 50Mi
321+
sidecar:
322+
limits:
323+
cpu: 500m
324+
memory: 100Mi
325+
requests:
326+
cpu: 200m
327+
memory: 50Mi
284328
_rawValues: {}
285329
harbor:
286330
enabled: false
@@ -332,7 +376,7 @@ environments:
332376
limits:
333377
cpu: 500m
334378
memory: 256Mi
335-
registry-controller:
379+
registryController:
336380
requests:
337381
cpu: 100m
338382
memory: 256Mi
@@ -365,12 +409,27 @@ environments:
365409
maxBodySize: 1024m
366410
maxBodySizeBytes: 1073741824
367411
resources:
368-
requests:
369-
cpu: 200m
370-
memory: 512Mi
371-
limits:
372-
cpu: "2"
373-
memory: 2Gi
412+
controller:
413+
requests:
414+
cpu: 200m
415+
memory: 512Mi
416+
limits:
417+
cpu: "2"
418+
memory: 2Gi
419+
opentelemetry:
420+
requests:
421+
cpu: 100m
422+
memory: 65Mi
423+
limits:
424+
cpu: 500m
425+
memory: 256Mi
426+
defaultBackend:
427+
limits:
428+
cpu: 20m
429+
memory: 20Mi
430+
requests:
431+
cpu: 10m
432+
memory: 10Mi
374433
_rawValues: {}
375434
istio:
376435
tracing:
@@ -422,6 +481,42 @@ environments:
422481
_rawValues: {}
423482
jaeger:
424483
enabled: false
484+
resources:
485+
operator:
486+
limits:
487+
cpu: 500m
488+
memory: 128Mi
489+
requests:
490+
cpu: 100m
491+
memory: 32Mi
492+
agent:
493+
limits:
494+
cpu: 100m
495+
memory: 128Mi
496+
requests:
497+
cpu: 10m
498+
memory: 32Mi
499+
collector:
500+
limits:
501+
cpu: 100m
502+
memory: 128Mi
503+
requests:
504+
cpu: 10m
505+
memory: 32Mi
506+
ingester:
507+
limits:
508+
cpu: 100m
509+
memory: 128Mi
510+
requests:
511+
cpu: 10m
512+
memory: 32Mi
513+
jaeger:
514+
limits:
515+
cpu: "1"
516+
memory: 512Mi
517+
requests:
518+
cpu: 100m
519+
memory: 128Mi
425520
_rawValues: {}
426521
keycloak:
427522
adminUsername: otomi-admin
@@ -567,6 +662,13 @@ environments:
567662
limits:
568663
cpu: 200m
569664
memory: 256Mi
665+
reverseProxy:
666+
limits:
667+
cpu: 100m
668+
memory: 32Mi
669+
requests:
670+
cpu: 50m
671+
memory: 16Mi
570672
persistence:
571673
ingester:
572674
size: 20Gi
@@ -630,8 +732,30 @@ environments:
630732
otomi-api:
631733
editorInactivityTimeout: 1
632734
_rawValues: {}
735+
resources:
736+
api:
737+
limits:
738+
cpu: 500m
739+
memory: 512Mi
740+
requests:
741+
cpu: 100m
742+
memory: 256Mi
743+
tools:
744+
limits:
745+
cpu: 600m
746+
memory: 512Mi
747+
requests:
748+
cpu: 100m
749+
memory: 128Mi
633750
otomi-console:
634751
_rawValues: {}
752+
resources:
753+
limits:
754+
cpu: 400m
755+
memory: 256Mi
756+
requests:
757+
cpu: 50m
758+
memory: 128Mi
635759
otomi-operator:
636760
resources:
637761
operator:
@@ -646,34 +770,41 @@ environments:
646770
resources:
647771
operator:
648772
requests:
649-
cpu: 100m
773+
cpu: 200m
650774
memory: 128Mi
651775
limits:
652-
cpu: 200m
653-
memory: 256Mi
776+
cpu: "1"
777+
memory: 512Mi
654778
_rawValues: {}
655779
apl-gitea-operator:
656780
resources:
657781
operator:
658782
requests:
659-
cpu: 100m
783+
cpu: 200m
660784
memory: 128Mi
661785
limits:
662-
cpu: 200m
786+
cpu: "1"
663787
memory: 512Mi
664788
_rawValues: {}
665789
apl-keycloak-operator:
666790
resources:
667791
operator:
668792
requests:
669-
cpu: 100m
793+
cpu: 200m
670794
memory: 128Mi
671795
limits:
672-
cpu: 200m
673-
memory: 256Mi
796+
cpu: "1"
797+
memory: 512Mi
674798
_rawValues: {}
675799
promtail:
676800
enabled: false
801+
resources:
802+
requests:
803+
cpu: 200m
804+
memory: 256Mi
805+
limits:
806+
cpu: "1"
807+
memory: 512Mi
677808
_rawValues: {}
678809
prometheus-blackbox-exporter:
679810
_rawValues: {}
@@ -691,6 +822,13 @@ environments:
691822
retentionSize: 4GB
692823
storageSize: 5Gi
693824
resources:
825+
prometheusOperator:
826+
limits:
827+
cpu: 400m
828+
memory: 256Mi
829+
requests:
830+
cpu: 100m
831+
memory: 128Mi
694832
prometheus:
695833
requests:
696834
cpu: 100m
@@ -901,21 +1039,21 @@ environments:
9011039
replicas: 2
9021040
resources:
9031041
limits:
904-
cpu: 500m
905-
memory: 512Mi
1042+
cpu: "1"
1043+
memory: 1Gi
9061044
requests:
907-
cpu: 50m
1045+
cpu: 200m
9081046
memory: 256Mi
9091047
harbor:
9101048
size: 5Gi
9111049
replicas: 2
9121050
coreDatabase: registry
9131051
resources:
9141052
limits:
915-
cpu: 500m
916-
memory: 512Mi
1053+
cpu: "1"
1054+
memory: 1Gi
9171055
requests:
918-
cpu: 50m
1056+
cpu: 200m
9191057
memory: 256Mi
9201058
gitea:
9211059
useOtomiDB: true
@@ -924,10 +1062,10 @@ environments:
9241062
replicas: 2
9251063
resources:
9261064
limits:
927-
cpu: 500m
928-
memory: 512Mi
1065+
cpu: "1"
1066+
memory: 1Gi
9291067
requests:
930-
cpu: 50m
1068+
cpu: 200m
9311069
memory: 256Mi
9321070
obj:
9331071
provider:

tests/fixtures/env/apps/ingress-nginx-net-a.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ apps:
1212
modsecurity:
1313
enabled: true
1414
resources:
15-
limits:
16-
cpu: 200m
17-
memory: 256Mi
18-
requests:
19-
cpu: 100m
20-
memory: 192Mi
15+
controller:
16+
limits:
17+
cpu: 200m
18+
memory: 256Mi
19+
requests:
20+
cpu: 100m
21+
memory: 192Mi

tests/fixtures/env/apps/ingress-nginx-platform.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ apps:
1212
modsecurity:
1313
enabled: true
1414
resources:
15-
limits:
16-
cpu: 200m
17-
memory: 256Mi
18-
requests:
19-
cpu: 100m
20-
memory: 192Mi
15+
controller:
16+
limits:
17+
cpu: 200m
18+
memory: 256Mi
19+
requests:
20+
cpu: 100m
21+
memory: 192Mi

tests/fixtures/env/apps/ingress-nginx.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ apps:
99
modsecurity:
1010
enabled: true
1111
resources:
12-
limits:
13-
cpu: 200m
14-
memory: 256Mi
15-
requests:
16-
cpu: 100m
17-
memory: 192Mi
12+
controller:
13+
limits:
14+
cpu: 200m
15+
memory: 256Mi
16+
requests:
17+
cpu: 100m
18+
memory: 192Mi

values-changes.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -292,3 +292,7 @@ changes:
292292
- 'otomi.isHomeMonitored'
293293
- 'home'
294294
- 'dns.provider.civo'
295+
- version: 29
296+
relocations:
297+
- 'apps.harbor.resources.registry-controller': 'apps.harbor.resources.registryController'
298+
- 'apps.ingress-nginx.resources': 'apps.ingress-nginx.resources.controller'

0 commit comments

Comments
 (0)