Move autoupdate-spec annotation removal

k8ssandra · Oct 2, 2024 · 2b8787a · 2b8787a
1 parent 04086dd
commit 2b8787a
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/pkg/reconciliation/constructor.go b/pkg/reconciliation/constructor.go
@@ -76,17 +76,6 @@ func setOperatorProgressStatus(rc *ReconciliationContext, newState api.ProgressS
 
  monitoring.UpdateOperatorDatacenterProgressStatusMetric(rc.Datacenter, newState)
 
- // The allow-upgrade=once annotation is temporary and should be removed after first successful reconcile
- if metav1.HasAnnotation(rc.Datacenter.ObjectMeta, api.UpdateAllowedAnnotation) && rc.Datacenter.Annotations[api.UpdateAllowedAnnotation] == string(api.AllowUpdateOnce) {
- // remove the annotation
- patch = client.MergeFrom(rc.Datacenter.DeepCopy())
- delete(rc.Datacenter.ObjectMeta.Annotations, api.UpdateAllowedAnnotation)
- if err := rc.Client.Patch(rc.Ctx, rc.Datacenter, patch); err != nil {
- rc.ReqLogger.Error(err, "error removing the allow-upgrade=once annotation")
- return err
- }
- }
-
  return nil
 }
 
@@ -104,5 +93,16 @@ func setDatacenterStatus(rc *ReconciliationContext) error {
  return err
  }
 
+ // The allow-upgrade=once annotation is temporary and should be removed after first successful reconcile
+ if metav1.HasAnnotation(rc.Datacenter.ObjectMeta, api.UpdateAllowedAnnotation) && rc.Datacenter.Annotations[api.UpdateAllowedAnnotation] == string(api.AllowUpdateOnce) {
+ // remove the annotation
+ patch := client.MergeFrom(rc.Datacenter.DeepCopy())
+ delete(rc.Datacenter.ObjectMeta.Annotations, api.UpdateAllowedAnnotation)
+ if err := rc.Client.Patch(rc.Ctx, rc.Datacenter, patch); err != nil {
+ rc.ReqLogger.Error(err, "error removing the allow-upgrade=once annotation")
+ return err
+ }
+ }
+
  return nil
 }