From 81b7b9ecbf9e9612f67ba211a50047b5c89ebdbd Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Wed, 4 Feb 2026 15:30:03 +0100 Subject: [PATCH] metrics: migrate Prometheus SD from Endpoints to EndpointSlices Signed-off-by: Jan Fajerski --- assets/base/controller_metrics_servicemonitor.yaml | 1 + assets/base/node_metrics_servicemonitor.yaml | 1 + assets/base/rbac/prometheus_role.yaml | 8 ++++++++ .../aws-ebs/generated/hypershift/prometheus_role.yaml | 8 ++++++++ .../aws-ebs/generated/standalone/prometheus_role.yaml | 8 ++++++++ .../aws-ebs/generated/standalone/servicemonitor.yaml | 1 + .../aws-efs/generated/standalone/prometheus_role.yaml | 8 ++++++++ .../aws-efs/generated/standalone/servicemonitor.yaml | 1 + .../generated/hypershift/node_servicemonitor.yaml | 1 + .../azure-disk/generated/hypershift/prometheus_role.yaml | 8 ++++++++ .../generated/standalone/node_servicemonitor.yaml | 1 + .../azure-disk/generated/standalone/prometheus_role.yaml | 8 ++++++++ .../azure-disk/generated/standalone/servicemonitor.yaml | 1 + .../azure-file/generated/hypershift/prometheus_role.yaml | 8 ++++++++ .../azure-file/generated/standalone/prometheus_role.yaml | 8 ++++++++ .../azure-file/generated/standalone/servicemonitor.yaml | 1 + .../generated/hypershift/prometheus_role.yaml | 8 ++++++++ .../generated/standalone/prometheus_role.yaml | 8 ++++++++ .../generated/standalone/servicemonitor.yaml | 1 + .../generated/hypershift/prometheus_role.yaml | 8 ++++++++ .../generated/standalone/prometheus_role.yaml | 8 ++++++++ .../generated/standalone/servicemonitor.yaml | 1 + .../samba/generated/standalone/prometheus_role.yaml | 8 ++++++++ .../samba/generated/standalone/servicemonitor.yaml | 1 + 24 files changed, 115 insertions(+) diff --git a/assets/base/controller_metrics_servicemonitor.yaml b/assets/base/controller_metrics_servicemonitor.yaml index 318b978ea..64f376dbb 100644 --- a/assets/base/controller_metrics_servicemonitor.yaml +++ b/assets/base/controller_metrics_servicemonitor.yaml @@ -4,6 +4,7 @@ metadata: name: ${ASSET_PREFIX}-controller-monitor namespace: ${NAMESPACE} spec: + serviceDiscoveryRole: EndpointSlice # Empty list to make json-patch work endpoints: [] jobLabel: component diff --git a/assets/base/node_metrics_servicemonitor.yaml b/assets/base/node_metrics_servicemonitor.yaml index f86965fde..dc7b43706 100644 --- a/assets/base/node_metrics_servicemonitor.yaml +++ b/assets/base/node_metrics_servicemonitor.yaml @@ -4,6 +4,7 @@ metadata: name: ${ASSET_PREFIX}-node-monitor namespace: ${NODE_NAMESPACE} spec: + serviceDiscoveryRole: EndpointSlice # Empty list to make json-patch work endpoints: [] jobLabel: component diff --git a/assets/base/rbac/prometheus_role.yaml b/assets/base/rbac/prometheus_role.yaml index 925ba7f9b..e3928a3a4 100644 --- a/assets/base/rbac/prometheus_role.yaml +++ b/assets/base/rbac/prometheus_role.yaml @@ -15,3 +15,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/aws-ebs/generated/hypershift/prometheus_role.yaml b/assets/overlays/aws-ebs/generated/hypershift/prometheus_role.yaml index 27605c961..a582c033a 100644 --- a/assets/overlays/aws-ebs/generated/hypershift/prometheus_role.yaml +++ b/assets/overlays/aws-ebs/generated/hypershift/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/aws-ebs/generated/standalone/prometheus_role.yaml b/assets/overlays/aws-ebs/generated/standalone/prometheus_role.yaml index 27605c961..a582c033a 100644 --- a/assets/overlays/aws-ebs/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/aws-ebs/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml b/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml index 263059b6c..7736322cd 100644 --- a/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/aws-ebs/generated/standalone/servicemonitor.yaml @@ -60,3 +60,4 @@ spec: selector: matchLabels: app: aws-ebs-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/aws-efs/generated/standalone/prometheus_role.yaml b/assets/overlays/aws-efs/generated/standalone/prometheus_role.yaml index 4c53f91fc..b880a903e 100644 --- a/assets/overlays/aws-efs/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/aws-efs/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml b/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml index e0bc1cbe0..a16f14683 100644 --- a/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/aws-efs/generated/standalone/servicemonitor.yaml @@ -24,3 +24,4 @@ spec: selector: matchLabels: app: aws-efs-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml b/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml index 1268095b8..e98621ea5 100644 --- a/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/hypershift/node_servicemonitor.yaml @@ -24,3 +24,4 @@ spec: selector: matchLabels: app: azure-disk-csi-driver-node-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/azure-disk/generated/hypershift/prometheus_role.yaml b/assets/overlays/azure-disk/generated/hypershift/prometheus_role.yaml index 0c2b5ef0d..7831c21d7 100644 --- a/assets/overlays/azure-disk/generated/hypershift/prometheus_role.yaml +++ b/assets/overlays/azure-disk/generated/hypershift/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml b/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml index 1268095b8..e98621ea5 100644 --- a/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/standalone/node_servicemonitor.yaml @@ -24,3 +24,4 @@ spec: selector: matchLabels: app: azure-disk-csi-driver-node-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/azure-disk/generated/standalone/prometheus_role.yaml b/assets/overlays/azure-disk/generated/standalone/prometheus_role.yaml index 0c2b5ef0d..7831c21d7 100644 --- a/assets/overlays/azure-disk/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/azure-disk/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml b/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml index ce15fecbb..1f8633d88 100644 --- a/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/azure-disk/generated/standalone/servicemonitor.yaml @@ -60,3 +60,4 @@ spec: selector: matchLabels: app: azure-disk-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/azure-file/generated/hypershift/prometheus_role.yaml b/assets/overlays/azure-file/generated/hypershift/prometheus_role.yaml index 5c3322a5f..85960a692 100644 --- a/assets/overlays/azure-file/generated/hypershift/prometheus_role.yaml +++ b/assets/overlays/azure-file/generated/hypershift/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/azure-file/generated/standalone/prometheus_role.yaml b/assets/overlays/azure-file/generated/standalone/prometheus_role.yaml index 5c3322a5f..85960a692 100644 --- a/assets/overlays/azure-file/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/azure-file/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml b/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml index d8aefc9c0..8e276fd26 100644 --- a/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/azure-file/generated/standalone/servicemonitor.yaml @@ -60,3 +60,4 @@ spec: selector: matchLabels: app: azure-file-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/openstack-cinder/generated/hypershift/prometheus_role.yaml b/assets/overlays/openstack-cinder/generated/hypershift/prometheus_role.yaml index fc60323d7..3d3665053 100644 --- a/assets/overlays/openstack-cinder/generated/hypershift/prometheus_role.yaml +++ b/assets/overlays/openstack-cinder/generated/hypershift/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/openstack-cinder/generated/standalone/prometheus_role.yaml b/assets/overlays/openstack-cinder/generated/standalone/prometheus_role.yaml index fc60323d7..3d3665053 100644 --- a/assets/overlays/openstack-cinder/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/openstack-cinder/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml b/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml index 2c35f3ede..da007f57c 100644 --- a/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/openstack-cinder/generated/standalone/servicemonitor.yaml @@ -60,3 +60,4 @@ spec: selector: matchLabels: app: openstack-cinder-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/openstack-manila/generated/hypershift/prometheus_role.yaml b/assets/overlays/openstack-manila/generated/hypershift/prometheus_role.yaml index 5a996effe..0d20f93f0 100644 --- a/assets/overlays/openstack-manila/generated/hypershift/prometheus_role.yaml +++ b/assets/overlays/openstack-manila/generated/hypershift/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/openstack-manila/generated/standalone/prometheus_role.yaml b/assets/overlays/openstack-manila/generated/standalone/prometheus_role.yaml index 5a996effe..0d20f93f0 100644 --- a/assets/overlays/openstack-manila/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml b/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml index badb73623..8eceee5b8 100644 --- a/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/servicemonitor.yaml @@ -42,3 +42,4 @@ spec: selector: matchLabels: app: manila-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice diff --git a/assets/overlays/samba/generated/standalone/prometheus_role.yaml b/assets/overlays/samba/generated/standalone/prometheus_role.yaml index 6894b819d..04b8113e9 100644 --- a/assets/overlays/samba/generated/standalone/prometheus_role.yaml +++ b/assets/overlays/samba/generated/standalone/prometheus_role.yaml @@ -21,3 +21,11 @@ rules: - get - list - watch +- apiGroups: + - discovery.k8s.io + resources: + - endpointslices + verbs: + - get + - list + - watch diff --git a/assets/overlays/samba/generated/standalone/servicemonitor.yaml b/assets/overlays/samba/generated/standalone/servicemonitor.yaml index 6204b77a9..deb0ab1d1 100644 --- a/assets/overlays/samba/generated/standalone/servicemonitor.yaml +++ b/assets/overlays/samba/generated/standalone/servicemonitor.yaml @@ -42,3 +42,4 @@ spec: selector: matchLabels: app: smb-csi-driver-controller-metrics + serviceDiscoveryRole: EndpointSlice