From 875f142c5b69817d3528d220549475d69044c424 Mon Sep 17 00:00:00 2001
From: machine424 <ayoubmrini424@gmail.com>
Date: Mon, 9 Feb 2026 11:26:43 +0100
Subject: [PATCH] chore: add permissions on endpointslice to Prometheus Role
 and use serviceDiscoveryRole: EndpointSlice in ServiceMonitors

---
 .../0000_50_olm_06-psm-operator.servicemonitor.yaml    |  1 +
 manifests/0000_90_olm_00-service-monitor.yaml          | 10 ++++++++++
 .../0000_50_olm_06-psm-operator.servicemonitor.yaml    |  1 +
 .../0000_90_olm_00-service-monitor.yaml                | 10 ++++++++++
 .../templates/0000_90_olm_00-service-monitor.yaml      | 10 ++++++++++
 5 files changed, 32 insertions(+)

diff --git a/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml b/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
index 87d6e18507..168c9c92af 100644
--- a/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
+++ b/manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
@@ -20,3 +20,4 @@ spec:
     matchNames:
       - openshift-operator-lifecycle-manager
   selector: {}
+  serviceDiscoveryRole: EndpointSlice
diff --git a/manifests/0000_90_olm_00-service-monitor.yaml b/manifests/0000_90_olm_00-service-monitor.yaml
index 6fe1646be4..975e3a603b 100644
--- a/manifests/0000_90_olm_00-service-monitor.yaml
+++ b/manifests/0000_90_olm_00-service-monitor.yaml
@@ -52,6 +52,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -105,6 +113,7 @@ spec:
   selector:
     matchLabels:
       app: olm-operator
+  serviceDiscoveryRole: EndpointSlice
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -139,3 +148,4 @@ spec:
   selector:
     matchLabels:
       app: catalog-operator
+  serviceDiscoveryRole: EndpointSlice
diff --git a/microshift-manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml b/microshift-manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
index 87d6e18507..168c9c92af 100644
--- a/microshift-manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
+++ b/microshift-manifests/0000_50_olm_06-psm-operator.servicemonitor.yaml
@@ -20,3 +20,4 @@ spec:
     matchNames:
       - openshift-operator-lifecycle-manager
   selector: {}
+  serviceDiscoveryRole: EndpointSlice
diff --git a/microshift-manifests/0000_90_olm_00-service-monitor.yaml b/microshift-manifests/0000_90_olm_00-service-monitor.yaml
index 6fe1646be4..975e3a603b 100644
--- a/microshift-manifests/0000_90_olm_00-service-monitor.yaml
+++ b/microshift-manifests/0000_90_olm_00-service-monitor.yaml
@@ -52,6 +52,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -105,6 +113,7 @@ spec:
   selector:
     matchLabels:
       app: olm-operator
+  serviceDiscoveryRole: EndpointSlice
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -139,3 +148,4 @@ spec:
   selector:
     matchLabels:
       app: catalog-operator
+  serviceDiscoveryRole: EndpointSlice
diff --git a/staging/operator-lifecycle-manager/deploy/chart/templates/0000_90_olm_00-service-monitor.yaml b/staging/operator-lifecycle-manager/deploy/chart/templates/0000_90_olm_00-service-monitor.yaml
index 0d988e165f..555058b9f5 100644
--- a/staging/operator-lifecycle-manager/deploy/chart/templates/0000_90_olm_00-service-monitor.yaml
+++ b/staging/operator-lifecycle-manager/deploy/chart/templates/0000_90_olm_00-service-monitor.yaml
@@ -27,6 +27,7 @@ spec:
   selector:
     matchLabels:
       app: olm-operator
+  serviceDiscoveryRole: EndpointSlice
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -56,6 +57,7 @@ spec:
   selector:
     matchLabels:
       app: catalog-operator
+  serviceDiscoveryRole: EndpointSlice
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -87,6 +89,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole