From 567a0e5d918a198e21c4324d3312d5d3a058718a Mon Sep 17 00:00:00 2001
From: Tiago Martins <tiago.martins@hotjar.com>
Date: Mon, 11 Nov 2024 13:19:02 +0000
Subject: [PATCH] fix(falcosidekick): Move Prometheus scrape annotation to
 default values

Signed-off-by: Tiago Martins <tiago.martins@hotjar.com>
---
 charts/falcosidekick/CHANGELOG.md           | 4 ++++
 charts/falcosidekick/Chart.yaml             | 2 +-
 charts/falcosidekick/README.md              | 2 +-
 charts/falcosidekick/templates/service.yaml | 1 -
 charts/falcosidekick/values.yaml            | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/falcosidekick/CHANGELOG.md b/charts/falcosidekick/CHANGELOG.md
index cbca5c02e..634a8b002 100644
--- a/charts/falcosidekick/CHANGELOG.md
+++ b/charts/falcosidekick/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 Before release 0.1.20, the helm chart can be found in `falcosidekick` [repository](https://github.com/falcosecurity/falcosidekick/tree/master/deploy/helm/falcosidekick).
 
+## 0.9.5
+
+- Move the `prometheus.io/scrape` annotation to the default values, to allow overrides.
+
 ## 0.9.4
 
 - Fix Prometheus metrics names in Prometheus Rule
diff --git a/charts/falcosidekick/Chart.yaml b/charts/falcosidekick/Chart.yaml
index cce7e3b1a..bb388551b 100644
--- a/charts/falcosidekick/Chart.yaml
+++ b/charts/falcosidekick/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 2.30.0
 description: Connect Falco to your ecosystem
 icon: https://raw.githubusercontent.com/falcosecurity/falcosidekick/master/imgs/falcosidekick_color.png
 name: falcosidekick
-version: 0.9.4
+version: 0.9.5
 keywords:
   - monitoring
   - security
diff --git a/charts/falcosidekick/README.md b/charts/falcosidekick/README.md
index bd89c639b..4832623e8 100644
--- a/charts/falcosidekick/README.md
+++ b/charts/falcosidekick/README.md
@@ -649,7 +649,7 @@ The following table lists the main configurable parameters of the Falcosidekick
 | replicaCount | int | `2` | number of running pods |
 | resources | object | `{}` | The resources for falcosdekick pods |
 | securityContext | object | `{}` | Sidekick container securityContext |
-| service.annotations | object | `{}` | Service annotations |
+| service.annotations | object | `{"prometheus.io/scrape":"true"}` | Service annotations |
 | service.port | int | `2801` | Service port |
 | service.type | string | `"ClusterIP"` | Service type |
 | serviceMonitor.additionalLabels | object | `{}` | specify Additional labels to be added on the Service Monitor. |
diff --git a/charts/falcosidekick/templates/service.yaml b/charts/falcosidekick/templates/service.yaml
index fdea8debe..01a447295 100644
--- a/charts/falcosidekick/templates/service.yaml
+++ b/charts/falcosidekick/templates/service.yaml
@@ -17,7 +17,6 @@ metadata:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-    prometheus.io/scrape: "true"
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/falcosidekick/values.yaml b/charts/falcosidekick/values.yaml
index efdd88b67..ae7e58850 100644
--- a/charts/falcosidekick/values.yaml
+++ b/charts/falcosidekick/values.yaml
@@ -1118,7 +1118,8 @@ service:
   # -- Service port
   port: 2801
   # -- Service annotations
-  annotations: {}
+  annotations:
+    prometheus.io/scrape: "true"
     # networking.gke.io/load-balancer-type: Internal
 
 ingress: