Skip to content

Commit b6142cd

Browse files
lllamnyplllamnyp
committed
Use library chart for resource management
Signed-off-by: Timofei Larkin <[email protected]>
1 parent e87994c commit b6142cd

19 files changed

Lines changed: 33 additions & 24 deletions

File tree

‎packages/apps/ferretdb/charts/cozy-lib‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../library/cozy-lib

‎packages/apps/ferretdb/templates/postgres.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ spec:
1919
minSyncReplicas: {{ .Values.quorum.minSyncReplicas }}
2020
maxSyncReplicas: {{ .Values.quorum.maxSyncReplicas }}
2121
{{- if .Values.resources }}
22-
resources: {{- toYaml .Values.resources | nindent 4 }}
22+
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.resources $) | nindent 4 }}
2323
{{- else if ne .Values.resourcesPreset "none" }}
24-
resources: {{- include "resources.preset" (dict "type" .Values.resourcesPreset "Release" .Release) | nindent 4 }}
24+
resources: {{- include "cozy-lib.resources.preset" (list .Values.resourcesPreset $) | nindent 4 }}
2525
{{- end }}
2626
monitoring:
2727
enablePodMonitor: true

‎packages/apps/http-cache/charts/cozy-lib‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../library/cozy-lib

‎packages/apps/http-cache/templates/haproxy/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ spec:
3434
- image: haproxy:latest
3535
name: haproxy
3636
{{- if .Values.haproxy.resources }}
37-
resources: {{- toYaml .Values.haproxy.resources | nindent 10 }}
37+
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.haproxy.resources $) | nindent 10 }}
3838
{{- else if ne .Values.haproxy.resourcesPreset "none" }}
39-
resources: {{- include "resources.preset" (dict "type" .Values.haproxy.resourcesPreset "Release" .Release) | nindent 10 }}
39+
resources: {{- include "cozy-lib.resources.preset" (list .Values.haproxy.resourcesPreset $) | nindent 10 }}
4040
{{- end }}
4141
ports:
4242
- containerPort: 8080

‎packages/apps/http-cache/templates/nginx/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ spec:
5353
containers:
5454
- name: nginx
5555
{{- if $.Values.nginx.resources }}
56-
resources: {{- toYaml $.Values.nginx.resources | nindent 10 }}
56+
resources: {{- include "cozy-lib.resources.sanitize" (list $.Values.nginx.resources $) | nindent 10 }}
5757
{{- else if ne $.Values.nginx.resourcesPreset "none" }}
58-
resources: {{- include "resources.preset" (dict "type" $.Values.nginx.resourcesPreset "Release" $.Release) | nindent 10 }}
58+
resources: {{- include "cozy-lib.resources.preset" (list $.Values.nginx.resourcesPreset $) | nindent 10 }}
5959
{{- end }}
6060
image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
6161
readinessProbe:

‎packages/apps/kafka/charts/cozy-lib‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../library/cozy-lib

‎packages/apps/kafka/templates/kafka.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ spec:
99
kafka:
1010
replicas: {{ .Values.kafka.replicas }}
1111
{{- if .Values.kafka.resources }}
12-
resources: {{- toYaml .Values.kafka.resources | nindent 6 }}
12+
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.kafka.resources $) | nindent 6 }}
1313
{{- else if ne .Values.kafka.resourcesPreset "none" }}
14-
resources: {{- include "resources.preset" (dict "type" .Values.kafka.resourcesPreset "Release" .Release) | nindent 6 }}
14+
resources: {{- include "cozy-lib.resources.preset" (list .Values.kafka.resourcesPreset $) | nindent 6 }}
1515
{{- end }}
1616
listeners:
1717
- name: plain
@@ -71,9 +71,9 @@ spec:
7171
zookeeper:
7272
replicas: {{ .Values.zookeeper.replicas }}
7373
{{- if .Values.zookeeper.resources }}
74-
resources: {{- toYaml .Values.zookeeper.resources | nindent 6 }}
74+
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.zookeeper.resources $) | nindent 6 }}
7575
{{- else if ne .Values.zookeeper.resourcesPreset "none" }}
76-
resources: {{- include "resources.preset" (dict "type" .Values.zookeeper.resourcesPreset "Release" .Release) | nindent 6 }}
76+
resources: {{- include "cozy-lib.resources.preset" (list .Values.zookeeper.resourcesPreset $) | nindent 6 }}
7777
{{- end }}
7878
storage:
7979
type: persistent-claim

‎packages/apps/mysql/charts/cozy-lib‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../library/cozy-lib

‎packages/apps/mysql/templates/mariadb.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
# type: LoadBalancer
8080

8181
{{- if .Values.resources }}
82-
resources: {{- toYaml .Values.resources | nindent 4 }}
82+
resources: {{- include "cozy-lib.resources.sanitize" (list .Values.resources $) | nindent 4 }}
8383
{{- else if ne .Values.resourcesPreset "none" }}
84-
resources: {{- include "resources.preset" (dict "type" .Values.resourcesPreset "Release" .Release) | nindent 4 }}
84+
resources: {{- include "cozy-lib.resources.preset" (list .Values.resourcesPreset $) | nindent 4 }}
8585
{{- end }}

‎packages/apps/nats/charts/cozy-lib‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../library/cozy-lib

0 commit comments

Comments
 (0)