Skip to content

Commit 951a2e6

Browse files
committed
hypershift: Add version annotation to controller Deployments
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.
1 parent 0bc8862 commit 951a2e6

File tree

3 files changed

+184
-1
lines changed

3 files changed

+184
-1
lines changed

pkg/driver/aws-ebs/aws_ebs.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/openshift/library-go/pkg/operator/csi/csidrivernodeservicecontroller"
2222
"github.com/openshift/library-go/pkg/operator/csi/csistorageclasscontroller"
2323
dc "github.com/openshift/library-go/pkg/operator/deploymentcontroller"
24+
"github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion"
2425
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
2526
appsv1 "k8s.io/api/apps/v1"
2627
corev1 "k8s.io/api/core/v1"
@@ -216,7 +217,15 @@ func GetAWSEBSOperatorControllerConfig(ctx context.Context, flavour generator.Cl
216217

217218
if flavour == generator.FlavourHyperShift {
218219
volumeTagController := NewEBSVolumeTagsController(cfg.GetControllerName("EBSVolumeTagsController"), c, c.EventRecorder)
219-
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, volumeTagController)
220+
versionController := deploymentversioncontroller.NewDeploymentVersionController(
221+
cfg.GetControllerName("EBSDeploymentVersionController"),
222+
c.ControlPlaneNamespace,
223+
"aws-ebs-csi-driver-controller",
224+
c.ControlPlaneKubeInformers.InformersFor(c.ControlPlaneNamespace).Apps().V1().Deployments(),
225+
c.OperatorClient,
226+
c.ControlPlaneKubeClient,
227+
c.EventRecorder)
228+
cfg.ExtraControlPlaneControllers = append(cfg.ExtraControlPlaneControllers, volumeTagController, versionController)
220229
cfg.DeploymentInformers = append(cfg.DeploymentInformers, c.KubeInformers.InformersFor("").Core().V1().PersistentVolumes().Informer())
221230
cfg.DeploymentInformers = append(cfg.DeploymentInformers, c.KubeInformers.InformersFor(awsEBSSecretNamespace).Core().V1().Secrets().Informer())
222231
}

vendor/github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion/version_controller.go

Lines changed: 173 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ github.com/openshift/library-go/pkg/operator/csi/csistorageclasscontroller
448448
github.com/openshift/library-go/pkg/operator/deploymentcontroller
449449
github.com/openshift/library-go/pkg/operator/events
450450
github.com/openshift/library-go/pkg/operator/genericoperatorclient
451+
github.com/openshift/library-go/pkg/operator/hypershift/deploymentversion
451452
github.com/openshift/library-go/pkg/operator/loglevel
452453
github.com/openshift/library-go/pkg/operator/management
453454
github.com/openshift/library-go/pkg/operator/managementstatecontroller

0 commit comments

Comments
 (0)