MON-4437: Migrate windows-exporter ServiceMonitor to EndpointSlice #3583

slashpai · 2025-11-24T09:01:04Z

related-to openshift/cluster-network-operator#2839

Related Epic: https://issues.redhat.com/browse/MON-4216

openshift-ci-robot · 2025-11-24T09:01:09Z

@slashpai: This pull request references MON-4432 which is a valid jira issue.

Details

In response to this:

related-to openshift/cluster-network-operator#2839

Related Epic: https://issues.redhat.com/browse/MON-4216

cc: @simonpasquier

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

jrvaldes

@slashpai thanks for working on this, PTAL at the comments

controllers/metric_controller.go

openshift-ci-robot · 2025-11-25T03:37:48Z

@slashpai: This pull request references MON-4437 which is a valid jira issue.

Details

In response to this:

related-to openshift/cluster-network-operator#2839

Related Epic: https://issues.redhat.com/browse/MON-4216

cc: @simonpasquier

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

slashpai · 2025-11-25T05:51:33Z

/test azure-e2e-operator

slashpai · 2025-11-25T08:34:36Z

e2e test failure looks legit I might also need to update e2e test

slashpai · 2025-11-26T12:07:19Z

/test aws-e2e-operator
/test vsphere-disconnected-e2e-operator

slashpai · 2025-11-27T08:34:53Z

looking into this

=== RUN   TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal/AWS_metadata_endpoint
    delete_test.go:199: 
        	Error Trace:	/go/src/github.com/openshift/windows-machine-config-operator/test/e2e/delete_test.go:199
        	            				/go/src/github.com/openshift/windows-machine-config-operator/test/e2e/delete_test.go:102
        	Error:      	Received unexpected error:
        	            	context deadline exceeded
        	Test:       	TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal/AWS_metadata_endpoint
        	Messages:   	metadata endpoint route was not restored within timeout
2025/11/26 14:42:13 waiting (timeout: 5m0s) for 0 Windows Machines to reach phase ""
2025/11/26 14:42:18 5.067970045s time is required for 0 Machines without the ignore label to reach phase deleted
2025/11/26 14:42:18 waiting (timeout: 5m0s) for 0 Windows Machines to reach phase ""
2025/11/26 14:42:23 waiting for -1/0 Windows Machines
2025/11/26 14:42:28 waiting for -1/0 Windows Machines
2025/11/26 14:42:33 waiting for -1/0 Windows Machines
2025/11/26 14:42:38 waiting for -1/0 Windows Machines
2025/11/26 14:42:43 waiting for -1/0 Windows Machines
2025/11/26 14:42:48 waiting for -1/0 Windows Machines
2025/11/26 14:42:53 waiting for -1/0 Windows Machines
2025/11/26 14:42:58 waiting for -1/0 Windows Machines
2025/11/26 14:43:03 waiting for -1/0 Windows Machines
2025/11/26 14:43:08 waiting for -1/0 Windows Machines
2025/11/26 14:43:13 waiting for -1/0 Windows Machines
2025/11/26 14:43:18 1m0.067311082s time is required for 0 Machines with the ignore label to reach phase deleted
=== RUN   TestWMCO/destroy/Deletion/Prometheus_configuration
2025/11/26 14:43:18 test failed, attempting to gather Node logs
--- FAIL: TestWMCO (771.28s)
    --- FAIL: TestWMCO/destroy (770.57s)
        --- PASS: TestWMCO/destroy/Mirror_settings_cleared_from_nodes (0.19s)
        --- FAIL: TestWMCO/destroy/Deletion (770.24s)
            --- FAIL: TestWMCO/destroy/Deletion/BYOH_node_removal (598.70s)
                --- FAIL: TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal (253.32s)

test/e2e/metrics_test.go

jrvaldes · 2025-12-01T15:16:33Z

looking into this

=== RUN   TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal/AWS_metadata_endpoint
    delete_test.go:199: 
        	Error Trace:	/go/src/github.com/openshift/windows-machine-config-operator/test/e2e/delete_test.go:199
        	            				/go/src/github.com/openshift/windows-machine-config-operator/test/e2e/delete_test.go:102
        	Error:      	Received unexpected error:
        	            	context deadline exceeded
        	Test:       	TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal/AWS_metadata_endpoint
        	Messages:   	metadata endpoint route was not restored within timeout
2025/11/26 14:42:13 waiting (timeout: 5m0s) for 0 Windows Machines to reach phase ""
2025/11/26 14:42:18 5.067970045s time is required for 0 Machines without the ignore label to reach phase deleted
2025/11/26 14:42:18 waiting (timeout: 5m0s) for 0 Windows Machines to reach phase ""
2025/11/26 14:42:23 waiting for -1/0 Windows Machines
2025/11/26 14:42:28 waiting for -1/0 Windows Machines
2025/11/26 14:42:33 waiting for -1/0 Windows Machines
2025/11/26 14:42:38 waiting for -1/0 Windows Machines
2025/11/26 14:42:43 waiting for -1/0 Windows Machines
2025/11/26 14:42:48 waiting for -1/0 Windows Machines
2025/11/26 14:42:53 waiting for -1/0 Windows Machines
2025/11/26 14:42:58 waiting for -1/0 Windows Machines
2025/11/26 14:43:03 waiting for -1/0 Windows Machines
2025/11/26 14:43:08 waiting for -1/0 Windows Machines
2025/11/26 14:43:13 waiting for -1/0 Windows Machines
2025/11/26 14:43:18 1m0.067311082s time is required for 0 Machines with the ignore label to reach phase deleted
=== RUN   TestWMCO/destroy/Deletion/Prometheus_configuration
2025/11/26 14:43:18 test failed, attempting to gather Node logs
--- FAIL: TestWMCO (771.28s)
    --- FAIL: TestWMCO/destroy (770.57s)
        --- PASS: TestWMCO/destroy/Mirror_settings_cleared_from_nodes (0.19s)
        --- FAIL: TestWMCO/destroy/Deletion (770.24s)
            --- FAIL: TestWMCO/destroy/Deletion/BYOH_node_removal (598.70s)
                --- FAIL: TestWMCO/destroy/Deletion/BYOH_node_removal/ip-10-0-105-91.us-west-2.compute.internal (253.32s)

@slashpai there is an ongoing issue with AWS job in CI, ignore this failure.

https://issues.redhat.com/browse/OCPBUGS-66070

slashpai · 2025-12-08T05:40:35Z

@simonpasquier I have addressed comments, please take a look

slashpai · 2025-12-08T09:03:40Z

/retest-required

simonpasquier

/lgtm

go.mod

jrvaldes · 2025-12-08T14:53:44Z

/test vsphere-proxy-e2e-operator

slashpai · 2025-12-08T16:07:01Z

/test nutanix-e2e-operator

slashpai · 2025-12-09T04:57:24Z

/test nutanix-e2e-operator

mansikulkarni96 · 2025-12-10T16:18:09Z

@slashpai please rebase

Update ServiceMonitor configuration to use EndpointSlice discovery instead of Endpoints API for improved scalability. Also bumps prometheus-operator lib to v0.86.2 in which the new field serviceDiscoveryRole is introduced to serviceMonitor spec. - Set serviceDiscoveryRole to EndpointSlice - Update relabel metadata label for EndpointSlice - Add endpointslices RBAC permissions Signed-off-by: Jayapriya Pai <janantha@redhat.com> Assisted-By: Cursor AI

Assisted-By: Cursor AI Signed-off-by: Jayapriya Pai <janantha@redhat.com>

simonpasquier · 2025-12-15T13:55:34Z

/lgtm

slashpai · 2025-12-15T15:47:17Z

/test nutanix-e2e-operator
/test vsphere-proxy-e2e-operator

slashpai · 2025-12-15T19:13:41Z

/retest-required

slashpai · 2025-12-16T04:58:14Z

/retest-required

slashpai · 2025-12-16T08:26:58Z

/retest-required

slashpai · 2025-12-16T10:00:33Z

@mansikulkarni96 Please review again

slashpai · 2025-12-16T13:53:09Z

I am not sure of nutanix test failure it looks to be issue with cluster creation itself and not related to change.

slashpai · 2025-12-16T14:38:53Z

/test nutanix-e2e-operator

sebsoto · 2025-12-16T14:54:36Z

/override ci/prow/nutanix-e2e-operator

openshift-ci · 2025-12-16T14:54:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sebsoto, slashpai

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [sebsoto]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2025-12-16T14:55:02Z

@sebsoto: Overrode contexts on behalf of sebsoto: ci/prow/nutanix-e2e-operator

Details

In response to this:

/override ci/prow/nutanix-e2e-operator

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci · 2025-12-16T14:58:59Z

@slashpai: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

mansikulkarni96 · 2025-12-16T16:21:37Z

/lgtm
Thanks for working on this @slashpai

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 24, 2025

openshift-ci bot requested review from jrvaldes and sebsoto November 24, 2025 09:04

jrvaldes reviewed Nov 24, 2025

View reviewed changes

controllers/metric_controller.go Outdated Show resolved Hide resolved

controllers/metric_controller.go Show resolved Hide resolved

slashpai changed the title ~~MON-4432: Migrate windows-exporter ServiceMonitor to EndpointSlice~~ MON-4437: Migrate windows-exporter ServiceMonitor to EndpointSlice Nov 25, 2025

slashpai force-pushed the endpointslice branch from 4b98550 to acea385 Compare November 25, 2025 03:44

slashpai force-pushed the endpointslice branch from 111feea to a66ff46 Compare November 27, 2025 14:21

simonpasquier reviewed Nov 27, 2025

View reviewed changes

test/e2e/metrics_test.go Outdated Show resolved Hide resolved

test/e2e/metrics_test.go Outdated Show resolved Hide resolved

slashpai force-pushed the endpointslice branch from a66ff46 to 7fc1e07 Compare December 8, 2025 05:40

simonpasquier reviewed Dec 8, 2025

View reviewed changes

openshift-ci bot assigned simonpasquier Dec 8, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 8, 2025

jrvaldes reviewed Dec 8, 2025

View reviewed changes

go.mod Show resolved Hide resolved

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 9, 2025

slashpai added 2 commits December 15, 2025 12:01

tests: update e2e test for endpointslice compatibility

88be9f8

Assisted-By: Cursor AI Signed-off-by: Jayapriya Pai <janantha@redhat.com>

slashpai force-pushed the endpointslice branch from 7fc1e07 to 88be9f8 Compare December 15, 2025 06:32

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2025

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2025

sebsoto approved these changes Dec 16, 2025

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2025

openshift-merge-bot bot merged commit 8b8cad7 into openshift:master Dec 16, 2025
21 checks passed

slashpai mentioned this pull request Dec 16, 2025

MON-4432: Add EndpointSlice support to DaemonSet ServiceMonitors openshift/cluster-network-operator#2839

Open

MON-4437: Migrate windows-exporter ServiceMonitor to EndpointSlice #3583

MON-4437: Migrate windows-exporter ServiceMonitor to EndpointSlice #3583

Uh oh!

Conversation

slashpai commented Nov 24, 2025

Uh oh!

openshift-ci-robot commented Nov 24, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jrvaldes left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 25, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

slashpai commented Nov 25, 2025

Uh oh!

slashpai commented Nov 25, 2025

Uh oh!

slashpai commented Nov 26, 2025

Uh oh!

slashpai commented Nov 27, 2025

Uh oh!

Uh oh!

Uh oh!

jrvaldes commented Dec 1, 2025

Uh oh!

slashpai commented Dec 8, 2025

Uh oh!

slashpai commented Dec 8, 2025

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jrvaldes commented Dec 8, 2025

Uh oh!

slashpai commented Dec 8, 2025

Uh oh!

slashpai commented Dec 9, 2025

Uh oh!

mansikulkarni96 commented Dec 10, 2025

Uh oh!

simonpasquier commented Dec 15, 2025

Uh oh!

slashpai commented Dec 15, 2025

Uh oh!

slashpai commented Dec 15, 2025

Uh oh!

slashpai commented Dec 16, 2025

Uh oh!

slashpai commented Dec 16, 2025

Uh oh!

slashpai commented Dec 16, 2025

Uh oh!

slashpai commented Dec 16, 2025

Uh oh!

slashpai commented Dec 16, 2025

Uh oh!

sebsoto commented Dec 16, 2025

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

Uh oh!

openshift-ci bot commented Dec 16, 2025

Uh oh!

mansikulkarni96 commented Dec 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

openshift-ci-robot commented Nov 24, 2025 •

edited by openshift-ci bot

Loading

jrvaldes left a comment •

edited

Loading

openshift-ci-robot commented Nov 25, 2025 •

edited by openshift-ci bot

Loading