diff --git a/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml b/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml index 91a66ba..c835c23 100644 --- a/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml +++ b/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml @@ -48,9 +48,11 @@ data: +{{- if .Values.clickhouse.resources }} {{ include "toBytesWithoutReserved" (list .Values.clickhouse.resources.limits.memory .Values.clickhouse.reserveMemory) }} {{ include "toBytesWithoutReserved" (list .Values.clickhouse.resources.limits.memory .Values.clickhouse.reserveMemory) }} {{ include "toBytesWithoutReserved" (list .Values.clickhouse.resources.limits.memory .Values.clickhouse.reserveMemory) }} +{{- end }} 0 random diff --git a/charts/loghouse/templates/fluentd/fluentd.yaml b/charts/loghouse/templates/fluentd/fluentd.yaml index 3b22a22..945a021 100644 --- a/charts/loghouse/templates/fluentd/fluentd.yaml +++ b/charts/loghouse/templates/fluentd/fluentd.yaml @@ -50,6 +50,7 @@ spec: envFrom: - secretRef: name: clickhouse-credentilas +{{- if .Values.fluentd.resources }} resources: limits: memory: {{ .Values.fluentd.resources.limits.memory }} @@ -57,6 +58,7 @@ spec: requests: memory: {{ .Values.fluentd.resources.requests.memory }} cpu: {{ .Values.fluentd.resources.requests.cpu }} +{{- end }} ports: {{- if .Values.fluentd.prometheusEnabled }} - name: http-metrics