[release-4.21] OCPBUGS-74542: Stale operator metrics Service and ServiceMonitor resources need to be deleted #5600

openshift-cherrypick-robot · 2026-01-27T19:40:50Z

This is an automated cherry-pick of #5593

/assign djoshy

openshift-ci-robot · 2026-01-27T19:41:01Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-74368 has been cloned as Jira Issue OCPBUGS-74542. Will retitle bug to link to clone.
/retitle [release-4.21] OCPBUGS-74542: Stale operator metrics Service and ServiceMonitor resources need to be deleted

Details

In response to this:

This is an automated cherry-pick of #5593

/assign djoshy

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.

openshift-ci-robot · 2026-01-27T19:41:21Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-74542, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #5593

/assign djoshy

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.

djoshy · 2026-01-27T19:54:26Z

/lgtm

/label backport-risk-assessed

openshift-ci · 2026-01-27T19:56:53Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, openshift-cherrypick-robot

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~~ [djoshy]

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

ptalgulk01 · 2026-01-28T08:37:10Z

Pre-merge verified:

Verification Steps
Environment Setup
OpenShift Version: 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest
Platform: AWS

Installed the cluster on this fix.
Able to see no openshift-machine-config-operator in service and servicemonitor in openshift-machine-config project

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest   True        False         7m3s    Cluster version is 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest 

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   36m
machine-config-daemon       36m

$ oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.73.189    <none>        9637/TCP              35m
machine-config-controller   ClusterIP   172.30.104.66    <none>        9001/TCP              35m
machine-config-daemon       ClusterIP   172.30.200.12    <none>        9001/TCP,8798/TCP     35m
machine-config-server       ClusterIP   172.30.223.251   <none>        22623/TCP,22624/TCP   35m

Installed 4.20 cluster, check the below service and service monitor in openshift-machine-config-operator name

$ oc get clusterversion
NAME      VERSION                              AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.20.0-0.nightly-2026-01-26-202217   True        False         108m    Cluster version is 4.20.0-0.nightly-2026-01-26-202217

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   64m
machine-config-daemon       64m
machine-config-operator     64m

$ oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.221.51    <none>        9637/TCP              64m
machine-config-controller   ClusterIP   172.30.127.138   <none>        9001/TCP              64m
machine-config-daemon       ClusterIP   172.30.123.226   <none>        9001/TCP,8798/TCP     64m
machine-config-operator     ClusterIP   172.30.216.211   <none>        9001/TCP              64m
machine-config-server       ClusterIP   172.30.95.11     <none>        22623/TCP,22624/TCP   64m

Upgrade the cluster to this fix

$ oc adm upgrade --to-image=registry.build11.ci.openshift.org/ci-ln-pntq662/release:latest --allow-explicit-upgrade  --force

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest   True        False         10m     Cluster version is 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   140m
machine-config-daemon       140m

$  oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.221.51    <none>        9637/TCP              140m
machine-config-controller   ClusterIP   172.30.127.138   <none>        9001/TCP              140m
machine-config-daemon       ClusterIP   172.30.123.226   <none>        9001/TCP,8798/TCP     140m
machine-config-server       ClusterIP   172.30.95.11     <none>        22623/TCP,22624/TCP   140m

No machine-config-operator metrics present.

/label qe-approved
/verified by @ptalgulk01

openshift-ci-robot · 2026-01-28T08:37:24Z

@ptalgulk01: This PR has been marked as verified by @ptalgulk01.

Details

In response to this:

Pre-merge verified:

Verification Steps
Environment Setup
OpenShift Version: 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest
Platform: AWS

Installed the cluster on this fix.
Able to see no openshift-machine-config-operator in service and servicemonitor in openshift-machine-config project

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest   True        False         7m3s    Cluster version is 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest 

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   36m
machine-config-daemon       36m

$ oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.73.189    <none>        9637/TCP              35m
machine-config-controller   ClusterIP   172.30.104.66    <none>        9001/TCP              35m
machine-config-daemon       ClusterIP   172.30.200.12    <none>        9001/TCP,8798/TCP     35m
machine-config-server       ClusterIP   172.30.223.251   <none>        22623/TCP,22624/TCP   35m

Installed 4.20 cluster, check the below service and service monitor in openshift-machine-config-operator name

$ oc get clusterversion
NAME      VERSION                              AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.20.0-0.nightly-2026-01-26-202217   True        False         108m    Cluster version is 4.20.0-0.nightly-2026-01-26-202217

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   64m
machine-config-daemon       64m
machine-config-operator     64m

$ oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.221.51    <none>        9637/TCP              64m
machine-config-controller   ClusterIP   172.30.127.138   <none>        9001/TCP              64m
machine-config-daemon       ClusterIP   172.30.123.226   <none>        9001/TCP,8798/TCP     64m
machine-config-operator     ClusterIP   172.30.216.211   <none>        9001/TCP              64m
machine-config-server       ClusterIP   172.30.95.11     <none>        22623/TCP,22624/TCP   64m

Upgrade the cluster to this fix

$ oc adm upgrade --to-image=registry.build11.ci.openshift.org/ci-ln-pntq662/release:latest --allow-explicit-upgrade  --force

$ oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest   True        False         10m     Cluster version is 4.21.0-0-2026-01-28-040807-test-ci-ln-pntq662-latest

$ oc get servicemonitor
NAME                        AGE
machine-config-controller   140m
machine-config-daemon       140m

$  oc get service
NAME                        TYPE        CLUSTER-IP       EXTERNAL-IP   PORT(S)               AGE
kube-rbac-proxy-crio        ClusterIP   172.30.221.51    <none>        9637/TCP              140m
machine-config-controller   ClusterIP   172.30.127.138   <none>        9001/TCP              140m
machine-config-daemon       ClusterIP   172.30.123.226   <none>        9001/TCP,8798/TCP     140m
machine-config-server       ClusterIP   172.30.95.11     <none>        22623/TCP,22624/TCP   140m

No machine-config-operator metrics present.

/label qe-approved
/verified by @ptalgulk01

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.

djoshy · 2026-01-28T15:52:09Z

/retest

djoshy · 2026-01-29T10:05:41Z

/jira refresh

/retest-required

openshift-ci-robot · 2026-01-29T10:05:46Z

@djoshy: This pull request references Jira Issue OCPBUGS-74542, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

/retest-required

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.

djoshy · 2026-01-29T10:08:37Z

/jira refresh

openshift-ci-robot · 2026-01-29T10:08:46Z

@djoshy: This pull request references Jira Issue OCPBUGS-74542, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.21.0) matches configured target version for branch (4.21.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-74368 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
dependent Jira Issue OCPBUGS-74368 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

/jira refresh

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.

openshift-ci-robot · 2026-01-29T13:33:14Z

/retest-required

Remaining retests: 0 against base HEAD 4fb71e2 and 2 for PR HEAD 338c855 in total

djoshy · 2026-01-29T14:11:22Z

gcp-op failures seem to be related to an installer issue being fixed by openshift/installer#10269 and is currently mitigated by openshift/release#74093. Let's give it one more run before overriding.

djoshy · 2026-01-29T18:04:51Z

failures look infra related and this PR has passed them on this commit before

/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-upgrade

openshift-ci · 2026-01-29T18:05:07Z

@djoshy: Overrode contexts on behalf of djoshy: ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-upgrade

Details

In response to this:

failures look infra related and this PR has passed on this commit before

/override ci/prow/e2e-aws-ovn
/override ci/prow/e2e-aws-ovn-upgrade

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.

djoshy · 2026-01-29T18:09:21Z

/override ci/prow/e2e-aws-ovn-upgrade

openshift-ci · 2026-01-29T18:09:40Z

@djoshy: Overrode contexts on behalf of djoshy: ci/prow/e2e-aws-ovn-upgrade

Details

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade

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 · 2026-01-29T18:09:42Z

@openshift-cherrypick-robot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-gcp-op-ocl	`338c855`	link	false	`/test e2e-gcp-op-ocl`
ci/prow/e2e-aws-ovn	`338c855`	link	unknown	`/test e2e-aws-ovn`
ci/prow/e2e-aws-ovn-upgrade	`338c855`	link	unknown	`/test e2e-aws-ovn-upgrade`

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.

openshift-ci-robot · 2026-01-29T18:11:19Z

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-74542
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-74542 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #5593

/assign djoshy

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.

install: delete stale operator metrics resources

338c855

openshift-cherrypick-robot mentioned this pull request Jan 27, 2026

OCPBUGS-74368: Stale operator metrics Service and ServiceMonitor resources need to be deleted #5593

Merged

openshift-cherrypick-robot assigned djoshy Jan 27, 2026

openshift-ci bot changed the title ~~[release-4.21] OCPBUGS-74368: Stale operator metrics Service and ServiceMonitor resources need to be deleted~~ [release-4.21] OCPBUGS-74542: Stale operator metrics Service and ServiceMonitor resources need to be deleted Jan 27, 2026

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 27, 2026

openshift-ci bot requested review from RishabhSaini and pablintino January 27, 2026 19:41

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jan 27, 2026

openshift-ci bot assigned anuragthehatter, imatza-rh, lyman9966, mhanss, ptalgulk01, rbbratta, rioliu-rh, sergiordlr and zhaozhanqi Jan 27, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2026

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 27, 2026

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jan 28, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 28, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 29, 2026

openshift-ci bot requested a review from sergiordlr January 29, 2026 10:08

openshift-merge-bot bot merged commit a3c57fb into openshift:release-4.21 Jan 29, 2026
15 of 16 checks passed

[release-4.21] OCPBUGS-74542: Stale operator metrics Service and ServiceMonitor resources need to be deleted #5600

[release-4.21] OCPBUGS-74542: Stale operator metrics Service and ServiceMonitor resources need to be deleted #5600

Conversation

openshift-cherrypick-robot commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

openshift-ci-robot commented Jan 27, 2026

Uh oh!

djoshy commented Jan 27, 2026

Uh oh!

openshift-ci bot commented Jan 27, 2026

Uh oh!

ptalgulk01 commented Jan 28, 2026

Uh oh!

openshift-ci-robot commented Jan 28, 2026

Uh oh!

djoshy commented Jan 28, 2026

Uh oh!

djoshy commented Jan 29, 2026

Uh oh!

openshift-ci-robot commented Jan 29, 2026

Uh oh!

djoshy commented Jan 29, 2026

Uh oh!

openshift-ci-robot commented Jan 29, 2026

Uh oh!

openshift-ci-robot commented Jan 29, 2026

Uh oh!

djoshy commented Jan 29, 2026

Uh oh!

djoshy commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jan 29, 2026

Uh oh!

djoshy commented Jan 29, 2026

Uh oh!

openshift-ci bot commented Jan 29, 2026

Uh oh!

openshift-ci bot commented Jan 29, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

djoshy commented Jan 29, 2026 •

edited

Loading