OCPBUGS-62160: Remove AlertManager endpoints when disabled #2684

danielmellado · 2025-09-26T08:15:55Z

This commit adds a specific validation to remove AlertManager endpoints
if it's disabled

I added CHANGELOG entry for this change.
No user facing changes, so no entry in CHANGELOG was needed.

openshift-ci-robot · 2025-09-26T08:16:03Z

@danielmellado: This pull request references Jira Issue OCPBUGS-62160, which is invalid:

expected the bug to target the "4.21.0" version, but no target version was set

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.

In response to this:

This commit adds a specific validation to remove AlertManager endpoints
if it's disabled

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

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.

danielmellado · 2025-09-26T08:29:19Z

/jira refresh

openshift-ci-robot · 2025-09-26T08:29:28Z

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

3 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)

Requesting review from QA contact:
/cc @juzhao

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.

danielmellado · 2025-09-26T08:30:08Z

/jira refresh

openshift-ci-robot · 2025-09-26T08:30:13Z

@danielmellado: This pull request references Jira Issue OCPBUGS-62160, which is valid.

3 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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @juzhao

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.

danielmellado · 2025-09-30T09:30:59Z

/retest-required

danielmellado · 2025-09-30T13:34:04Z

/retest-required

danielmellado · 2025-09-30T15:49:48Z

/retest-required

danielmellado · 2025-10-01T05:06:40Z

/retest-required

pkg/manifests/manifests.go

simonpasquier · 2025-10-01T12:56:48Z

Can we extend TestAlertmanagerDisabling() which already covers disabling the platform Alertmanager?

danielmellado · 2025-10-07T08:11:36Z

Can we extend TestAlertmanagerDisabling() which already covers disabling the platform Alertmanager?

added a new assertion and for now removed the tests I originally add, but was wondering whether they'd still be useful as unit tests or not, wdyt?

simonpasquier · 2025-10-07T09:51:49Z

Can we extend TestAlertmanagerDisabling() which already covers disabling the platform Alertmanager?

added a new assertion and for now removed the tests I originally add, but was wondering whether they'd still be useful as unit tests or not, wdyt?

I find that for configuration testing, end-to-end is usually the more robust option because it will ensure that all components are properly deployed and interact together as expected.

pkg/manifests/manifests.go

test/e2e/framework/assertions.go

This commit adds a specific validation to remove AlertManager endpoints if it's disabled Signed-off-by: Daniel Mellado <[email protected]>

danielmellado · 2025-10-08T05:13:43Z

/retest-required

openshift-ci · 2025-10-08T08:18:23Z

@danielmellado: 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-aws-ovn-single-node	`1430b3f`	link	false	`/test e2e-aws-ovn-single-node`
ci/prow/okd-scos-e2e-aws-ovn	`1430b3f`	link	false	`/test okd-scos-e2e-aws-ovn`

Full PR test history. Your PR dashboard.

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.

juzhao · 2025-10-09T06:58:30Z

/verified by @juzhao

openshift-ci-robot · 2025-10-09T06:58:42Z

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

In response to this:

/verified by @juzhao

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.

simonpasquier

/lgtm

in user-workload e2e tests we check the prometheus_notifications_alertmanagers_discovered metric. It might be good to consolidate on 1 method but it can be a follow-up.

openshift-ci · 2025-10-09T09:18:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielmellado, simonpasquier

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [danielmellado,simonpasquier]

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

openshift-ci-robot · 2025-10-09T12:23:57Z

/retest-required

Remaining retests: 0 against base HEAD ff3420c and 2 for PR HEAD 1430b3f in total

openshift-ci-robot · 2025-10-09T15:23:47Z

@danielmellado: Jira Issue Verification Checks: Jira Issue OCPBUGS-62160
✔️ 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-62160 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

This commit adds a specific validation to remove AlertManager endpoints
if it's disabled

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

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-merge-robot · 2025-10-12T17:47:34Z

Fix included in accepted release 4.21.0-0.nightly-2025-10-12-115019

danielmellado · 2025-10-13T09:54:09Z

/jira backport release-4.20 releaase-4.19 release-4.18

openshift-ci-robot · 2025-10-13T09:54:13Z

@danielmellado: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.20 releaase-4.19 release-4.18

In response to this:

/jira backport release-4.20 releaase-4.19 release-4.18

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-cherrypick-robot · 2025-10-13T09:54:56Z

@openshift-ci-robot: new pull request created: #2710

In response to this:

@danielmellado: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.20 releaase-4.19 release-4.18

In response to this:

/jira backport release-4.20 releaase-4.19 release-4.18

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.

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.

danielmellado · 2025-10-13T09:56:10Z

/jira backport release-4.19
/jira backport release-4.18

openshift-ci-robot · 2025-10-13T09:56:12Z

@danielmellado: Missing required branches for backport chain:

release-4.20 OR openshift-4.20,

In response to this:

/jira backport release-4.19
/jira backport release-4.18

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.

danielmellado · 2025-10-16T12:49:41Z

/jira backport release-4.19

openshift-ci-robot · 2025-10-16T12:49:45Z

@danielmellado: Missing required branches for backport chain:

release-4.20 OR openshift-4.20,

In response to this:

/jira backport release-4.19

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 bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 26, 2025

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 Sep 26, 2025

openshift-ci bot requested review from marioferh and slashpai September 26, 2025 08:17

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

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 Sep 26, 2025

openshift-ci bot requested a review from juzhao September 26, 2025 08:29

danielmellado changed the title ~~WIP: OCPBUGS-62160: Remove AlertManager endpoints when disabled~~ OCPBUGS-62160: Remove AlertManager endpoints when disabled Sep 30, 2025

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 30, 2025

simonpasquier reviewed Oct 1, 2025

View reviewed changes

pkg/manifests/manifests.go Outdated Show resolved Hide resolved

danielmellado force-pushed the ocpbugs-62160 branch from 20b1079 to 7a7447e Compare October 7, 2025 08:10

simonpasquier reviewed Oct 7, 2025

View reviewed changes

pkg/manifests/manifests.go Outdated Show resolved Hide resolved

simonpasquier reviewed Oct 7, 2025

View reviewed changes

test/e2e/framework/assertions.go Outdated Show resolved Hide resolved

WIP: OCPBUGS-62160: Remove AlertManager endpoints when disabled

1430b3f

This commit adds a specific validation to remove AlertManager endpoints if it's disabled Signed-off-by: Daniel Mellado <[email protected]>

danielmellado force-pushed the ocpbugs-62160 branch from 7a7447e to 1430b3f Compare October 7, 2025 11:22

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 9, 2025

simonpasquier reviewed Oct 9, 2025

View reviewed changes

openshift-ci bot assigned simonpasquier Oct 9, 2025

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

openshift-merge-bot bot merged commit 41f90a2 into openshift:main Oct 9, 2025
20 of 22 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 13, 2025

[release-4.20] OCPBUGS-62979: Remove AlertManager endpoints when disabled #2710

Merged

OCPBUGS-62160: Remove AlertManager endpoints when disabled #2684

OCPBUGS-62160: Remove AlertManager endpoints when disabled #2684

Uh oh!

Conversation

danielmellado commented Sep 26, 2025

Uh oh!

openshift-ci-robot commented Sep 26, 2025

Uh oh!

danielmellado commented Sep 26, 2025

Uh oh!

openshift-ci-robot commented Sep 26, 2025

Uh oh!

danielmellado commented Sep 26, 2025

Uh oh!

openshift-ci-robot commented Sep 26, 2025

Uh oh!

danielmellado commented Sep 30, 2025

Uh oh!

danielmellado commented Sep 30, 2025

Uh oh!

danielmellado commented Sep 30, 2025

Uh oh!

danielmellado commented Oct 1, 2025

Uh oh!

Uh oh!

simonpasquier commented Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danielmellado commented Oct 7, 2025

Uh oh!

simonpasquier commented Oct 7, 2025

Uh oh!

Uh oh!

Uh oh!

danielmellado commented Oct 8, 2025

Uh oh!

openshift-ci bot commented Oct 8, 2025

Uh oh!

juzhao commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

openshift-merge-robot commented Oct 12, 2025

Uh oh!

danielmellado commented Oct 13, 2025

Uh oh!

openshift-ci-robot commented Oct 13, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 13, 2025

Uh oh!

danielmellado commented Oct 13, 2025

Uh oh!

openshift-ci-robot commented Oct 13, 2025

Uh oh!

danielmellado commented Oct 16, 2025

Uh oh!

openshift-ci-robot commented Oct 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

simonpasquier commented Oct 1, 2025 •

edited

Loading