Skip to content

STOR-2523: hypershift: Add desired-version annotation to operand Deployments and use DeploymentVersionController in CSO#638

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
mpatlasov:STOR-2523-Add-desired-version-annotation
Jan 29, 2026
Merged

STOR-2523: hypershift: Add desired-version annotation to operand Deployments and use DeploymentVersionController in CSO#638
openshift-merge-bot[bot] merged 3 commits intoopenshift:mainfrom
mpatlasov:STOR-2523-Add-desired-version-annotation

Conversation

@mpatlasov
Copy link
Copy Markdown
Contributor

@mpatlasov mpatlasov commented Oct 20, 2025 •
edited
Loading

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

@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 20, 2025
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Oct 20, 2025 •
edited by openshift-ci Bot
Loading

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

Details

In response to this:

New annotation release.openshift.io/desired-version will be used by CSO to compare the version from env var OPERAND_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 jsafrane and mandre October 20, 2025 05:05
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 20, 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

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 20, 2025
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Oct 20, 2025

/retest-required

1 similar comment
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Oct 20, 2025

/retest-required

@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Oct 27, 2025

/assign @jsafrane

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

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.

Details

In response to this:

New annotation release.openshift.io/desired-version will be used by CSO 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.

@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 0a05ff2 to c8afe69 Compare October 27, 2025 07:07
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from c8afe69 to 15fdfe0 Compare December 3, 2025 03:08
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Dec 3, 2025

@jsafrane , the PR is ready for review (last commit implements DeploymentVersionController). PTAL

@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 15fdfe0 to 64cf8b0 Compare December 3, 2025 23:45
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Dec 4, 2025

/retest-required

@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Dec 5, 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 Dec 5, 2025
@mpatlasov mpatlasov changed the title STOR-2523: hypershift: Add desired-version annotation to operand Deployments STOR-2523: hypershift: Add desired-version annotation to operand Deployments and use DeploymentVersionController in CSO Dec 5, 2025
@mpatlasov
hypershift: Add desired-version annotation to operand Deployments
e55a7ac 
New annotation `release.openshift.io/desired-version` will be used by CSO to compare the version from env var `OPERATOR_IMAGE_VERSION` with actual version of currently running operand.
@mpatlasov
Bump library-go dependency
14c5f71 
`go get github.com/openshift/library-go`
@mpatlasov mpatlasov force-pushed the STOR-2523-Add-desired-version-annotation branch from 64cf8b0 to 1a3bf7c Compare January 8, 2026 02:47
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Jan 8, 2026

Update: last force-push only rebased PR on top of current head of main branch.

@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Jan 8, 2026

/unhold
(4.21 branched, we can proceed with merging this PR for 4.22)

@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 Jan 8, 2026
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Jan 10, 2026

/override ci/prow/okd-scos-images
OKD has a known outage

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 10, 2026

@mpatlasov: Overrode contexts on behalf of mpatlasov: ci/prow/okd-scos-images

Details

In response to this:

/override ci/prow/okd-scos-images
OKD has a known outage

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.

jsafrane
jsafrane reviewed Jan 26, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@jsafrane jsafrane left a comment

Choose a reason for hiding this comment

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

Just a nit

Comment thread pkg/operator/csidriveroperator/csioperatorclient/types.go Outdated
Comment thread pkg/operator/csidriveroperator/csioperatorclient/util.go Outdated
@mpatlasov
hypershift: Add version annotation to controller Deployments
ca01222 
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 1a3bf7c to ca01222 Compare January 26, 2026 15:33
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Jan 26, 2026

Update: last force-push only did two renames, no other changes:

  • s/CSIDriverOperatorName/CSIDriverDeploymentName
  • s/getCSIDriverOperatorName/getCSIDriverDeploymentName

@jsafrane
Copy link
Copy Markdown
Contributor

jsafrane commented Jan 26, 2026

/lgtm

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

mpatlasov commented Jan 26, 2026

/test hypershift-e2e-aks

1 similar comment
@mpatlasov
Copy link
Copy Markdown
Contributor Author

mpatlasov commented Jan 27, 2026

/test hypershift-e2e-aks

@duanwei33
Copy link
Copy Markdown

duanwei33 commented Jan 28, 2026

cc @radeore

@radeore
Copy link
Copy Markdown

radeore commented Jan 28, 2026

/unassign @duanwei33 @Phaow @chao007

@radeore
Copy link
Copy Markdown

radeore commented Jan 28, 2026 •
edited
Loading

Expected desired-version & version annotations with equal version are present in AWS EBS CSI Driver deployment from hypershift-aws-e2e CI job,

kind: Deployment
metadata:
  name: aws-ebs-csi-driver-operator
  annotations:
    release.openshift.io/desired-version: 4.22.0-0.ci-2026-01-26-154023-test-ci-op-3ci3mkfh-latest
    release.openshift.io/version: 4.22.0-0.ci-2026-01-26-154023-test-ci-op-3ci3mkfh-latest

Same for Azure disk csi driver deployment,

kind: Deployment
metadata:
  annotations:
    config.openshift.io/inject-proxy: azure-disk-csi-driver-operator
    release.openshift.io/desired-version: 4.22.0-0.ci-2026-01-27-004033-test-ci-op-8yns2v95-latest
    release.openshift.io/version: 4.22.0-0.ci-2026-01-27-004033-test-ci-op-8yns2v95-latest

Also, for Azure File csi driver deployment,

apiVersion: apps/v1
kind: Deployment
metadata:
  annotations:
    config.openshift.io/inject-proxy: azure-file-csi-driver-operator
    release.openshift.io/desired-version: 4.22.0-0.ci-2026-01-27-004033-test-ci-op-8yns2v95-latest
    release.openshift.io/version: 4.22.0-0.ci-2026-01-27-004033-test-ci-op-8yns2v95-latest

@radeore
Copy link
Copy Markdown

radeore commented Jan 28, 2026

/verified by @radeore and CI

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 28, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Jan 28, 2026

@radeore: This PR has been marked as verified by @radeore and CI.

Details

In response to this:

/verified by @radeore and CI

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

openshift-ci-robot commented Jan 29, 2026

/retest-required

Remaining retests: 0 against base HEAD ecae643 and 2 for PR HEAD ca01222 in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 29, 2026

@mpatlasov: 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-merge-bot openshift-merge-bot Bot merged commit 9474377 into openshift:main Jan 29, 2026
16 checks passed
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

Assignees

@jsafrane jsafrane

@radeore radeore

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@mpatlasov @openshift-ci-robot @jsafrane @duanwei33 @radeore @chao007 @Phaow