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

Open
mpatlasov 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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29ee686
hypershift: Add desired-version annotation to controller Deployments
mpatlasov Nov 17, 2025
35ca9fe
Bump library-go dependency
mpatlasov Nov 20, 2025
83035fd
hypershift: Add version annotation to controller Deployments
mpatlasov Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions assets/common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
metadata:
annotations:
release.openshift.io/desired-version: ${RELEASE_VERSION}
2 changes: 2 additions & 0 deletions assets/overlays/aws-ebs/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
# Applied strategic merge patch overlays/aws-ebs/patches/controller_add_hypershift_controller_minter.yaml
#
#
Expand All @@ -35,6 +36,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: csi-driver
config.openshift.io/inject-proxy-cabundle: csi-driver
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: cluster-storage-operator
name: aws-ebs-csi-driver-controller
Expand Down
2 changes: 2 additions & 0 deletions assets/overlays/azure-disk/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
# Applied strategic merge patch overlays/azure-disk/patches/controller_add_hypershift_controller.yaml
#
#
Expand All @@ -35,6 +36,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: csi-driver
config.openshift.io/inject-proxy-cabundle: csi-driver
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: cluster-storage-operator
name: azure-disk-csi-driver-controller
Expand Down
2 changes: 2 additions & 0 deletions assets/overlays/azure-file/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
# Applied JSON patch common/hypershift/sidecar_add_kubeconfig.yaml.patch
# Applied strategic merge patch overlays/azure-file/patches/controller_add_hypershift_controller.yaml
#
Expand All @@ -36,6 +37,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: csi-driver
config.openshift.io/inject-proxy-cabundle: csi-driver
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: cluster-storage-operator
name: azure-file-csi-driver-controller
Expand Down
2 changes: 2 additions & 0 deletions assets/overlays/openstack-cinder/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
# Applied strategic merge patch overlays/openstack-cinder/patches/controller_add_hypershift_volumes.yaml
#
#
Expand All @@ -33,6 +34,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: csi-driver
config.openshift.io/inject-proxy-cabundle: csi-driver
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: cluster-storage-operator
name: openstack-cinder-csi-driver-controller
Expand Down
2 changes: 2 additions & 0 deletions assets/overlays/openstack-manila/generated/hypershift/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# Applied strategic merge patch common/hypershift/controller_add_affinity_tolerations.yaml
# Applied JSON patch common/hypershift/controller_add_kubeconfig_volume.yaml.patch
# Applied strategic merge patch common/hypershift/controller_add_hypershift_managed_by_label.yaml
# Applied strategic merge patch common/hypershift/controller_add_hypershift_desired_version_annotation.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/controller_add_hypershift_volumes.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/controller_rename_config_map.yaml
# Applied strategic merge patch overlays/openstack-manila/patches/modify_anti_affinity_selector.yaml
Expand All @@ -31,6 +32,7 @@ metadata:
annotations:
config.openshift.io/inject-proxy: csi-driver
config.openshift.io/inject-proxy-cabundle: csi-driver
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: cluster-storage-operator
name: openstack-manila-csi-controllerplugin
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
github.com/openshift/hypershift/api v0.0.0-20251112122022-66a7017f8635
github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884
github.com/prometheus/client_golang v1.23.2
github.com/spf13/cobra v1.10.1
gopkg.in/ini.v1 v1.67.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlp
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM=
github.com/openshift/hypershift/api v0.0.0-20251112122022-66a7017f8635 h1:7ZzaDMMgHMBo9qmsU7I5ySwDr7gQLBR/k5wluCxz8/4=
github.com/openshift/hypershift/api v0.0.0-20251112122022-66a7017f8635/go.mod h1:JiaoBwTsYtBVKKPgHcajChZCu20KdM97W2xc0MeBCBA=
github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f h1:r1pLosA7z3+t+lzW29FU54sg4/pAWu+lsKD0L5Gx3wg=
github.com/openshift/library-go v0.0.0-20251112091634-ab97ebb73f0f/go.mod h1:ErDfiIrPHH+menTP/B4LKd0nxFDdvCbTamAc6SWMIh8=
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884 h1:6512TMT14gnXQ4vyshzAQGjkctU0PO9G+y0tcBjw6Vk=
github.com/openshift/library-go v0.0.0-20251120164824-14a789e09884/go.mod h1:ErDfiIrPHH+menTP/B4LKd0nxFDdvCbTamAc6SWMIh8=
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
Expand Down
11 changes: 10 additions & 1 deletion pkg/driver/aws-ebs/aws_ebs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csistorageclasscontroller"
dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -216,7 +217,15 @@ func GetAWSEBSOperatorControllerConfig(ctx context.Context, flavour generator.Cl

if flavour == generator.FlavourHyperShift {
volumeTagController := NewEBSVolumeTagsController(cfg.GetControllerName("EBSVolumeTagsController"), c, c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, volumeTagController)
versionController := deploymentversioncontroller.NewDeploymentVersionController(
cfg.GetControllerName("DeploymentVersionController"),
c.ControlPlaneNamespace,
"aws-ebs-csi-driver-controller",
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
c.OperatorClient,
c.ControlPlaneKubeClient,
c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, volumeTagController, versionController)
cfg.DeploymentInformers = append(cfg.DeploymentInformers, c.KubeInformers.InformersFor("").Core().V1().PersistentVolumes().Informer())
cfg.DeploymentInformers = append(cfg.DeploymentInformers, c.KubeInformers.InformersFor(awsEBSSecretNamespace).Core().V1().Secrets().Informer())
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/driver/azure-disk/azure_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csistorageclasscontroller"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"

dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
Expand Down Expand Up @@ -212,6 +213,15 @@ func GetAzureDiskOperatorControllerConfig(ctx context.Context, flavour generator
if azureDiskSecretProviderClass != "" {
cfg.DeploymentHooks = append(cfg.DeploymentHooks, withAROCSIVolume(azureDiskSecretProviderClass))
}
versionController := deploymentversioncontroller.NewDeploymentVersionController(
cfg.GetControllerName("DeploymentVersionController"),
c.ControlPlaneNamespace,
"azure-disk-csi-driver-controller",
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
c.OperatorClient,
c.ControlPlaneKubeClient,
c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, versionController)
}

// add extra replacement for stuff
Expand Down
10 changes: 10 additions & 0 deletions pkg/driver/azure-file/azure_file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/openshift/library-go/pkg/controller/factory"
"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"

dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
Expand Down Expand Up @@ -177,6 +178,15 @@ func GetAzureFileOperatorControllerConfig(ctx context.Context, flavour generator
if azureFileSecretProviderClass != "" {
cfg.DeploymentHooks = append(cfg.DeploymentHooks, withAROCSIVolume(azureFileSecretProviderClass))
}
versionController := deploymentversioncontroller.NewDeploymentVersionController(
cfg.GetControllerName("DeploymentVersionController"),
c.ControlPlaneNamespace,
"azure-file-csi-driver-controller",
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
c.OperatorClient,
c.ControlPlaneKubeClient,
c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, versionController)
}

// add extra replacement for stuff
Expand Down
1 change: 1 addition & 0 deletions pkg/driver/common/generator/base_assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var (
"controller.yaml", "common/hypershift/controller_add_affinity_tolerations.yaml",
"controller.yaml", "common/hypershift/controller_add_kubeconfig_volume.yaml.patch",
"controller.yaml", "common/hypershift/controller_add_hypershift_managed_by_label.yaml",
"controller.yaml", "common/hypershift/controller_add_hypershift_desired_version_annotation.yaml",
)
)

Expand Down
3 changes: 3 additions & 0 deletions pkg/driver/common/operator/replacer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package operator

import (
"os"

"github.com/openshift/library-go/pkg/operator/status"
)

const (
Expand Down Expand Up @@ -67,5 +69,6 @@ func DefaultReplacements(controlPlaneNamespace, guestNamespace string) []string

pairs = append(pairs, []string{"${NAMESPACE}", controlPlaneNamespace}...)
pairs = append(pairs, []string{"${NODE_NAMESPACE}", guestNamespace}...)
pairs = append(pairs, []string{"${RELEASE_VERSION}", status.VersionForOperatorFromEnv()}...)
return pairs
}
13 changes: 13 additions & 0 deletions pkg/driver/openstack-cinder/openstack_cinder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/openshift/library-go/pkg/operator/csi/csidrivercontrollerservicecontroller"
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
)

const (
Expand Down Expand Up @@ -121,6 +122,18 @@ func GetOpenStackCinderOperatorControllerConfig(ctx context.Context, flavour gen
}
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, configMapSyncer)

if flavour == generator.FlavourHyperShift {
versionController := deploymentversioncontroller.NewDeploymentVersionController(
cfg.GetControllerName("DeploymentVersionController"),
c.ControlPlaneNamespace,
"openstack-cinder-csi-driver-controller",
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
c.OperatorClient,
c.ControlPlaneKubeClient,
c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, versionController)
}

return cfg, nil
}

Expand Down
13 changes: 13 additions & 0 deletions pkg/driver/openstack-manila/openstack_manila.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
"github.com/openshift/library-go/pkg/operator/resource/resourceread"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
Expand Down Expand Up @@ -157,6 +158,18 @@ func GetOpenStackManilaOperatorControllerConfig(ctx context.Context, flavour gen
return nil, err
}

if flavour == generator.FlavourHyperShift {
versionController := deploymentversioncontroller.NewDeploymentVersionController(
cfg.GetControllerName("DeploymentVersionController"),
c.ControlPlaneNamespace,
"openstack-manila-csi-controllerplugin",
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
c.OperatorClient,
c.ControlPlaneKubeClient,
c.EventRecorder)
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, versionController)
}

cfg.Precondition = func() (bool, error) {
openstackClient, err := client.NewOpenStackClient(util.CloudConfigFilename)
if err != nil {
Expand Down
143 changes: 143 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers/status.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading