Skip to content

NO-ISSUE: Remove feature-set restriction from deletion manifest - #6517

Open
chizhang21 wants to merge 1 commit into
openshift:mainfrom
chizhang21:enhance-manifests-remove
Open

NO-ISSUE: Remove feature-set restriction from deletion manifest#6517
chizhang21 wants to merge 1 commit into
openshift:mainfrom
chizhang21:enhance-manifests-remove

Conversation

@chizhang21

@chizhang21 chizhang21 commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

- What I did

Removed the release.openshift.io/feature-set: Default annotation from the three stale-object deletion entries.

- How to verify it

  • Create a cluster running 4.20 or earlier and verify the operator Service/ServiceMonitor machine-config-operator objects exist.
  • Upgrade the cluster to a release built from this PR (4.21 or later), then confirm the stale objects are deleted and the TargetDown alert clears.

- Description for the changelog

Make the stale-resource deletion manifests apply to every feature set, so upgraded OKD and other non-Default feature-set clusters stop keeping the obsolete machine-config-operator Service/ServiceMonitor, which caused a perpetual TargetDown alert.

Related: okd-project/okd#2303, #5593

Summary by CodeRabbit

  • Configuration
    • Removed the Default feature-set annotation from selected machine configuration cleanup, service, and monitoring resources.

The CVO only applies manifests whose release.openshift.io/feature-set
matches the cluster's active feature set.

These deletions were scoped to Default, so they never ran on clusters
running a non-Default feature set such as OKD. Stale
Service/ServiceMonitor machine-config-operator objects from older
clusters were left behind after upgrades, alerting TargetDown forever.

Remove the annotation so the deletions apply to all feature sets.

Signed-off-by: cz21 <cz21ok@gmail.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 9, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@chizhang21: This pull request explicitly references no jira issue.

Details

In response to this:

- What I did

Removed the release.openshift.io/feature-set: Default annotation from the three stale-object deletion entries.

- How to verify it

  • Create a cluster running 4.20 or earlier and verify the operator
    Service/ServiceMonitor machine-config-operator objects exist.
  • Upgrade the cluster to a release built from this PR (4.21 or later),
    then confirm the stale objects are deleted and the TargetDown alert
    clears.

- Description for the changelog

Make the stale-resource deletion manifests apply to every feature set so
upgraded OKD and other non-Default feature-set clusters stop keeping the
obsolete machine-config-operator Service/ServiceMonitor, which caused a
perpetual TargetDown alert.

Related: okd-project/okd#2303, #5593

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

coderabbitai Bot commented Sep 9, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Advanced

Run ID: 287c5fee-014b-4e9b-b954-3ba621b0e220

📥 Commits

Reviewing files that changed from the base of the PR and between d992d64 and b2d8446.

📒 Files selected for processing (1)
  • install/0000_90_machine-config_90_deletion.yaml
💤 Files with no reviewable changes (1)
  • install/0000_90_machine-config_90_deletion.yaml

Included review availability: Your plan provides up to 2 included reviews per hour; 1 remains after this review.


Walkthrough

The deletion manifest removes the release.openshift.io/feature-set: Default annotation from three machine-config resources.

Changes

Machine-config deletion manifest

Layer / File(s) Summary
Deletion manifest annotation updates
install/0000_90_machine-config_90_deletion.yaml
Removes the Default feature-set annotation from the cleanup CronJob, the machine-config-operator Service, and the ServiceMonitor.

Priority: ➖ Normal

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to b2d84

The change broadens stale-resource cleanup to all feature sets, with no identified merge-blocking risk.

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The pull request changes only one YAML manifest. The exact diff removes three release.openshift.io/feature-set: Default annotations and adds no It(), Describe(), Context(), or When() test ti…
Test Structure And Quality ✅ Passed PASS: The pull request changes only install/0000_90_machine-config_90_deletion.yaml, removing three YAML annotations. The diff contains no Ginkgo test code, test blocks, cluster operations, waits, o…
Microshift Test Compatibility ✅ Passed The pull request changes only install/0000_90_machine-config_90_deletion.yaml and removes three annotations. The revision diff contains no new Ginkgo tests or test files, so the MicroShift test comp…
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The pull request changes only one YAML deletion manifest. It removes three annotations and adds no Ginkgo e2e tests or other test files. Therefore, the SNO multi-node test compatibility check is…
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The commit changes only install/0000_90_machine-config_90_deletion.yaml and deletes three release.openshift.io/feature-set: Default annotations. The affected objects are a CronJob, Service, …
Ote Binary Stdout Contract ✅ Passed PASS. The pull request changes only three YAML annotations in install/0000_90_machine-config_90_deletion.yaml. It adds no OTE binary, Go code, test-suite setup, logging, or stdout write. Therefore, …
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS: The pull request changes only install/0000_90_machine-config_90_deletion.yaml and removes three release.openshift.io/feature-set: Default annotation lines. The diff adds no Ginkgo e2e tests,…
No-Weak-Crypto ✅ Passed The pull request changes only install/0000_90_machine-config_90_deletion.yaml. The exact diff removes three release.openshift.io/feature-set: Default annotations. It adds no cryptographic algorith…
Container-Privileges ✅ Passed PASS: The pull request changes only three release.openshift.io/feature-set: Default annotation lines in a deletion manifest. The diff adds no privileged, hostPID, hostNetwork, hostIPC, `SYS_…
No-Sensitive-Data-In-Logs ✅ Passed The pull request only deletes three release.openshift.io/feature-set: Default annotations from a deletion manifest. The diff adds no logging statements, log content, credentials, identifiers, hostna…
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: removing the feature-set restriction from the deletion manifest.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 9, 2026
@openshift-ci

openshift-ci Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Hi @chizhang21. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@openshift-ci

openshift-ci Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: chizhang21
Once this PR has been reviewed and has the lgtm label, please assign isabella-janssen 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

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

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants