From e0761780125f8bfa41965914ab8cbffba87af8b6 Mon Sep 17 00:00:00 2001 From: pznamensky Date: Thu, 28 Nov 2024 11:25:03 +0000 Subject: [PATCH 1/2] helm: configurable Service annotations --- helm/robusta/templates/runner.yaml | 4 ++++ helm/robusta/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/helm/robusta/templates/runner.yaml b/helm/robusta/templates/runner.yaml index 09882c603..797335d62 100644 --- a/helm/robusta/templates/runner.yaml +++ b/helm/robusta/templates/runner.yaml @@ -218,6 +218,10 @@ metadata: labels: app: {{ include "robusta.fullname" . }}-runner target: {{ include "robusta.fullname" . }}-runner +{{- if .Values.service.annotations }} + annotations: +{{ toYaml .Values.service.annotations | indent 4 }} +{{- end }} spec: selector: app: {{ include "robusta.fullname" . }}-runner diff --git a/helm/robusta/values.yaml b/helm/robusta/values.yaml index d8a01880e..c638c3be5 100644 --- a/helm/robusta/values.yaml +++ b/helm/robusta/values.yaml @@ -35,6 +35,11 @@ globalConfig: custom_annotations: [] custom_severity_map: {} +# k8s service config +service: + # service annotations + annotations: {} + # see https://docs.robusta.dev/master/user-guide/configuration/additional-settings.html#relabel-prometheus-alerts alertRelabel: [] From 8ea02ba81e9157d831c81e50d96aca044dc468f7 Mon Sep 17 00:00:00 2001 From: pznamensky Date: Mon, 2 Dec 2024 10:55:18 +0000 Subject: [PATCH 2/2] CR fixes --- helm/robusta/templates/runner.yaml | 4 ++-- helm/robusta/values.yaml | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/helm/robusta/templates/runner.yaml b/helm/robusta/templates/runner.yaml index 797335d62..ec5ceb1b3 100644 --- a/helm/robusta/templates/runner.yaml +++ b/helm/robusta/templates/runner.yaml @@ -218,9 +218,9 @@ metadata: labels: app: {{ include "robusta.fullname" . }}-runner target: {{ include "robusta.fullname" . }}-runner -{{- if .Values.service.annotations }} +{{- if .Values.runner.service.annotations }} annotations: -{{ toYaml .Values.service.annotations | indent 4 }} +{{ toYaml .Values.runner.service.annotations | indent 4 }} {{- end }} spec: selector: diff --git a/helm/robusta/values.yaml b/helm/robusta/values.yaml index c638c3be5..8a28c6bca 100644 --- a/helm/robusta/values.yaml +++ b/helm/robusta/values.yaml @@ -35,11 +35,6 @@ globalConfig: custom_annotations: [] custom_severity_map: {} -# k8s service config -service: - # service annotations - annotations: {} - # see https://docs.robusta.dev/master/user-guide/configuration/additional-settings.html#relabel-prometheus-alerts alertRelabel: [] @@ -685,6 +680,10 @@ runner: imagePullSecrets: [] extraVolumes: [] extraVolumeMounts: [] + # k8s service config + service: + # custom service annotations + annotations: {} serviceMonitor: path: /metrics securityContext: