diff --git a/bitnami/grafana-loki/CHANGELOG.md b/bitnami/grafana-loki/CHANGELOG.md
index f48cddee06..b0464ce3e3 100644
--- a/bitnami/grafana-loki/CHANGELOG.md
+++ b/bitnami/grafana-loki/CHANGELOG.md
@@ -1,8 +1,12 @@
# Changelog
-## 4.6.14 (2024-09-06)
+## 4.6.15 (2024-09-11)
-* [bitnami/grafana-loki] Release 4.6.14 ([#29235](https://github.com/bitnami/charts/pull/29235))
+* [bitnami/grafana-loki] Allow rendering resources values ([#29343](https://github.com/bitnami/charts/pull/29343))
+
+## 4.6.14 (2024-09-09)
+
+* [bitnami/grafana-loki] Release 4.6.14 (#29235) ([2cc3811](https://github.com/bitnami/charts/commit/2cc3811f15b304febf7fd98eeebfd0a6573157fb)), closes [#29235](https://github.com/bitnami/charts/issues/29235)
## 4.6.13 (2024-08-27)
diff --git a/bitnami/grafana-loki/Chart.yaml b/bitnami/grafana-loki/Chart.yaml
index 194f65d48c..9f271bafc4 100644
--- a/bitnami/grafana-loki/Chart.yaml
+++ b/bitnami/grafana-loki/Chart.yaml
@@ -55,4 +55,4 @@ maintainers:
name: grafana-loki
sources:
- https://github.com/bitnami/charts/tree/main/bitnami/grafana-loki
-version: 4.6.14
+version: 4.6.15
diff --git a/bitnami/grafana-loki/templates/compactor/deployment.yaml b/bitnami/grafana-loki/templates/compactor/deployment.yaml
index 816c8daeef..9141e605e4 100644
--- a/bitnami/grafana-loki/templates/compactor/deployment.yaml
+++ b/bitnami/grafana-loki/templates/compactor/deployment.yaml
@@ -119,7 +119,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.compactor.resources }}
- resources: {{- toYaml .Values.compactor.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.compactor.resources "context" $) | nindent 12 }}
{{- else if ne .Values.compactor.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.compactor.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/distributor/deployment.yaml b/bitnami/grafana-loki/templates/distributor/deployment.yaml
index e8231a1d93..03a1f88bd1 100644
--- a/bitnami/grafana-loki/templates/distributor/deployment.yaml
+++ b/bitnami/grafana-loki/templates/distributor/deployment.yaml
@@ -119,7 +119,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.distributor.resources }}
- resources: {{- toYaml .Values.distributor.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.distributor.resources "context" $) | nindent 12 }}
{{- else if ne .Values.distributor.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.distributor.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/gateway/deployment.yaml b/bitnami/grafana-loki/templates/gateway/deployment.yaml
index 44b5d2d2b9..b2732ef7ee 100644
--- a/bitnami/grafana-loki/templates/gateway/deployment.yaml
+++ b/bitnami/grafana-loki/templates/gateway/deployment.yaml
@@ -147,7 +147,7 @@ spec:
{{- end }}
{{- end }}
{{- if .Values.gateway.resources }}
- resources: {{- toYaml .Values.gateway.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.gateway.resources "context" $) | nindent 12 }}
{{- else if ne .Values.gateway.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.gateway.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/index-gateway/statefulset.yaml b/bitnami/grafana-loki/templates/index-gateway/statefulset.yaml
index 5cf3567c35..f60eea7739 100644
--- a/bitnami/grafana-loki/templates/index-gateway/statefulset.yaml
+++ b/bitnami/grafana-loki/templates/index-gateway/statefulset.yaml
@@ -120,7 +120,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.indexGateway.resources }}
- resources: {{- toYaml .Values.indexGateway.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.indexGateway.resources "context" $) | nindent 12 }}
{{- else if ne .Values.indexGateway.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.indexGateway.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/ingester/statefulset.yaml b/bitnami/grafana-loki/templates/ingester/statefulset.yaml
index d0717c1271..3f2c60413f 100644
--- a/bitnami/grafana-loki/templates/ingester/statefulset.yaml
+++ b/bitnami/grafana-loki/templates/ingester/statefulset.yaml
@@ -94,7 +94,7 @@ spec:
securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.volumePermissions.resources }}
- resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }}
{{- else if ne .Values.volumePermissions.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }}
{{- end }}
@@ -149,7 +149,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.ingester.resources }}
- resources: {{- toYaml .Values.ingester.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.ingester.resources "context" $) | nindent 12 }}
{{- else if ne .Values.ingester.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.ingester.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/promtail/daemonset.yaml b/bitnami/grafana-loki/templates/promtail/daemonset.yaml
index 8f485c98bd..1d846511bc 100644
--- a/bitnami/grafana-loki/templates/promtail/daemonset.yaml
+++ b/bitnami/grafana-loki/templates/promtail/daemonset.yaml
@@ -120,7 +120,7 @@ spec:
- containerPort: {{ .Values.promtail.containerPorts.grpc }}
name: grpc
{{- if .Values.promtail.resources }}
- resources: {{- toYaml .Values.promtail.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.promtail.resources "context" $) | nindent 12 }}
{{- else if ne .Values.promtail.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.promtail.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/querier/statefulset.yaml b/bitnami/grafana-loki/templates/querier/statefulset.yaml
index c4c87ae46b..fb0f62a958 100644
--- a/bitnami/grafana-loki/templates/querier/statefulset.yaml
+++ b/bitnami/grafana-loki/templates/querier/statefulset.yaml
@@ -96,7 +96,7 @@ spec:
securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.volumePermissions.resources }}
- resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }}
{{- else if ne .Values.volumePermissions.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }}
{{- end }}
@@ -154,7 +154,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.querier.resources }}
- resources: {{- toYaml .Values.querier.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.querier.resources "context" $) | nindent 12 }}
{{- else if ne .Values.querier.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.querier.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/query-frontend/deployment.yaml b/bitnami/grafana-loki/templates/query-frontend/deployment.yaml
index dae882da93..2bf1f6e6e7 100644
--- a/bitnami/grafana-loki/templates/query-frontend/deployment.yaml
+++ b/bitnami/grafana-loki/templates/query-frontend/deployment.yaml
@@ -118,7 +118,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.queryFrontend.resources }}
- resources: {{- toYaml .Values.queryFrontend.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.queryFrontend.resources "context" $) | nindent 12 }}
{{- else if ne .Values.queryFrontend.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.queryFrontend.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/query-scheduler/deployment.yaml b/bitnami/grafana-loki/templates/query-scheduler/deployment.yaml
index 17da9c3e9e..518394f85a 100644
--- a/bitnami/grafana-loki/templates/query-scheduler/deployment.yaml
+++ b/bitnami/grafana-loki/templates/query-scheduler/deployment.yaml
@@ -119,7 +119,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.queryScheduler.resources }}
- resources: {{- toYaml .Values.queryScheduler.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.queryScheduler.resources "context" $) | nindent 12 }}
{{- else if ne .Values.queryScheduler.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.queryScheduler.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/ruler/statefulset.yaml b/bitnami/grafana-loki/templates/ruler/statefulset.yaml
index 24fad9e78e..4c7c96f102 100644
--- a/bitnami/grafana-loki/templates/ruler/statefulset.yaml
+++ b/bitnami/grafana-loki/templates/ruler/statefulset.yaml
@@ -97,7 +97,7 @@ spec:
securityContext: {{- .Values.volumePermissions.containerSecurityContext | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.volumePermissions.resources }}
- resources: {{- toYaml .Values.volumePermissions.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }}
{{- else if ne .Values.volumePermissions.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.volumePermissions.resourcesPreset) | nindent 12 }}
{{- end }}
@@ -152,7 +152,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.ruler.resources }}
- resources: {{- toYaml .Values.ruler.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.ruler.resources "context" $) | nindent 12 }}
{{- else if ne .Values.ruler.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.ruler.resourcesPreset) | nindent 12 }}
{{- end }}
diff --git a/bitnami/grafana-loki/templates/table-manager/deployment.yaml b/bitnami/grafana-loki/templates/table-manager/deployment.yaml
index 0b7eab5c05..1837a31393 100644
--- a/bitnami/grafana-loki/templates/table-manager/deployment.yaml
+++ b/bitnami/grafana-loki/templates/table-manager/deployment.yaml
@@ -116,7 +116,7 @@ spec:
- containerPort: {{ .Values.loki.containerPorts.grpc }}
name: grpc
{{- if .Values.tableManager.resources }}
- resources: {{- toYaml .Values.tableManager.resources | nindent 12 }}
+ resources: {{- include "common.tplvalues.render" (dict "value" .Values.tableManager.resources "context" $) | nindent 12 }}
{{- else if ne .Values.tableManager.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.tableManager.resourcesPreset) | nindent 12 }}
{{- end }}