Merge pull request #158 from quite4work/make-possible-removing-resour…

…ce-limits Make possible removing resource limits for clickhouse and fluentd
flant · Sep 28, 2020 · 6d5841f · 6d5841f
2 parents cbe0344 + 578126b
commit 6d5841f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml b/charts/loghouse/templates/clickhouse/clickhouse-configmap.yaml
@@ -48,9 +48,11 @@ data:
     <yandex>
         <profiles>
             <default>
+{{- if .Values.clickhouse.resources }}
                 <max_memory_usage>{{ include "toBytesWithoutReserved" (list .Values.clickhouse.resources.limits.memory  .Values.clickhouse.reserveMemory) }}</max_memory_usage>
                 <max_memory_usage_for_user>{{ include "toBytesWithoutReserved" (list .Values.clickhouse.resources.limits.memory .Values.clickhouse.reserveMemory) }}</max_memory_usage_for_user>
                 <max_memory_usage_for_all_queries>{{ include "toBytesWithoutReserved" (list  .Values.clickhouse.resources.limits.memory .Values.clickhouse.reserveMemory) }}</max_memory_usage_for_all_queries>
+{{- end }}
                 <use_uncompressed_cache>0</use_uncompressed_cache>
                 <load_balancing>random</load_balancing>
             </default>

diff --git a/charts/loghouse/templates/fluentd/fluentd.yaml b/charts/loghouse/templates/fluentd/fluentd.yaml
@@ -50,13 +50,15 @@ spec:
         envFrom:
         - secretRef:
             name: clickhouse-credentilas
+{{- if .Values.fluentd.resources }}
         resources:
           limits:
             memory: {{ .Values.fluentd.resources.limits.memory }}
             cpu: {{ .Values.fluentd.resources.limits.cpu }}
           requests:
             memory: {{ .Values.fluentd.resources.requests.memory }}
             cpu: {{ .Values.fluentd.resources.requests.cpu }}
+{{- end }}
         ports:
 {{- if .Values.fluentd.prometheusEnabled }}
         - name: http-metrics