Skip to content

WIP: Rework custom deployment controller to library-go DeploymentController#635

Open
jsafrane wants to merge 10 commits intoopenshift:mainfrom
jsafrane:remove-deploymentcontroller
Open

WIP: Rework custom deployment controller to library-go DeploymentController#635
jsafrane wants to merge 10 commits intoopenshift:mainfrom
jsafrane:remove-deploymentcontroller

Conversation

@jsafrane
Copy link
Contributor

@jsafrane jsafrane commented Oct 16, 2025 •
edited
Loading

Rework custom CommonCSIDeploymentController / CSIDriverOperatorDeploymentController / HyperShiftDeploymentController to use the default DeploymentController.

The refactoring is taken in small steps

  • Refactor functionality of the controllers to manifest / Deployment hooks, one small piece after another. That's majority of the commits in this PR to make review chunks smaller.
  • Once every custom code is a hook, remove the controllers and run DeploymentController with the hooks instead. This commit is huge, but it just removes a lot of code.
  • The only code that DeploymentController misses is PostStartHook. Hack it into vendor/, I'll move it into library-go during review.
  • Fix conditions. Despite comments in the code, the old controllers produced <short name>Progressing (such as GCPPDProgressing) and <short name>CSIDriverOperatorDeploymentDegraded (GCPPDCSIDriverOperatorDeploymentDegraded). The new DeploymentController progressing condition have the long prefix instead. So add a stale condition remover with the old <short name>Progressing conditions.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 16, 2025
@openshift-ci openshift-ci bot requested review from dobsonj and gnufied October 16, 2025 13:33
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 16, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane

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:

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 16, 2025
@jsafrane jsafrane force-pushed the remove-deploymentcontroller branch from 184efa7 to 8040103 Compare October 16, 2025 13:36
@jsafrane jsafrane force-pushed the remove-deploymentcontroller branch from 8040103 to 7a263c4 Compare October 16, 2025 14:06
@jsafrane jsafrane mentioned this pull request Oct 16, 2025
Closed
@gnufied
Copy link
Member

gnufied commented Oct 16, 2025

Looks like we broke Storage on hypershift:

eventually.go:227:  - incorrect condition: wanted ClusterVersionSucceeding=True, got ClusterVersionSucceeding=False: ClusterOperatorNotAvailable(Cluster operator storage is not available)

gnufied
gnufied reviewed Oct 16, 2025
View reviewed changes
...r/github.com/openshift/library-go/pkg/operator/deploymentcontroller/deployment_controller.go
if len(c.postStartHooks) > 0 {
controller = controller.WithPostStartHooks(c.postStartHooks...)
}

Copy link
Member

@gnufied gnufied Oct 16, 2025

Choose a reason for hiding this comment

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

Custom changes for WIP stuff?

Copy link
Contributor Author

@jsafrane jsafrane Oct 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

yes, I need to add it to library-go. If we decide that this PR looks as a good approach.

@jsafrane
Replace custom deployment controller
d7b0d42 
Use DeploymentController to manage Deployment. Remove the custom
controller.

Ad move functions from the original controller to global functions, so they
can be used by the hooks.
@jsafrane
Remove GCPPD_Progressing condition
e054102 
And all other <short name>_Progressing. The new DeploymentController will
create <short name>SSIDriverOperatorDeployment_Progressing as documented in the
code.
@jsafrane jsafrane force-pushed the remove-deploymentcontroller branch from 7a263c4 to e054102 Compare October 17, 2025 14:38
@jsafrane
Copy link
Contributor Author

jsafrane commented Oct 20, 2025

/test hypershift-aws-e2e-external

@jsafrane jsafrane mentioned this pull request Oct 20, 2025
Open
@jsafrane
Copy link
Contributor Author

jsafrane commented Oct 20, 2025

/test hypershift-aws-e2e-external

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 20, 2025

@jsafrane: The following tests 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-deps e054102 link true /test verify-deps
ci/prow/okd-scos-e2e-aws-ovn e054102 link false /test okd-scos-e2e-aws-ovn
ci/prow/hypershift-e2e-aks e054102 link true /test hypershift-e2e-aks
ci/prow/hypershift-aws-e2e-external e054102 link true /test hypershift-aws-e2e-external

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-bot
Copy link
Contributor

openshift-bot commented Jan 19, 2026

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jan 19, 2026
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 19, 2026
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Jan 19, 2026

PR needs rebase.

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.

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

Reviewers

@gnufied gnufied gnufied left review comments

@dobsonj dobsonj Awaiting requested review from dobsonj

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jsafrane @gnufied @openshift-bot @openshift-merge-robot