From 37fdc309599cab8fd37fdc897842c3eaa07e9e25 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Tue, 15 Nov 2022 12:04:22 +0100
Subject: [PATCH] fix(blocky): fix servicemonitor crapping out

---
 charts/enterprise/blocky/Chart.yaml                            | 2 +-
 .../templates/{prometheusrules.yaml => _prometheusrules.tpl}   | 3 +++
 .../templates/{servicemonitor.yaml => _servicemonitor.tpl}     | 1 +
 charts/enterprise/blocky/templates/common.yaml                 | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
 rename charts/enterprise/blocky/templates/{prometheusrules.yaml => _prometheusrules.tpl} (91%)
 rename charts/enterprise/blocky/templates/{servicemonitor.yaml => _servicemonitor.tpl} (99%)

diff --git a/charts/enterprise/blocky/Chart.yaml b/charts/enterprise/blocky/Chart.yaml
index dce3000a7c3..5f677a5e75b 100644
--- a/charts/enterprise/blocky/Chart.yaml
+++ b/charts/enterprise/blocky/Chart.yaml
@@ -26,7 +26,7 @@ sources:
   - https://github.com/0xERR0R/blocky
   - https://github.com/Mozart409/blocky-frontend
   - https://hub.docker.com/r/spx01/blocky
-version: 4.0.0
+version: 4.0.1
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/blocky/templates/prometheusrules.yaml b/charts/enterprise/blocky/templates/_prometheusrules.tpl
similarity index 91%
rename from charts/enterprise/blocky/templates/prometheusrules.yaml
rename to charts/enterprise/blocky/templates/_prometheusrules.tpl
index 35b77edf0f6..9be09114e03 100644
--- a/charts/enterprise/blocky/templates/prometheusrules.yaml
+++ b/charts/enterprise/blocky/templates/_prometheusrules.tpl
@@ -1,4 +1,6 @@
+{{- define "blocky.prometheusrule" -}}
 {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
@@ -16,3 +18,4 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
 {{- end }}
+{{- end -}}
diff --git a/charts/enterprise/blocky/templates/servicemonitor.yaml b/charts/enterprise/blocky/templates/_servicemonitor.tpl
similarity index 99%
rename from charts/enterprise/blocky/templates/servicemonitor.yaml
rename to charts/enterprise/blocky/templates/_servicemonitor.tpl
index 1e54ac2c453..6a6f8208912 100644
--- a/charts/enterprise/blocky/templates/servicemonitor.yaml
+++ b/charts/enterprise/blocky/templates/_servicemonitor.tpl
@@ -1,5 +1,6 @@
 {{- define "blocky.servicemonitor" -}}
 {{- if .Values.metrics.enabled }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/charts/enterprise/blocky/templates/common.yaml b/charts/enterprise/blocky/templates/common.yaml
index f096620f92d..82486e127a2 100644
--- a/charts/enterprise/blocky/templates/common.yaml
+++ b/charts/enterprise/blocky/templates/common.yaml
@@ -100,6 +100,7 @@ service:
 {{- include "blocky.dohinjector" . }}
 
 {{- include "blocky.servicemonitor" . -}}
+{{- include "blocky.prometheusrule" . -}}
 
 {{/* Render the templates */}}
 {{ include "tc.common.loader.apply" . }}