Skip to content

OCPBUGS-54790: Fix packageserver PDB annotation for HyperShift#1297

Open
dhgautam99 wants to merge 1 commit into
openshift:mainfrom
dhgautam99:fix-packageserver-pdb-annotation
Open

OCPBUGS-54790: Fix packageserver PDB annotation for HyperShift#1297
dhgautam99 wants to merge 1 commit into
openshift:mainfrom
dhgautam99:fix-packageserver-pdb-annotation

Conversation

@dhgautam99
Copy link
Copy Markdown

@dhgautam99 dhgautam99 commented May 11, 2026

What this PR does / why we need it:

The packageserver PDB (packageserver-pdb) in the data plane namespace
openshift-operator-lifecycle-manager has no matching pods because the
packageserver pods are deployed on the control plane in HyperShift.

This PR remove the include.release.openshift.io/hypershift: "true"
and include.release.openshift.io/ibm-cloud-managed: "true"
so the PDB is no longer deployed to HyperShift data planes where it
serves no purpose.

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/OCPBUGS-54790

Special notes for your reviewer:

Single annotation change in manifests/0000_50_olm_00-packageserver.pdb.yaml.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Summary by CodeRabbit

  • Chores
    • Removed platform-specific annotations that indicated Hypershift and IBM Cloud managed inclusion.
    • Preserved high-availability and operator capability annotations so runtime behavior is unchanged.
    • Generation/build step now automatically applies these annotation adjustments to manifests for consistent deployments.

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels May 11, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dhgautam99: This pull request references Jira Issue OCPBUGS-54790, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (5.0.0) matches configured target version for branch (5.0.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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

Details

In response to this:

What this PR does / why we need it:

The packageserver PDB (packageserver-pdb) in the data plane namespace
openshift-operator-lifecycle-manager has no matching pods because the
packageserver pods are deployed on the control plane in HyperShift.

This PR replaces the include.release.openshift.io/hypershift: "true"
annotation with exclude.release.openshift.io/ibm-cloud-managed: "true"
so the PDB is no longer deployed to HyperShift data planes where it
serves no purpose.

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/OCPBUGS-54790

Special notes for your reviewer:

Single annotation change in manifests/0000_50_olm_00-packageserver.pdb.yaml.

Checklist:

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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
Copy Markdown

coderabbitai Bot commented May 11, 2026

Walkthrough

Remove two OpenShift release include annotations (include.release.openshift.io/ibm-cloud-managed and include.release.openshift.io/hypershift) from the packageserver PodDisruptionBudget manifest and mirror the same change in the microshift manifest; update the generation script to delete those annotations from the produced manifest.

Changes

Packageserver PDB annotation update

Layer / File(s) Summary
Resource manifest
manifests/0000_50_olm_00-packageserver.pdb.yaml
Deleted metadata.annotations["include.release.openshift.io/ibm-cloud-managed"] and metadata.annotations["include.release.openshift.io/hypershift"]; remaining annotations include include.release.openshift.io/self-managed-high-availability and capability.openshift.io/name. spec unchanged.
Microshift manifest
microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml
Applied the same removal of include.release.openshift.io/ibm-cloud-managed and include.release.openshift.io/hypershift; remaining annotations unchanged.
Generation/post-process script
scripts/generate_crds_manifests.sh
Post-process step now removes the include.release.openshift.io/ibm-cloud-managed and include.release.openshift.io/hypershift annotations from the generated 0000_50_olm_00-packageserver.pdb.yaml.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Title check ✅ Passed The title directly and accurately describes the main change: fixing the packageserver PDB annotation for HyperShift by removing inappropriate release annotations.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 PR contains no Ginkgo test files or test name changes. Only Kubernetes manifests and a shell script are modified.
Test Structure And Quality ✅ Passed This PR modifies only Kubernetes manifest YAML files and a shell script for generation. No Ginkgo test files are included, making the test code review check not applicable.
Microshift Test Compatibility ✅ Passed This PR adds no Ginkgo e2e tests. Changes are limited to YAML Kubernetes manifests and a shell script for manifest generation. Check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains no Ginkgo e2e tests. Changes are limited to Kubernetes manifest annotations and a bash script. SNO test compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Change removes release annotations from PDB with maxUnavailable=1. No topology-breaking constraints: no affinity, no nodeSelectors, no topology assumptions. Safe for all topologies.
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML manifest and shell script files, not Go code. OTE Binary Stdout Contract check is not applicable to non-Go files.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR contains no new Ginkgo e2e tests. Changes are manifest annotation updates and shell script modifications only. The custom check is not applicable.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

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

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

  • Generate code and open pull requests
  • Plan features and break down work
  • Investigate incidents and troubleshoot customer tickets together
  • Automate recurring tasks and respond to alerts with triggers
  • Summarize progress and report instantly

Built for teams:

  • Shared memory across your entire org—no repeating context
  • Per-thread sandboxes to safely plan and execute work
  • Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot requested review from anik120 and perdasilva May 11, 2026 10:58
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 11, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@manifests/0000_50_olm_00-packageserver.pdb.yaml`:
- Around line 7-10: The manifest contains contradictory release gating
annotations for the same target: include.release.openshift.io/ibm-cloud-managed
and exclude.release.openshift.io/ibm-cloud-managed; remove one so only the
intended gate remains (if the intent is to exclude IBM-managed, delete the
include.release.openshift.io/ibm-cloud-managed annotation; if the intent is to
include IBM-managed, delete the exclude.release.openshift.io/ibm-cloud-managed
annotation) and keep capability.openshift.io/name and other unrelated
annotations unchanged.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 876af640-4948-497c-a0fa-9741e6e49dc6

📥 Commits

Reviewing files that changed from the base of the PR and between 12c6652 and 4fd931a.

📒 Files selected for processing (1)
  • manifests/0000_50_olm_00-packageserver.pdb.yaml

Comment thread manifests/0000_50_olm_00-packageserver.pdb.yaml Outdated
@dhgautam99 dhgautam99 force-pushed the fix-packageserver-pdb-annotation branch from 4fd931a to 276091d Compare May 11, 2026 11:03
@enxebre
Copy link
Copy Markdown
Member

enxebre commented May 11, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2026
@dhgautam99 dhgautam99 force-pushed the fix-packageserver-pdb-annotation branch from 276091d to 6f1d1fe Compare May 11, 2026 12:14
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label May 11, 2026
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
include.release.openshift.io/hypershift: "true"
exclude.release.openshift.io/ibm-cloud-managed: "true"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussed on slack, we just need to drop it so it won't be added openshift/enhancements#200 (comment)

Replace include.release.openshift.io/hypershift annotation with
exclude.release.openshift.io/ibm-cloud-managed on the packageserver
PDB so it is no longer deployed to HyperShift data planes where
packageserver pods do not run.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dhgautam99 dhgautam99 force-pushed the fix-packageserver-pdb-annotation branch from 6f1d1fe to 96bf609 Compare May 11, 2026 13:28
@enxebre
Copy link
Copy Markdown
Member

enxebre commented May 11, 2026

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 11, 2026

@dhgautam99: 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

jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants