Skip to content

OCPBUGS-62517: enable downstream pdb and update replicas to meet MCO drain #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
jianzhangbjz wants to merge 2 commits into
base: main
Choose a base branch
from
Open

OCPBUGS-62517: enable downstream pdb and update replicas to meet MCO drain #576

jianzhangbjz wants to merge 2 commits into from

Conversation

@jianzhangbjz
Copy link
Member

@jianzhangbjz jianzhangbjz commented Dec 4, 2025

To address: OLM pdb blocks the MCO drain.

jiazha-mac:~ jiazha$ omg get pdb -A
NAMESPACE                             NAME                                    AGE
...
openshift-operator-controller         operator-controller-controller-manager  2h9m
...
openshift-catalogd                    catalogd-controller-manager             2h9m

  /namespaces/openshift-machine-config-operator/pods/machine-config-controller-ddcbcf474-f8bhx/machine-config-controller/machine-config-controller/logs/current.log):

  2025-12-02T05:30:48.091087Z node ci-op-lnbvjnkk-7649c-r6jfj-master-0: Drain failed.
  Drain has been failing for more than 10 minutes. Waiting 5 minutes then retrying.
  Error message from drain: [
    error when evicting pods/"catalogd-controller-manager-6bd9bd869b-272v6" -n "openshift-catalogd": global timeout reached: 1m30s,
    error when evicting pods/"operator-controller-controller-manager-86444b95d6-gtxjl" -n "openshift-operator-controller": global timeout reached: 1m30s
  ]

More on Slack: https://redhat-internal.slack.com/archives/C01CQA76KMX/p1764766284275389

@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 Dec 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 4, 2025

@jianzhangbjz: This pull request references Jira Issue OCPBUGS-62517, 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)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiazha@redhat.com), skipping review request.

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

In response to this:

To address: OLM pdb blocks the MCO drain.

jiazha-mac:~ jiazha$ omg get pdb -A
NAMESPACE                             NAME                                    AGE
...
openshift-operator-controller         operator-controller-controller-manager  2h9m
...
openshift-catalogd                    catalogd-controller-manager             2h9m

 /namespaces/openshift-machine-config-operator/pods/machine-config-controller-ddcbcf474-f8bhx/machine-config-controller/machine-config-controller/logs/current.log):

 2025-12-02T05:30:48.091087Z node ci-op-lnbvjnkk-7649c-r6jfj-master-0: Drain failed.
 Drain has been failing for more than 10 minutes. Waiting 5 minutes then retrying.
 Error message from drain: [
   error when evicting pods/"catalogd-controller-manager-6bd9bd869b-272v6" -n "openshift-catalogd": global timeout reached: 1m30s,
   error when evicting pods/"operator-controller-controller-manager-86444b95d6-gtxjl" -n "openshift-operator-controller": global timeout reached: 1m30s
 ]

More on Slack: https://redhat-internal.slack.com/archives/C01CQA76KMX/p1764766284275389

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 requested a review from bentito December 4, 2025 03:04
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 4, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jianzhangbjz

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:

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 requested a review from dtfranz December 4, 2025 03:04
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 4, 2025
@jianzhangbjz
Copy link
Member Author

jianzhangbjz commented Dec 4, 2025

I just use this PR for testing. The upstream PR: operator-framework/operator-controller#2371

@jianzhangbjz @claude
Update OpenShift manifests with PodDisruptionBudget resources
445ad9b 
Regenerate OpenShift manifests to include PodDisruptionBudget resources
for catalogd-controller-manager and operator-controller-controller-manager.
These PDBs ensure high availability during cluster upgrades by preventing
simultaneous disruption of all controller pods.

The manifests now include:
- PDB for catalogd with minAvailable: 1
- PDB for operator-controller with minAvailable: 1
- Both standard and experimental feature set annotations

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 4, 2025

@jianzhangbjz: The following test 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/verify c6573e7 link true /test verify

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.

@jianzhangbjz
Copy link
Member Author

jianzhangbjz commented Dec 4, 2025

/payload-job periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 4, 2025

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

  • periodic-ci-openshift-release-master-ci-4.21-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/74cbcd50-d0ca-11f0-9907-eb8e705acca9-0

@jianzhangbjz
Copy link
Member Author

jianzhangbjz commented Dec 4, 2025

All tests passed. See: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-operator-framework-operator-controller-576-ci-4.21-e2e-azure-ovn-upgrade/1996437818976505856
Hi @tmshort , I think we can merge the upstream PR operator-framework/operator-controller#2371 and enable pdb in downstream.

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

Reviewers

@bentito bentito Awaiting requested review from bentito

@dtfranz dtfranz Awaiting requested review from dtfranz

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jianzhangbjz @openshift-ci-robot