From 9f5ca3c0c2c23df18e2d14af70aec3a108e62ddf Mon Sep 17 00:00:00 2001 From: Suleyman Akbas Date: Thu, 23 Nov 2023 13:06:24 +0100 Subject: [PATCH] fix: reconcile annotations Signed-off-by: Suleyman Akbas --- controllers/topolvm_controller.go | 5 +++++ controllers/topolvm_node.go | 5 +++++ controllers/vgmanager.go | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/controllers/topolvm_controller.go b/controllers/topolvm_controller.go index 298811a98..4910b6e28 100644 --- a/controllers/topolvm_controller.go +++ b/controllers/topolvm_controller.go @@ -119,6 +119,11 @@ func (c topolvmController) setTopolvmControllerDesiredState(existing, desired *a existing.Spec.Template.Spec.Containers = desired.Spec.Template.Spec.Containers existing.Spec.Template.Spec.InitContainers = desired.Spec.Template.Spec.InitContainers + initMapIfNil(&existing.ObjectMeta.Annotations) + for key, value := range desired.Annotations { + existing.ObjectMeta.Annotations[key] = value + } + return nil } diff --git a/controllers/topolvm_node.go b/controllers/topolvm_node.go index 20b4681cb..8bdbc6beb 100644 --- a/controllers/topolvm_node.go +++ b/controllers/topolvm_node.go @@ -82,6 +82,11 @@ func (n topolvmNode) ensureCreated(r *LVMClusterReconciler, ctx context.Context, setDaemonsetNodeSelector(dsTemplate.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution, ds) } + initMapIfNil(&ds.ObjectMeta.Annotations) + for key, value := range dsTemplate.Annotations { + ds.ObjectMeta.Annotations[key] = value + } + return nil }) diff --git a/controllers/vgmanager.go b/controllers/vgmanager.go index 492414c2d..35ec59f59 100644 --- a/controllers/vgmanager.go +++ b/controllers/vgmanager.go @@ -77,6 +77,11 @@ func (v vgManager) ensureCreated(r *LVMClusterReconciler, ctx context.Context, l ds.Spec.Template.ObjectMeta.Labels[key] = value } + initMapIfNil(&ds.ObjectMeta.Annotations) + for key, value := range dsTemplate.Annotations { + ds.ObjectMeta.Annotations[key] = value + } + // containers ds.Spec.Template.Spec.Containers = dsTemplate.Spec.Template.Spec.Containers