[release-4.22] OCPBUGS-120746: Move packageserver PDB from guest cluster to management cluster by dhgautam99 · Pull Request #9548 · openshift/hypershift

dhgautam99 · 2026-09-09T06:03:33Z

Summary

This PR supersedes #9520 (opened by openshift-cherrypick-robot), the cherry-pick of #8459 (OCPBUGS-54790) to release-4.22.

The original cherry-pick failed the Unit Tests job (TestControlPlaneComponents). The failure was not a source-code bug — the test fixtures cherry-picked from main are stale on the release-4.22 base. The only differences were the CPOv2 hypershift.openshift.io/desired-state-hash annotations:

cluster-version-operator deployment fixtures (5): hash value changed, because the PR omits the packageserver PDB from the CVO payload.
packageserver PDB fixtures (5): gain the desired-state-hash annotation now that the PDB is a CPOv2-managed resource on release-4.22.

This PR contains the two original commits plus one commit regenerating those 10 fixtures (UPDATE=true go test ./...). The full hostedcontrolplane package test tree now passes locally.

Commits

fix(CPO): move packageserver PDB from guest cluster to management cluster (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)
test(CPO): update test fixtures for packageserver PDB changes (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)
test(CPO): regenerate packageserver PDB and CVO fixtures for release-4.22

Supersedes: #9520
Original cherry-pick source: #8459

…ster The packageserver PDB was being created in the guest cluster's openshift-operator-lifecycle-manager namespace by CVO, but packageserver pods run on the management cluster in the clusters-<hosted-cluster> namespace. This moves the PDB to the correct location. - Add packageserver PDB manifest to manifestsToOmit to prevent CVO from creating it in guest clusters - Add packageserver-pdb to resourcesToRemove for all platforms to clean up the orphaned PDB on existing clusters during upgrade - Register PDB manifest adapter in packageserver component to create the PDB in the management cluster namespace

Regenerate CVO deployment and packageserver component test fixtures to reflect the packageserver PDB being omitted from the guest cluster CVO payload and added to the management cluster namespace.

…4.22 The fixtures cherry-picked from openshift#8459 were generated on main and are stale on the release-4.22 base. Regenerating updates the CPOv2 desired-state-hash annotations: - cluster-version-operator deployment fixtures: hash value changes because the packageserver PDB is now omitted from the CVO payload. - packageserver PDB fixtures: gain the desired-state-hash annotation now that the PDB is a CPOv2-managed resource on release-4.22.

openshift-merge-bot · 2026-09-09T06:03:37Z

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 · 2026-09-09T06:03:40Z

@dhgautam99: This pull request references Jira Issue OCPBUGS-120746, 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:

Summary

This PR supersedes #9520 (opened by openshift-cherrypick-robot), the cherry-pick of #8459 (OCPBUGS-54790) to release-4.22.

The original cherry-pick failed the Unit Tests job (TestControlPlaneComponents). The failure was not a source-code bug — the test fixtures cherry-picked from main are stale on the release-4.22 base. The only differences were the CPOv2 hypershift.openshift.io/desired-state-hash annotations:

cluster-version-operator deployment fixtures (5): hash value changed, because the PR omits the packageserver PDB from the CVO payload.

packageserver PDB fixtures (5): gain the desired-state-hash annotation now that the PDB is a CPOv2-managed resource on release-4.22.

This PR contains the two original commits plus one commit regenerating those 10 fixtures (UPDATE=true go test ./...). The full hostedcontrolplane package test tree now passes locally.

Commits

fix(CPO): move packageserver PDB from guest cluster to management cluster (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)

test(CPO): update test fixtures for packageserver PDB changes (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)

test(CPO): regenerate packageserver PDB and CVO fixtures for release-4.22

Supersedes: #9520
Original cherry-pick source: #8459

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 · 2026-09-09T06:03:41Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Advanced

Run ID: 37d3e55c-b6b1-44dc-831d-ae817c9b3423

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

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

dhgautam99 · 2026-09-09T06:05:25Z

/jira refresh

openshift-ci-robot · 2026-09-09T06:05:31Z

@dhgautam99: This pull request references Jira Issue OCPBUGS-120746, 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.22.0) matches configured target version for branch (4.22.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-54790 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-54790 targets the "5.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

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.

codecov · 2026-09-09T06:16:23Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 36.77%. Comparing base (3004374) to head (9f3ba5d).
⚠️ Report is 25 commits behind head on release-4.22.

Additional details and impacted files

@@               Coverage Diff                @@
##           release-4.22    #9548      +/-   ##
================================================
+ Coverage         36.71%   36.77%   +0.05%     
================================================
  Files               777      779       +2     
  Lines             95484    95585     +101     
================================================
+ Hits              35061    35149      +88     
- Misses            57580    57592      +12     
- Partials           2843     2844       +1

Files with missing lines	Coverage Δ
...ontrollers/hostedcontrolplane/v2/cvo/deployment.go	`41.74% <100.00%> (+0.57%)`	⬆️
...stedcontrolplane/v2/olm/packageserver/component.go	`73.91% <100.00%> (+73.91%)`	⬆️

... and 10 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

bryan-cox

/approve

openshift-ci · 2026-09-09T16:38:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, dhgautam99

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~~ [bryan-cox]

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

vismishr · 2026-09-15T09:38:50Z

/lgtm

openshift-ci · 2026-09-15T09:40:21Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-aks-external-oidc
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

muraee · 2026-09-15T14:47:42Z

/label backport-risk-assessed

bryan-cox · 2026-09-15T17:29:21Z

/pipeline required

openshift-merge-bot · 2026-09-15T17:29:24Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-azure-aks-external-oidc
/test e2e-azure-self-managed
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

openshift-ci-robot · 2026-09-15T22:15:23Z

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

Details

In response to this:

/verified by @vismishr

https://vismishr.github.io/pr-9548-verification.html - all logs are mentioned here

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-bot · 2026-09-15T22:58:32Z

/retest-required

Remaining retests: 0 against base HEAD 7273000 and 2 for PR HEAD 9f3ba5d in total

dhgautam99 · 2026-09-16T05:14:39Z

/test e2e-aws-upgrade-hypershift-operator
/test e2e-v2-aws
/test e2e-kubevirt-aws-ovn-reduced

openshift-merge-bot · 2026-09-16T18:58:58Z

/retest-required

Remaining retests: 0 against base HEAD 211f9b0 and 1 for PR HEAD 9f3ba5d in total

openshift-merge-bot · 2026-09-17T10:49:50Z

/retest-required

Remaining retests: 0 against base HEAD 5f96792 and 0 for PR HEAD 9f3ba5d in total

openshift-merge-bot · 2026-09-17T15:59:47Z

/hold

Revision 9f3ba5d was retested 3 times: holding

dhgautam99 · 2026-09-18T04:46:50Z

/test e2e-aws-upgrade-hypershift-operator
/test e2e-v2-aws

bryan-cox · 2026-09-18T13:30:58Z

/retest

red-hat-konflux · 2026-09-18T13:31:07Z

All PipelineRuns for this commit have already succeeded. Use /retest <pipeline-name> to re-run a specific pipeline or /test to re-run all pipelines.

dhgautam99 · 2026-09-21T04:48:11Z

/test e2e-aws-upgrade-hypershift-operator
/test e2e-v2-aws

dhgautam99 · 2026-09-24T05:10:51Z

/test e2e-v2-aws

dhgautam99 · 2026-09-24T10:19:19Z

/unhold
/test e2e-v2-aws

openshift-merge-bot · 2026-09-24T10:33:07Z

/retest-required

Remaining retests: 0 against base HEAD b415604 and 2 for PR HEAD 9f3ba5d in total

dhgautam99 · 2026-09-24T14:16:10Z

/hold

dhgautam99 · 2026-09-24T17:01:19Z

/unhold
/test e2e-aws-upgrade-hypershift-operator

openshift-ci · 2026-09-24T19:50:13Z

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

openshift-ci-robot · 2026-09-24T19:55:46Z

@dhgautam99: No Jira issue with key OCPBUGS-120746 exists in the tracker at https://redhat.atlassian.net.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

Summary

This PR supersedes #9520 (opened by openshift-cherrypick-robot), the cherry-pick of #8459 (OCPBUGS-54790) to release-4.22.

The original cherry-pick failed the Unit Tests job (TestControlPlaneComponents). The failure was not a source-code bug — the test fixtures cherry-picked from main are stale on the release-4.22 base. The only differences were the CPOv2 hypershift.openshift.io/desired-state-hash annotations:

cluster-version-operator deployment fixtures (5): hash value changed, because the PR omits the packageserver PDB from the CVO payload.

packageserver PDB fixtures (5): gain the desired-state-hash annotation now that the PDB is a CPOv2-managed resource on release-4.22.

This PR contains the two original commits plus one commit regenerating those 10 fixtures (UPDATE=true go test ./...). The full hostedcontrolplane package test tree now passes locally.

Commits

fix(CPO): move packageserver PDB from guest cluster to management cluster (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)

test(CPO): update test fixtures for packageserver PDB changes (from OCPBUGS-54790: Move packageserver PDB from guest cluster to management cluster #8459)

test(CPO): regenerate packageserver PDB and CVO fixtures for release-4.22

Supersedes: #9520
Original cherry-pick source: #8459

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.

dhgautam99 · 2026-09-25T06:54:04Z

/jira refresh

openshift-ci-robot · 2026-09-25T06:54:08Z

@dhgautam99: Jira Issue Verification Checks: Jira Issue OCPBUGS-120746
✔️ 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-120746 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:

/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-merge-robot · 2026-09-27T02:11:08Z

Fix included in release 4.22.0-0.nightly-2026-09-26-202614

dhruv-gautam and others added 3 commits September 4, 2026 13:02

test(CPO): update test fixtures for packageserver PDB changes

524f7b8

Regenerate CVO deployment and packageserver component test fixtures to reflect the packageserver PDB being omitted from the guest cluster CVO payload and added to the management cluster namespace.

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 9, 2026

openshift-ci Bot added the do-not-merge/needs-area label Sep 9, 2026

dhgautam99 mentioned this pull request Sep 9, 2026

[release-4.22] OCPBUGS-120746: Move packageserver PDB from guest cluster to management cluster #9520

Closed

openshift-ci Bot requested review from bryan-cox and enxebre September 9, 2026 06:04

openshift-ci Bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Sep 9, 2026

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Sep 9, 2026

openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 9, 2026

bryan-cox reviewed Sep 9, 2026

View reviewed changes

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 9, 2026

openshift-ci Bot assigned vismishr Sep 15, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 15, 2026

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

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

jparrill mentioned this pull request Sep 16, 2026

NO-JIRA: fix(e2e): restore Eventually retry for post-upgrade health condition check #9632

Merged

2 tasks

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 17, 2026

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2026

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2026

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2026

openshift-merge-bot Bot merged commit 8312e54 into openshift:release-4.22 Sep 24, 2026
26 checks passed

Conversation

dhgautam99 commented Sep 9, 2026

Summary

Commits

Uh oh!

openshift-merge-bot Bot commented Sep 9, 2026

Uh oh!

openshift-ci-robot commented Sep 9, 2026

Summary

Commits

Uh oh!

coderabbitai Bot commented Sep 9, 2026

Review skipped

Uh oh!

dhgautam99 commented Sep 9, 2026

Uh oh!

openshift-ci-robot commented Sep 9, 2026

Uh oh!

codecov Bot commented Sep 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bryan-cox left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Sep 9, 2026

Uh oh!

vismishr commented Sep 15, 2026

Uh oh!

openshift-ci Bot commented Sep 15, 2026

Uh oh!

muraee commented Sep 15, 2026

Uh oh!

bryan-cox commented Sep 15, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 15, 2026

Uh oh!

openshift-ci-robot commented Sep 15, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 15, 2026

Uh oh!

dhgautam99 commented Sep 16, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 16, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 17, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 17, 2026

Uh oh!

dhgautam99 commented Sep 18, 2026

Uh oh!

bryan-cox commented Sep 18, 2026

Uh oh!

red-hat-konflux Bot commented Sep 18, 2026

Uh oh!

dhgautam99 commented Sep 21, 2026

Uh oh!

dhgautam99 commented Sep 24, 2026

Uh oh!

dhgautam99 commented Sep 24, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 24, 2026

Uh oh!

dhgautam99 commented Sep 24, 2026

Uh oh!

dhgautam99 commented Sep 24, 2026

Uh oh!

openshift-ci Bot commented Sep 24, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 24, 2026

Summary

Commits

Uh oh!

dhgautam99 commented Sep 25, 2026

Uh oh!

openshift-ci-robot commented Sep 25, 2026

Uh oh!

openshift-merge-robot commented Sep 27, 2026

Uh oh!

codecov Bot commented Sep 9, 2026 •

edited

Loading