Skip to content

TRT-2569: Revert "OTA-1546: Add a metric and an alert for conditional risk conditions"#1339

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
neisw:revert-1318-cluster_version_risk_condition
Mar 8, 2026
Merged

TRT-2569: Revert "OTA-1546: Add a metric and an alert for conditional risk conditions"#1339
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
neisw:revert-1318-cluster_version_risk_condition

Conversation

@neisw
Copy link
Contributor

@neisw neisw commented Mar 8, 2026

Reverts #1318

Hypershift failures in 4.22.0-0.ci-2026-03-07-115610

There are only 2 PRs in the payload and analysis indicates CVO bootstrap init container hangs during TestCreateCluster, preventing control plane initialization opening to test against

Summary by CodeRabbit

  • Chores
    • Removed the OpenShiftUpdateRiskMightApply alert rule from cluster version monitoring.
    • Discontinued collection of cluster version risk condition metrics.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Mar 8, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 8, 2026

@neisw: This pull request references OTA-1546 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Reverts #1318

Hypershift failures in 4.22.0-0.ci-2026-03-07-115610

There are only 2 PRs in the payload and analysis indicates CVO bootstrap init container hangs during TestCreateCluster, preventing control plane initialization opening to test against

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.

@coderabbitai
Copy link

coderabbitai bot commented Mar 8, 2026

Walkthrough

This change removes the cluster version update risk condition monitoring functionality. The clusterVersionRiskConditions metric, the collectConditionalUpdateRisks function that collected these metrics, the corresponding PrometheusRule alert (OpenShiftUpdateRiskMightApply), and all associated tests have been deleted from the codebase.

Changes

Cohort / File(s) Summary
Cluster Version Risk Metrics Removal
install/0000_90_cluster-version-operator_02_prometheusrule-TechPreviewNoUpgrade.yaml, pkg/cvo/metrics.go, pkg/cvo/metrics_test.go
Removed the entire cluster version update risk monitoring system: deleted the clusterVersionRiskConditions GaugeVec metric and collectConditionalUpdateRisks function from metrics collection, removed the OpenShiftUpdateRiskMightApply PrometheusRule alert and its rule group, and removed the corresponding test case and feature gate initialization.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Test Structure And Quality ❓ Inconclusive PR reverts code removing a standard Go unit test. Repository uses testing.T framework, not Ginkgo BDD. Custom check criteria for Ginkgo patterns (Describe, It, BeforeEach) are not applicable to this codebase. Clarify if check applies to standard Go tests or if Ginkgo-specific checks are inappropriate for this repository and PR type.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed PR reverts changes to metrics_test.go which uses standard Go testing conventions rather than Ginkgo patterns, making this check not applicable.
Title check ✅ Passed The title clearly and specifically describes the main change: reverting a previous commit that added metrics and alerts for conditional risk conditions.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Tip

Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs).
Share your feedback on Discord.


Comment @coderabbitai help to get the list of available commands and usage tips.

@neisw
Copy link
Contributor Author

neisw commented Mar 8, 2026

/payload-job periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

@neisw: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b397bce0-1b22-11f1-9462-864b567d07e5-0

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 8, 2026

@neisw: This pull request references OTA-1546 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Reverts #1318

Hypershift failures in 4.22.0-0.ci-2026-03-07-115610

There are only 2 PRs in the payload and analysis indicates CVO bootstrap init container hangs during TestCreateCluster, preventing control plane initialization opening to test against

Summary by CodeRabbit

  • Chores
  • Removed the OpenShiftUpdateRiskMightApply alert rule from cluster version monitoring.
  • Discontinued collection of cluster version risk condition metrics.

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.

@stbenjam
Copy link
Member

stbenjam commented Mar 8, 2026

/payload-job periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aks

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

@stbenjam: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/545e59a0-1b27-11f1-8e90-6af251ef255f-0

@stbenjam
Copy link
Member

stbenjam commented Mar 8, 2026

/retitle TRT-2569: Revert "OTA-1546: Add a metric and an alert for conditional risk conditions"

@openshift-ci openshift-ci bot changed the title Revert "OTA-1546: Add a metric and an alert for conditional risk conditions" TRT-2569: Revert "OTA-1546: Add a metric and an alert for conditional risk conditions" Mar 8, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 8, 2026

@neisw: This pull request references TRT-2569 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Reverts #1318

Hypershift failures in 4.22.0-0.ci-2026-03-07-115610

There are only 2 PRs in the payload and analysis indicates CVO bootstrap init container hangs during TestCreateCluster, preventing control plane initialization opening to test against

Summary by CodeRabbit

  • Chores
  • Removed the OpenShiftUpdateRiskMightApply alert rule from cluster version monitoring.
  • Discontinued collection of cluster version risk condition metrics.

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.

@stbenjam
Copy link
Member

stbenjam commented Mar 8, 2026

/lgtm
/label approved
/verified by ci
/hold

Pending results of the payload job(s)

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 8, 2026
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 8, 2026
@openshift-ci-robot
Copy link
Contributor

@stbenjam: This PR has been marked as verified by ci.

Details

In response to this:

/lgtm
/label approved
/verified by ci
/hold

Pending results of the payload job(s)

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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: neisw, stbenjam
Once this PR has been reviewed and has the lgtm label, please assign fao89 for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@openshift-ci openshift-ci bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2026
@neisw
Copy link
Contributor Author

neisw commented Mar 8, 2026

periodic-ci-openshift-hypershift-release-4.22-periodics-e2e-aws-ovn is passing.

Hypershift conformance failure is a flake

@neisw
Copy link
Contributor Author

neisw commented Mar 8, 2026

@stbenjam
Copy link
Member

stbenjam commented Mar 8, 2026

/label approved

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2026
@neisw
Copy link
Contributor Author

neisw commented Mar 8, 2026

/hold cancel
/override ci/prow/e2e-hypershift-conformance

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 8, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

@neisw: Overrode contexts on behalf of neisw: ci/prow/e2e-hypershift-conformance

Details

In response to this:

/hold cancel
/override ci/prow/e2e-hypershift-conformance

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.

@neisw
Copy link
Contributor Author

neisw commented Mar 8, 2026

/override ci/prow/e2e-agnostic-ovn-techpreview-serial

Job history indicates it permafails

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

@neisw: Overrode contexts on behalf of neisw: ci/prow/e2e-agnostic-ovn-techpreview-serial

Details

In response to this:

/override ci/prow/e2e-agnostic-ovn-techpreview-serial

Job history indicates it permafails

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-merge-bot openshift-merge-bot bot merged commit c4fb92f into openshift:main Mar 8, 2026
18 checks passed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2026

@neisw: 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants