From 29cad8a3103f18d433470e0abfa52d5e8e2520d5 Mon Sep 17 00:00:00 2001
From: Daniel Simionato <weseven@users.noreply.github.com>
Date: Fri, 24 May 2024 08:59:24 +0200
Subject: [PATCH] Make ServiceMonitor optional (#245)

---
 CHANGELOG.md                                             | 4 ++++
 .../files/copy/service-monitor.yaml                      | 2 ++
 .../templates/service-monitor.yaml                       | 2 ++
 helm/cluster-api-provider-aws/values.schema.json         | 9 +++++++++
 helm/cluster-api-provider-aws/values.yaml                | 3 +++
 5 files changed, 20 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a18db960..1b1e84e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Make ServiceMonitor optional through `serviceMonitor.enabled` helm value (useful in mc-bootstrap).
+
 ## [2.18.0] - 2024-05-02
 
 ### Added
diff --git a/helm/cluster-api-provider-aws/files/copy/service-monitor.yaml b/helm/cluster-api-provider-aws/files/copy/service-monitor.yaml
index 1391f85a..92a069b4 100644
--- a/helm/cluster-api-provider-aws/files/copy/service-monitor.yaml
+++ b/helm/cluster-api-provider-aws/files/copy/service-monitor.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,3 +12,4 @@ spec:
   selector:
     matchLabels:
       cluster.x-k8s.io/provider: infrastructure-aws
+{{- end }}
diff --git a/helm/cluster-api-provider-aws/templates/service-monitor.yaml b/helm/cluster-api-provider-aws/templates/service-monitor.yaml
index 1391f85a..92a069b4 100644
--- a/helm/cluster-api-provider-aws/templates/service-monitor.yaml
+++ b/helm/cluster-api-provider-aws/templates/service-monitor.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -11,3 +12,4 @@ spec:
   selector:
     matchLabels:
       cluster.x-k8s.io/provider: infrastructure-aws
+{{- end }}
diff --git a/helm/cluster-api-provider-aws/values.schema.json b/helm/cluster-api-provider-aws/values.schema.json
index 596eda5d..d5783bbe 100644
--- a/helm/cluster-api-provider-aws/values.schema.json
+++ b/helm/cluster-api-provider-aws/values.schema.json
@@ -160,6 +160,15 @@
                 }
             }
         },
+        "serviceMonitor": {
+            "type": "object",
+            "properties": {
+                "enabled": {
+                    "type": "boolean"
+                }
+            },
+            "default": true
+        },
         "verticalPodAutoscaler": {
             "type": "object",
             "properties": {
diff --git a/helm/cluster-api-provider-aws/values.yaml b/helm/cluster-api-provider-aws/values.yaml
index da56e450..6b394207 100644
--- a/helm/cluster-api-provider-aws/values.yaml
+++ b/helm/cluster-api-provider-aws/values.yaml
@@ -63,6 +63,9 @@ provider:
     accessKeyID: defaultID
     secretAccessKey: defaultKey
 
+serviceMonitor:
+  enabled: true
+
 verticalPodAutoscaler:
   enabled: true