Skip to content

Commit fd5848f

Browse files
Sheikh-Abubakerwaterdrag0n
authored andcommitted
enable tpl processing for alert files
Signed-off-by: waterdrag0n <[email protected]>
2 parents a11cd1b + 87c515d commit fd5848f

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

charts/grafana/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana
3-
version: 9.4.3
3+
version: 9.4.5
44
appVersion: 12.1.1
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.

charts/grafana/templates/_config.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ grafana.ini: |
5555

5656
{{- range $key, $value := .Values.alerting }}
5757
{{- if (hasKey $value "file") }}
58-
{{ $key }}:
59-
{{- toYaml ( $files.Get $value.file ) | nindent 2 }}
58+
{{ $key }}: |
59+
{{- tpl ($files.Get $value.file) $root | nindent 2 }}
6060
{{- else if (or (hasKey $value "secret") (hasKey $value "secretFile"))}}
6161
{{/* will be stored inside secret generated by "configSecret.yaml"*/}}
6262
{{- else }}

charts/grafana/templates/_pod.tpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,6 +1200,7 @@ containers:
12001200
- name: GOMEMLIMIT
12011201
valueFrom:
12021202
resourceFieldRef:
1203+
divisor: "1"
12031204
resource: limits.memory
12041205
{{- end }}
12051206
{{- range $key, $value := .Values.envValueFrom }}
@@ -1450,4 +1451,4 @@ volumes:
14501451
{{- with .Values.extraContainerVolumes }}
14511452
{{- tpl (toYaml .) $root | nindent 2 }}
14521453
{{- end }}
1453-
{{- end }}
1454+
{{- end }}

0 commit comments

Comments
 (0)