DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases 1 Wiki Activity

fix(blocky): fix servicemonitor crapping out

Browse Source
This commit is contained in:
Kjeld Schouten-Lebbing
2022-11-15 12:04:22 +01:00
parent 7fc2bde812
commit 37fdc30959
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/enterprise/blocky/Chart.yaml
+1 -1
View File
@@ -26,7 +26,7 @@ sources:
- https://github.com/0xERR0R/blocky - https://github.com/0xERR0R/blocky
- https://github.com/Mozart409/blocky-frontend - https://github.com/Mozart409/blocky-frontend
- https://hub.docker.com/r/spx01/blocky - https://hub.docker.com/r/spx01/blocky
version: 4.0.0 version: 4.0.1
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- network - network
charts/enterprise/blocky/templates/prometheusrules.yaml → charts/enterprise/blocky/templates/_prometheusrules.tpl
+3
View File
@@ -1,4 +1,6 @@
{{- define "blocky.prometheusrule" -}}
{{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }} {{- if and .Values.metrics.enabled .Values.metrics.prometheusRule.enabled }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule kind: PrometheusRule
metadata: metadata:
@@ -16,3 +18,4 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end -}}
charts/enterprise/blocky/templates/servicemonitor.yaml → charts/enterprise/blocky/templates/_servicemonitor.tpl
+1
View File
@@ -1,5 +1,6 @@
{{- define "blocky.servicemonitor" -}} {{- define "blocky.servicemonitor" -}}
{{- if .Values.metrics.enabled }} {{- if .Values.metrics.enabled }}
---
apiVersion: monitoring.coreos.com/v1 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
charts/enterprise/blocky/templates/common.yaml
+1
View File
@@ -100,6 +100,7 @@ service:
{{- include "blocky.dohinjector" . }} {{- include "blocky.dohinjector" . }}
{{- include "blocky.servicemonitor" . -}} {{- include "blocky.servicemonitor" . -}}
{{- include "blocky.prometheusrule" . -}}
{{/* Render the templates */}} {{/* Render the templates */}}
{{ include "tc.common.loader.apply" . }} {{ include "tc.common.loader.apply" . }}