chore: add permissions on endpointslice to Prometheus Role and use serviceDiscoveryRole: EndpointSlice in ServiceMonitors

docs/draft/howto/consuming-metrics.md

@@ -252,6 +252,7 @@ spec:
   selector:
     matchLabels:
       apps.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice
 EOF
 ```
 
@@ -294,6 +295,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice
 EOF
 ```
 

helm/olmv1/templates/rbac/role-olmv1-system-metrics-monitor-role.yml

@@ -21,5 +21,13 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 {{- end -}}
 {{- end -}}

helm/olmv1/templates/servicemonitor-olmv1-system-metrics-monitor.yml

@@ -29,5 +29,6 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "olmv1.label.name" . }}
+  serviceDiscoveryRole: EndpointSlice
 {{- end -}}
 {{- end -}}

helm/prometheus/templates/servicemonitor-catalogd-controller-manager-metrics-monitor.yml

@@ -31,3 +31,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice

helm/prometheus/templates/servicemonitor-kubelet.yml

@@ -43,3 +43,4 @@ spec:
   selector:
     matchLabels:
       k8s-app: kubelet
+  serviceDiscoveryRole: EndpointSlice

helm/prometheus/templates/servicemonitor-operator-controller-controller-manager-metrics-monitor.yml

@@ -31,3 +31,4 @@ spec:
   selector:
     matchLabels:
       control-plane: operator-controller-controller-manager
+  serviceDiscoveryRole: EndpointSlice

openshift/catalogd/manifests-experimental.yaml

@@ -693,6 +693,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/openshift/rolebinding-openshift-config-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1084,3 +1092,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice

openshift/catalogd/manifests.yaml

@@ -693,6 +693,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/openshift/rolebinding-openshift-config-manager-rolebinding.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1083,3 +1091,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: catalogd
+  serviceDiscoveryRole: EndpointSlice

openshift/operator-controller/manifests-experimental.yaml

@@ -1021,6 +1021,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/rbac/role-olmv1-system-operator-controller-manager-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1366,3 +1374,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice

openshift/operator-controller/manifests.yaml

@@ -929,6 +929,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 ---
 # Source: olmv1/templates/rbac/role-olmv1-system-operator-controller-manager-role.yml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -1268,3 +1276,4 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: operator-controller
+  serviceDiscoveryRole: EndpointSlice