chore(deps): update helm general major (major) (#4392)

* chore(deps): update helm general major

* Commit bumped Chart Version

Signed-off-by: TrueCharts-Bot <bot@truecharts.org>

* render servMon closer to the end

Signed-off-by: TrueCharts-Bot <bot@truecharts.org>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

charts/enterprise/blocky/templates/common.yaml

@@ -29,7 +29,6 @@ volumeSpec:
       path: Corefile
 {{- end -}}
 
-
 {{- $_ := set .Values.persistence "tc-config" (include "blocky.configmap.mount" . | fromYaml) -}}
 
 {{- $_ := set .Values.podAnnotations "prometheus.io/scrape" "true" -}}
@@ -73,8 +72,6 @@ service:
 {{/* inject api paths in ingress */}}
 {{- include "blocky.apiinjector" . }}
 
-
-
 {{/* Define path for DoH */}}
 {{- define "blocky.doh" -}}
 {{- $fullname := include "tc.common.names.fullname" . -}}
@@ -102,6 +99,7 @@ service:
 {{/* inject api paths in ingress */}}
 {{- include "blocky.dohinjector" . }}
 
+{{- include "blocky.servicemonitor" . -}}
 
 {{/* Render the templates */}}
 {{ include "tc.common.loader.apply" . }}

charts/enterprise/blocky/templates/servicemonitor.yaml

@@ -1,3 +1,4 @@
+{{- define "blocky.servicemonitor" -}}
 {{- if .Values.metrics.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -22,3 +23,4 @@ spec:
       {{- end }}
       path: /metrics
 {{- end }}
+{{- end -}}