From 0a16bfa9258eda0fe6f84b32407505d26dcf814f Mon Sep 17 00:00:00 2001
From: "Leo.Stanoev" <lyubomir.stanoev@natwestmarkets.com>
Date: Thu, 26 Mar 2026 16:54:35 +0000
Subject: [PATCH 1/2] feat(monitoring): Add service and serviceMonitor

---
 .../cert-manager-sync/templates/service.yaml  | 18 +++++++++++++
 .../templates/serviceMonitor.yaml             | 25 +++++++++++++++++++
 deploy/cert-manager-sync/values.schema.json   | 17 +++++++++++++
 deploy/cert-manager-sync/values.yaml          |  5 ++++
 4 files changed, 65 insertions(+)
 create mode 100644 deploy/cert-manager-sync/templates/service.yaml
 create mode 100644 deploy/cert-manager-sync/templates/serviceMonitor.yaml

diff --git a/deploy/cert-manager-sync/templates/service.yaml b/deploy/cert-manager-sync/templates/service.yaml
new file mode 100644
index 0000000..4e3f512
--- /dev/null
+++ b/deploy/cert-manager-sync/templates/service.yaml
@@ -0,0 +1,18 @@
+{{- if and .Values.metrics .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "cert-manager-sync.fullname" . }}-metrics
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cert-manager-sync.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  selector:
+    {{- include "cert-manager-sync.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: metrics
+      port: {{ .Values.metrics.port | default 9090 }}
+      targetPort: metrics
+      protocol: TCP
+{{- end }}
diff --git a/deploy/cert-manager-sync/templates/serviceMonitor.yaml b/deploy/cert-manager-sync/templates/serviceMonitor.yaml
new file mode 100644
index 0000000..856f879
--- /dev/null
+++ b/deploy/cert-manager-sync/templates/serviceMonitor.yaml
@@ -0,0 +1,25 @@
+{{- if and .Values.metrics .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "cert-manager-sync.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "cert-manager-sync.labels" . | nindent 4 }}
+    {{- with .Values.metrics.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "cert-manager-sync.selectorLabels" . | nindent 6 }}
+  endpoints:
+    - port: metrics
+      path: /metrics
+      {{- with .Values.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.metrics.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+{{- end }}
diff --git a/deploy/cert-manager-sync/values.schema.json b/deploy/cert-manager-sync/values.schema.json
index e6d2b2f..124aa23 100644
--- a/deploy/cert-manager-sync/values.schema.json
+++ b/deploy/cert-manager-sync/values.schema.json
@@ -87,6 +87,23 @@
                 },
                 "port": {
                     "type": "integer"
+                },
+                "serviceMonitor": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        },
+                        "interval": {
+                            "type": "string"
+                        },
+                        "scrapeTimeout": {
+                            "type": "string"
+                        },
+                        "additionalLabels": {
+                            "type": "object"
+                        }
+                    }
                 }
             }
         },
diff --git a/deploy/cert-manager-sync/values.yaml b/deploy/cert-manager-sync/values.yaml
index 84e1463..4fb03e8 100644
--- a/deploy/cert-manager-sync/values.yaml
+++ b/deploy/cert-manager-sync/values.yaml
@@ -26,6 +26,11 @@ config:
 metrics:
   enabled: false
   port: 9090
+  serviceMonitor:
+    enabled: false
+    interval: 30s
+    scrapeTimeout: 10s
+    additionalLabels: {}
 
 serviceAccount:
   # Specifies whether a service account should be created

From 9e24cfd71a24d3beb17ff86aaf6b6cff3fc372d7 Mon Sep 17 00:00:00 2001
From: "Leo.Stanoev" <lyubomir.stanoev@natwestmarkets.com>
Date: Thu, 26 Mar 2026 17:13:22 +0000
Subject: [PATCH 2/2] feat(monitoring): Add service and serviceMonitor

---
 deploy/cert-manager-sync/templates/service.yaml        | 2 +-
 deploy/cert-manager-sync/templates/serviceMonitor.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/cert-manager-sync/templates/service.yaml b/deploy/cert-manager-sync/templates/service.yaml
index 4e3f512..f7768a9 100644
--- a/deploy/cert-manager-sync/templates/service.yaml
+++ b/deploy/cert-manager-sync/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.metrics .Values.metrics.enabled }}
+{{- if .Values.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/deploy/cert-manager-sync/templates/serviceMonitor.yaml b/deploy/cert-manager-sync/templates/serviceMonitor.yaml
index 856f879..348c09d 100644
--- a/deploy/cert-manager-sync/templates/serviceMonitor.yaml
+++ b/deploy/cert-manager-sync/templates/serviceMonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.metrics .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata: