Skip to content

Commit b99ad79

Browse files
jvpasinattojvpasinatto
committed
Use resources named template
1 parent 110d8d8 commit b99ad79

File tree

2 files changed

+27
-89
lines changed

2 files changed

+27
-89
lines changed

‎charts/pg-db/templates/_helpers.tpl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,22 @@ repos:
6363
{{- end }}
6464
{{- end }}
6565
{{- end }}
66+
67+
{{/*
68+
Common resources template
69+
*/}}
70+
{{- define "pg-database.resources" -}}
71+
{{- if .resources }}
72+
resources:
73+
{{- if .resources.requests }}
74+
requests:
75+
cpu: {{ .resources.requests.cpu }}
76+
memory: {{ .resources.requests.memory }}
77+
{{- end }}
78+
{{- if .resources.limits }}
79+
limits:
80+
cpu: {{ .resources.limits.cpu }}
81+
memory: {{ .resources.limits.memory }}
82+
{{- end }}
83+
{{- end }}
84+
{{- end }}

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

Lines changed: 8 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -182,36 +182,12 @@ spec:
182182
affinity:
183183
{{ $instance.affinity | toYaml | indent 8 }}
184184
{{- end }}
185-
{{- if $instance.resources }}
186-
resources:
187-
{{- if $instance.resources.requests }}
188-
requests:
189-
cpu: {{ $instance.resources.requests.cpu }}
190-
memory: {{ $instance.resources.requests.memory }}
191-
{{- end }}
192-
{{- if $instance.resources.limits }}
193-
limits:
194-
cpu: {{ $instance.resources.limits.cpu }}
195-
memory: {{ $instance.resources.limits.memory }}
196-
{{- end }}
197-
{{- end }}
185+
{{- include "pg-database.resources" $instance | indent 6 }}
198186
{{- if $instance.containers }}
199187
containers:
200188
{{- if $instance.containers.replicaCertCopy }}
201189
replicaCertCopy:
202-
{{- if $instance.containers.replicaCertCopy.resources }}
203-
resources:
204-
{{- if $instance.containers.replicaCertCopy.resources.requests }}
205-
requests:
206-
cpu: {{ $instance.containers.replicaCertCopy.resources.requests.cpu }}
207-
memory: {{ $instance.containers.replicaCertCopy.resources.requests.memory }}
208-
{{- end }}
209-
{{- if $instance.containers.replicaCertCopy.resources.limits }}
210-
limits:
211-
cpu: {{ $instance.containers.replicaCertCopy.resources.limits.cpu }}
212-
memory: {{ $instance.containers.replicaCertCopy.resources.limits.memory }}
213-
{{- end }}
214-
{{- end }}
190+
{{- include "pg-database.resources" $instance.containers.replicaCertCopy | indent 10 }}
215191
{{- end }}
216192
{{- end }}
217193
{{- if $instance.sidecars }}
@@ -287,36 +263,12 @@ spec:
287263
image: {{ .Values.proxy.pgBouncer.image }}
288264
replicas: {{ .Values.proxy.pgBouncer.replicas}}
289265
exposeSuperusers: {{ .Values.proxy.pgBouncer.exposeSuperusers | default true }}
290-
{{- if .Values.proxy.pgBouncer.resources }}
291-
resources:
292-
{{- if .Values.proxy.pgBouncer.resources.requests }}
293-
requests:
294-
cpu: {{ .Values.proxy.pgBouncer.resources.requests.cpu }}
295-
memory: {{ .Values.proxy.pgBouncer.resources.requests.memory }}
296-
{{- end }}
297-
{{- if .Values.proxy.pgBouncer.resources.limits }}
298-
limits:
299-
cpu: {{ .Values.proxy.pgBouncer.resources.limits.cpu }}
300-
memory: {{ .Values.proxy.pgBouncer.resources.limits.memory }}
301-
{{- end }}
302-
{{- end }}
266+
{{- include "pg-database.resources" .Values.proxy.pgBouncer | indent 6 }}
303267
{{- if .Values.proxy.pgBouncer.containers }}
304268
containers:
305269
{{- if .Values.proxy.pgBouncer.containers.pgbouncerConfig }}
306270
pgbouncerConfig:
307-
{{- if .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources }}
308-
resources:
309-
{{- if .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.requests }}
310-
requests:
311-
cpu: {{ .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.requests.cpu }}
312-
memory: {{ .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.requests.memory }}
313-
{{- end }}
314-
{{- if .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.limits }}
315-
limits:
316-
cpu: {{ .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.limits.cpu }}
317-
memory: {{ .Values.proxy.pgBouncer.containers.pgbouncerConfig.resources.limits.memory }}
318-
{{- end }}
319-
{{- end }}
271+
{{- include "pg-database.resources" .Values.proxy.pgBouncer.containers.pgbouncerConfig | indent 10 }}
320272
{{- end }}
321273
{{- end }}
322274
{{- if .Values.proxy.pgBouncer.expose }}
@@ -395,51 +347,18 @@ spec:
395347
containers:
396348
{{- if .Values.backups.pgbackrest.containers.pgbackrest }}
397349
pgbackrest:
398-
{{- if .Values.backups.pgbackrest.containers.pgbackrest.resources }}
399-
resources:
400-
{{- if .Values.backups.pgbackrest.containers.pgbackrest.resources.requests }}
401-
requests:
402-
cpu: {{ .Values.backups.pgbackrest.containers.pgbackrest.resources.requests.cpu }}
403-
memory: {{ .Values.backups.pgbackrest.containers.pgbackrest.resources.requests.memory }}
404-
{{- end }}
405-
{{- if .Values.backups.pgbackrest.containers.pgbackrest.resources.limits }}
406-
limits:
407-
cpu: {{ .Values.backups.pgbackrest.containers.pgbackrest.resources.limits.cpu }}
408-
memory: {{ .Values.backups.pgbackrest.containers.pgbackrest.resources.limits.memory }}
409-
{{- end }}
410-
{{- end }}
350+
{{- include "pg-database.resources" .Values.backups.pgbackrest.containers.pgbackrest | indent 10 }}
411351
{{- end }}
412352
{{- if .Values.backups.pgbackrest.containers.pgbackrestConfig }}
413353
pgbackrestConfig:
414-
{{- if .Values.backups.pgbackrest.containers.pgbackrestConfig.resources }}
415-
resources:
416-
{{- if .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.requests }}
417-
requests:
418-
cpu: {{ .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.requests.cpu }}
419-
memory: {{ .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.requests.memory }}
420-
{{- end }}
421-
{{- if .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.limits }}
422-
limits:
423-
cpu: {{ .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.limits.cpu }}
424-
memory: {{ .Values.backups.pgbackrest.containers.pgbackrestConfig.resources.limits.memory }}
425-
{{- end }}
426-
{{- end }}
354+
{{- include "pg-database.resources" .Values.backups.pgbackrest.containers.pgbackrestConfig | indent 10 }}
427355
{{- end }}
428356
{{- end }}
429357
{{- if .Values.backups.pgbackrest.jobs }}
430358
jobs:
431359
priorityClassName: {{ .Values.backups.pgbackrest.jobs.priorityClassName }}
432-
resources:
433-
{{- if .Values.backups.pgbackrest.jobs.resources.requests }}
434-
requests:
435-
cpu: {{ .Values.backups.pgbackrest.jobs.resources.requests.cpu }}
436-
memory: {{ .Values.backups.pgbackrest.jobs.resources.requests.memory }}
437-
{{- end }}
438-
{{- if .Values.backups.pgbackrest.jobs.resources.limits }}
439-
limits:
440-
cpu: {{ .Values.backups.pgbackrest.jobs.resources.limits.cpu }}
441-
memory: {{ .Values.backups.pgbackrest.jobs.resources.limits.memory }}
442-
{{- end }}
360+
{{- end }}
361+
{{- include "pg-database.resources" .Values.backups.pgbackrest.jobs | indent 8 }}
443362
{{- if .Values.backups.pgbackrest.jobs.tolerations }}
444363
tolerations:
445364
{{ .Values.backups.pgbackrest.jobs.tolerations | toYaml | indent 10 }}

0 commit comments

Comments
 (0)