Skip to content

Commit 00a9d35

Browse files
srodenhuissrodenhuis
authored
fix: set defaults for apps (#1710)
1 parent 612c9e5 commit 00a9d35

File tree

7 files changed

+158
-103
lines changed

7 files changed

+158
-103
lines changed

‎charts/otomi-db/templates/cluster.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ spec:
2828
resources:
2929
{{- with .Values.resources }}
3030
{{- toYaml . | nindent 4 }}
31-
{{- else }}
32-
limits:
33-
cpu: 100m
34-
memory: 512Mi
35-
requests:
36-
cpu: 50m
37-
memory: 256Mi
3831
{{- end }}
3932
{{- with .Values.clusterAffinity }}
4033
{{- toYaml . | nindent 2 }}

‎charts/otomi-db/values.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ walStorage:
1111
storageClass: ""
1212
size: 5Gi
1313

14+
resources: {}
15+
1416
monitoring: true
1517

1618
clusterAffinity:

‎helmfile.d/snippets/defaults.yaml

+149-25
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ environments:
77
apps:
88
alertmanager:
99
enabled: false
10+
resources:
11+
requests:
12+
cpu: 100m
13+
memory: 128Mi
14+
limits:
15+
cpu: 500m
16+
memory: 256Mi
1017
_rawValues: {}
1118
argocd:
1219
applicationSet:
@@ -84,17 +91,17 @@ environments:
8491
cpu: 50m
8592
memory: 64Mi
8693
limits:
87-
cpu: 200m
88-
memory: 384Mi
94+
cpu: "1"
95+
memory: 512Mi
8996
_rawValues: {}
9097
cnpg:
9198
resources:
9299
requests:
93100
cpu: 100m
94-
memory: 100Mi
101+
memory: 128Mi
95102
limits:
96-
cpu: 1000m
97-
memory: 512Mi
103+
cpu: "1"
104+
memory: 1Gi
98105
_rawValues: {}
99106
drone:
100107
enabled: false
@@ -206,8 +213,8 @@ environments:
206213
cpu: 100m
207214
memory: 512Mi
208215
limits:
209-
cpu: 1000m
210-
memory: 1024Mi
216+
cpu: "1"
217+
memory: 1Gi
211218
falcoCtlFollow:
212219
requests:
213220
cpu: 20m
@@ -241,6 +248,13 @@ environments:
241248
_rawValues: {}
242249
grafana:
243250
enabled: false
251+
resources:
252+
requests:
253+
cpu: 100m
254+
memory: 128Mi
255+
limits:
256+
cpu: 500m
257+
memory: 256Mi
244258
_rawValues: {}
245259
harbor:
246260
enabled: false
@@ -250,12 +264,61 @@ environments:
250264
credentials:
251265
username: otomi-admin
252266
resources:
267+
chartmuseum:
268+
requests:
269+
cpu: 100m
270+
memory: 128Mi
271+
limits:
272+
cpu: 500m
273+
memory: 512Mi
274+
core:
275+
requests:
276+
cpu: 100m
277+
memory: 256Mi
278+
limits:
279+
cpu: 500m
280+
memory: 512Mi
281+
jobservice:
282+
requests:
283+
cpu: 100m
284+
memory: 256Mi
285+
limits:
286+
cpu: 500m
287+
memory: 512Mi
288+
portal:
289+
requests:
290+
cpu: 100m
291+
memory: 128Mi
292+
limits:
293+
cpu: 500m
294+
memory: 512Mi
295+
redis:
296+
requests:
297+
cpu: 100m
298+
memory: 128Mi
299+
limits:
300+
cpu: 500m
301+
memory: 512Mi
302+
registry:
303+
requests:
304+
cpu: 100m
305+
memory: 64Mi
306+
limits:
307+
cpu: 500m
308+
memory: 256Mi
309+
registry-controller:
310+
requests:
311+
cpu: 100m
312+
memory: 256Mi
313+
limits:
314+
cpu: 500m
315+
memory: 512Mi
253316
trivy:
254317
requests:
255318
cpu: 200m
256-
memory: 256Mi
319+
memory: 128Mi
257320
limits:
258-
cpu: 400m
321+
cpu: 500m
259322
memory: 512Mi
260323
_rawValues: {}
261324
httpbin:
@@ -288,7 +351,7 @@ environments:
288351
cpu: 200m
289352
memory: 512Mi
290353
limits:
291-
cpu: 2
354+
cpu: "2"
292355
memory: 2Gi
293356
_rawValues: {}
294357
istio:
@@ -307,6 +370,37 @@ environments:
307370
maxReplicas: 10
308371
egressGateway:
309372
enabled: false
373+
global:
374+
proxy:
375+
resources:
376+
requests:
377+
cpu: 20m
378+
memory: 128Mi
379+
limits:
380+
cpu: "1"
381+
memory: 1Gi
382+
resources:
383+
egressgateway:
384+
requests:
385+
cpu: 100m
386+
memory: 128Mi
387+
limits:
388+
cpu: "1"
389+
memory: 256Mi
390+
ingressgateway:
391+
requests:
392+
cpu: 100m
393+
memory: 128Mi
394+
limits:
395+
cpu: "1"
396+
memory: 256Mi
397+
pilot:
398+
requests:
399+
cpu: 100m
400+
memory: 128Mi
401+
limits:
402+
cpu: "2"
403+
memory: 2Gi
310404
_rawValues: {}
311405
jaeger:
312406
enabled: false
@@ -320,14 +414,14 @@ environments:
320414
cpu: 200m
321415
memory: 512Mi
322416
limits:
323-
cpu: 2000m
324-
memory: 1Gi
417+
cpu: "2"
418+
memory: 2Gi
325419
operator:
326420
requests:
327421
cpu: 100m
328422
memory: 128Mi
329423
limits:
330-
cpu: 1000m
424+
cpu: "1"
331425
memory: 512Mi
332426
idp:
333427
alias: otomi-idp
@@ -341,14 +435,14 @@ environments:
341435
cpu: 200m
342436
memory: 256Mi
343437
limits:
344-
cpu: 500m
438+
cpu: "1"
345439
memory: 1Gi
346440
operator:
347441
requests:
348-
cpu: 1000m
442+
cpu: "1"
349443
memory: 512Mi
350444
limits:
351-
cpu: 2000m
445+
cpu: "2"
352446
memory: 1Gi
353447
_rawValues: {}
354448
knative:
@@ -575,8 +669,31 @@ environments:
575669
insecureSkipVerify: false
576670
replicas: 1
577671
scrapeInterval: 60s
672+
retention: 120h
578673
retentionSize: 4GB
579674
storageSize: 5Gi
675+
resources:
676+
prometheus:
677+
requests:
678+
cpu: 100m
679+
memory: 512Mi
680+
limits:
681+
cpu: '3'
682+
memory: 3Gi
683+
kube-state-metrics:
684+
requests:
685+
cpu: 100m
686+
memory: 128Mi
687+
limits:
688+
cpu: 200m
689+
memory: 256Mi
690+
node-exporter:
691+
requests:
692+
cpu: 100m
693+
memory: 128Mi
694+
limits:
695+
cpu: 500m
696+
memory: 256Mi
580697
_rawValues: {}
581698
redis-shared:
582699
enabled: false
@@ -598,14 +715,14 @@ environments:
598715
collector:
599716
requests:
600717
cpu: 100m
601-
memory: 64Mi
718+
memory: 128Mi
602719
limits:
603720
cpu: 500m
604721
memory: 512Mi
605722
manager:
606723
requests:
607724
cpu: 50m
608-
memory: 16Mi
725+
memory: 32Mi
609726
limits:
610727
cpu: 200m
611728
memory: 512Mi
@@ -624,8 +741,8 @@ environments:
624741
cpu: 50m
625742
memory: 64Mi
626743
limits:
627-
cpu: 2000m
628-
memory: 1024Mi
744+
cpu: "2"
745+
memory: 1Gi
629746
_rawValues: {}
630747
tempo:
631748
enabled: false
@@ -739,8 +856,8 @@ environments:
739856
cpu: 100m
740857
memory: 128M
741858
limits:
742-
cpu: 500m
743-
memory: 512Mi
859+
cpu: "1"
860+
memory: 1G
744861
_rawValues: {}
745862
velero:
746863
enabled: false
@@ -752,7 +869,7 @@ environments:
752869
cpu: 500m
753870
memory: 128Mi
754871
limits:
755-
cpu: 1000m
872+
cpu: "1"
756873
memory: 512Mi
757874
_rawValues: {}
758875
databases:
@@ -762,7 +879,7 @@ environments:
762879
replicas: 2
763880
resources:
764881
limits:
765-
cpu: 100m
882+
cpu: 500m
766883
memory: 512Mi
767884
requests:
768885
cpu: 50m
@@ -771,14 +888,21 @@ environments:
771888
size: 5Gi
772889
replicas: 2
773890
coreDatabase: registry
891+
resources:
892+
limits:
893+
cpu: 500m
894+
memory: 512Mi
895+
requests:
896+
cpu: 50m
897+
memory: 256Mi
774898
gitea:
775899
useOtomiDB: true
776900
imported: false
777901
size: 5Gi
778902
replicas: 2
779903
resources:
780904
limits:
781-
cpu: 100m
905+
cpu: 500m
782906
memory: 512Mi
783907
requests:
784908
cpu: 50m

‎values/gitea/gitea-otomi-db.gotmpl

+1-11
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,4 @@ clusterSpec:
6666
localeCType: 'en_US.UTF-8'
6767
{{- end }}
6868

69-
resources:
70-
{{- with $gdb | get "resources" nil }}
71-
{{- toYaml . | nindent 6 }}
72-
{{- else }}
73-
limits:
74-
cpu: 100m
75-
memory: 512Mi
76-
requests:
77-
cpu: 50m
78-
memory: 256Mi
79-
{{- end }}
69+
resources: {{- toYaml $gdb.resources | nindent 2 }}

‎values/harbor/harbor-otomi-db.gotmpl

+1-11
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,4 @@ clusterSpec:
3636
localeCollate: 'en_US.UTF-8'
3737
localeCType: 'en_US.UTF-8'
3838

39-
resources:
40-
{{- with $hdb | get "resources" nil }}
41-
{{- toYaml . | nindent 6 }}
42-
{{- else }}
43-
limits:
44-
cpu: 100m
45-
memory: 512Mi
46-
requests:
47-
cpu: 50m
48-
memory: 256Mi
49-
{{- end }}
39+
resources: {{- toYaml $hdb.resources | nindent 2 }}

‎values/keycloak/keycloak-otomi-db.gotmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ clusterSpec:
6262
localeCType: 'en_US.UTF-8'
6363
{{- end }}
6464

65-
resources: {{- toYaml $kdb.resources | nindent 6 }}
65+
resources: {{- toYaml $kdb.resources | nindent 2 }}

0 commit comments

Comments
 (0)