From 48c65fe19f6fd60ad2ce84f9044f6af8900e2ed5 Mon Sep 17 00:00:00 2001 From: WrenIX Date: Wed, 16 Oct 2024 19:10:01 +0200 Subject: [PATCH] fix(home-assistant): add podmonitor (with given bearerTokenSecret) --- home-assistant/Chart.yaml | 2 +- home-assistant/README.adoc | 17 ++++++++++++++++- home-assistant/templates/deployment.yaml | 4 ++-- home-assistant/templates/podmonitor.yaml | 21 +++++++++++++++++++++ home-assistant/templates/service.yaml | 2 +- home-assistant/values.yaml | 6 ++++++ 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 home-assistant/templates/podmonitor.yaml diff --git a/home-assistant/Chart.yaml b/home-assistant/Chart.yaml index 67bf9d8..3d76f34 100644 --- a/home-assistant/Chart.yaml +++ b/home-assistant/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: home-assistant description: Home Assistant with tooling to run on an k3s pi type: application -version: 0.1.31 +version: 0.2.0 # renovate: image=ghcr.io/home-assistant/home-assistant appVersion: "2024.10.2" maintainers: diff --git a/home-assistant/README.adoc b/home-assistant/README.adoc index 5d9348a..f549738 100644 --- a/home-assistant/README.adoc +++ b/home-assistant/README.adoc @@ -2,7 +2,7 @@ = home-assistant -image::https://img.shields.io/badge/Version-0.1.31-informational?style=flat-square[Version: 0.1.31] +image::https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square[Version: 0.2.0] image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application] image::https://img.shields.io/badge/AppVersion-2024.10.2-informational?style=flat-square[AppVersion: 2024.10.2] == Maintainers @@ -282,6 +282,21 @@ helm uninstall home-assistant-release | `{}` | +| prometheus.podmonitor.bearerTokenSecret +| object +| `{}` +| + +| prometheus.podmonitor.enabled +| bool +| `false` +| + +| prometheus.podmonitor.labels +| object +| `{}` +| + | readinessProbe.httpGet.path | string | `"/"` diff --git a/home-assistant/templates/deployment.yaml b/home-assistant/templates/deployment.yaml index d7a8c3d..7424548 100644 --- a/home-assistant/templates/deployment.yaml +++ b/home-assistant/templates/deployment.yaml @@ -11,7 +11,7 @@ spec: selector: matchLabels: {{- include "home-assistant.selectorLabels" . | nindent 6 }} - type: main + app.kubernetes.io/component: home-assistant template: metadata: {{- with .Values.podAnnotations }} @@ -20,7 +20,7 @@ spec: {{- end }} labels: {{- include "home-assistant.labels" . | nindent 8 }} - type: main + app.kubernetes.io/component: home-assistant {{- with .Values.podLabels }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/home-assistant/templates/podmonitor.yaml b/home-assistant/templates/podmonitor.yaml new file mode 100644 index 0000000..1ef9aa6 --- /dev/null +++ b/home-assistant/templates/podmonitor.yaml @@ -0,0 +1,21 @@ +{{- if .Values.prometheus.podmonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: PodMonitor +metadata: + name: {{ include "home-assistant.fullname" . }} + labels: + {{- include "home-assistant.labels" . | nindent 4 }} + {{- with .Values.prometheus.podmonitor.labels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + selector: + matchLabels: + {{- include "home-assistant.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: home-assistant + podMetricsEndpoints: + - port: http + path: "/api/prometheus" + bearerTokenSecret: + {{- toYaml .Values.prometheus.podmonitor.bearerTokenSecret | nindent 8 }} +{{- end }} diff --git a/home-assistant/templates/service.yaml b/home-assistant/templates/service.yaml index 116e90a..c7e68dd 100644 --- a/home-assistant/templates/service.yaml +++ b/home-assistant/templates/service.yaml @@ -8,7 +8,7 @@ spec: type: {{ .Values.service.type }} selector: {{- include "home-assistant.selectorLabels" . | nindent 4 }} - type: main + app.kubernetes.io/component: home-assistant ports: - port: {{ .Values.service.port }} targetPort: http diff --git a/home-assistant/values.yaml b/home-assistant/values.yaml index 50cd339..dcd5839 100644 --- a/home-assistant/values.yaml +++ b/home-assistant/values.yaml @@ -61,6 +61,12 @@ zigbee2mqtt: serial: port: /dev/ttyACM0 +prometheus: + podmonitor: + enabled: false + labels: {} + bearerTokenSecret: {} + persistence: enabled: false annotations: {}