Skip to content

STOR-2523: hypershift: Add desired-version annotation to controller Deployments and use DeploymentVersionController in csi driver operators #457

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
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

STOR-2523: hypershift: Add desired-version annotation to controller Deployments and use DeploymentVersionController in csi driver operators #457

wants to merge 3 commits into from

Conversation

@mpatlasov
Copy link
Contributor

@mpatlasov mpatlasov commented Oct 27, 2025 •
edited
Loading

https://issues.redhat.com//browse/STOR-2523
/cc @openshift/storage

New annotation release.openshift.io/desired-version is used by DeploymentVersionController to compare the version from env var OPERATOR_IMAGE_VERSION with actual version of currently running operand.

The third commit in this PR adds DeploymentVersionController to the following csi driver operators: aws-ebs, azure-disk, azure-file, openstack manila and cinder.

The result of merging this PR would be updating release.openshift.io/version annotation of controller Deployments in Hypershift control-plane when controller deployment is completed.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 27, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 27, 2025 •
edited by openshift-ci bot
Loading

@mpatlasov: This pull request references STOR-2523 which is a valid jira issue.

In response to this:

New annotation release.openshift.io/desired-version will be used by CSI driver operators to compare the version from env var OPERATOR_IMAGE_VERSION with actual version of currently running operand.

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 review from mandre and stephenfin October 27, 2025 07:05
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mpatlasov

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2025
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Oct 27, 2025

/retest-required

3 similar comments
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Oct 27, 2025

/retest-required

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Oct 28, 2025

/retest-required

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Oct 28, 2025

/retest-required

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Oct 29, 2025

/assign @jsafrane

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 4, 2025
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 7576b2b to 05353f3 Compare November 5, 2025 06:25
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2025
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 5, 2025

/retest-required

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 5, 2025

/hold

Current approach requests Deployment from the hook like this:

deployment2, err := c.ControlPlaneKubeClient.AppsV1().Deployments(deployment.Namespace).Get(context.TODO(), deployment.Name, metav1.GetOptions{})

It's not good. Let's try another approach -- new controller that would reconcile "release.openshift.io/version" annotation.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 5, 2025
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 05353f3 to 812763e Compare November 11, 2025 02:38
jsafrane
jsafrane reviewed Nov 11, 2025
View reviewed changes
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 812763e to 1289852 Compare November 12, 2025 01:32
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 12, 2025

/hold
(to address comments: 1) move to library-go; 2) add unit tests; 3) add some docs; 4) lower log level; 5) other minor nits)

@mpatlasov mpatlasov changed the title STOR-2523: hypershift: Add desired-version annotation to controller Deployments WIP: STOR-2523: hypershift: Add desired-version annotation to controller Deployments Nov 12, 2025
@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 Nov 12, 2025
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 1289852 to 85ab375 Compare November 17, 2025 00:12
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2025
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 85ab375 to c37bde8 Compare November 17, 2025 00:45
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2025
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 17, 2025

/unhold
(all comments are resolved)

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 17, 2025
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 17, 2025

/retest-required

1 similar comment
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 17, 2025

/retest-required

jsafrane
jsafrane reviewed Nov 18, 2025
View reviewed changes
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from c37bde8 to 679b527 Compare November 18, 2025 21:52
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 19, 2025

/retest-required

@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 679b527 to 7a4a133 Compare November 19, 2025 16:35
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 19, 2025 •
edited
Loading

Update: last force-push bumped library-go deps to vendor last fixes for DeploymentVersionController

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 19, 2025

/retest-required

@mpatlasov
hypershift: Add desired-version annotation to controller Deployments
29ee686 
New annotation `release.openshift.io/desired-version` will be used by CSI driver operators to compare the version from env var `OPERATOR_IMAGE_VERSION` with actual version of currently running operand.
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch 2 times, most recently from 951a2e6 to 049dbf6 Compare November 20, 2025 01:16
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 20, 2025 •
edited by openshift-ci bot
Loading

@mpatlasov: This pull request references STOR-2523 which is a valid jira issue.

In response to this:

New annotation release.openshift.io/desired-version is used by DeploymentVersionController to compare the version from env var OPERATOR_IMAGE_VERSION with actual version of currently running operand.

The third commit in this PR adds DeploymentVersionController to the following csi driver operators: aws-ebs, azure-disk, azure-file, openstack manila and cinder.

The result of merging this PR would be updating release.openshift.io/version annotation of controller Deployments in Hypershift control-plane when controller deployment is completed.

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-robot
Copy link

openshift-ci-robot commented Nov 20, 2025 •
edited by openshift-ci bot
Loading

@mpatlasov: This pull request references STOR-2523 which is a valid jira issue.

In response to this:

https://issues.redhat.com//browse/STOR-2523
/cc @openshift/storage

New annotation release.openshift.io/desired-version is used by DeploymentVersionController to compare the version from env var OPERATOR_IMAGE_VERSION with actual version of currently running operand.

The third commit in this PR adds DeploymentVersionController to the following csi driver operators: aws-ebs, azure-disk, azure-file, openstack manila and cinder.

The result of merging this PR would be updating release.openshift.io/version annotation of controller Deployments in Hypershift control-plane when controller deployment is completed.

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.

@mpatlasov mpatlasov changed the title WIP: STOR-2523: hypershift: Add desired-version annotation to controller Deployments STOR-2523: hypershift: Add desired-version annotation to controller Deployments and use DeploymentVersionController in csi driver operators Nov 20, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 20, 2025
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 20, 2025

/hold
(until 4.21 branches)

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 20, 2025
@mpatlasov
Bump library-go dependency
35ca9fe 
`go get github.com/openshift/library-go`
@mpatlasov
hypershift: Add version annotation to controller Deployments
83035fd 
New annotation `release.openshift.io/version` signals that rollout of Deployment is complete (see https://issues.redhat.com/browse/STOR-2523 for details).
This commit uses new controller (DeploymentVersionController) from library-go which reconciles version annotation if controller deplyment is done.
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 049dbf6 to 83035fd Compare November 22, 2025 01:12
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 24, 2025

/retest-required

2 similar comments
@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 24, 2025

/retest-required

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 25, 2025

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 25, 2025

@mpatlasov: 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/e2e-openstack 83035fd link false /test e2e-openstack
ci/prow/e2e-azure-file-csi-extended 83035fd link false /test e2e-azure-file-csi-extended
ci/prow/e2e-azurestack-csi 83035fd link false /test e2e-azurestack-csi
ci/prow/e2e-openstack-manila-csi 83035fd link true /test e2e-openstack-manila-csi
ci/prow/e2e-openstack-cinder-csi 83035fd link true /test e2e-openstack-cinder-csi

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.

@mpatlasov
Copy link
Contributor Author

mpatlasov commented Nov 25, 2025

/retest-required

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
@openshift-merge-robot
Copy link
Contributor

openshift-merge-robot commented Nov 25, 2025

PR needs rebase.

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

@jsafrane jsafrane jsafrane left review comments

@mandre mandre Awaiting requested review from mandre

@stephenfin stephenfin Awaiting requested review from stephenfin

Assignees

@jsafrane jsafrane

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

@mpatlasov @openshift-ci-robot @openshift-merge-robot @jsafrane