From e8890314472d25520baed852f869c04e6c165d84 Mon Sep 17 00:00:00 2001 From: yuyi Date: Tue, 7 May 2024 21:20:02 +0800 Subject: [PATCH] fix(finalizer): collect finalizers into oceanbase const --- internal/controller/observer_controller.go | 5 +++-- internal/controller/obtenant_controller.go | 3 ++- internal/controller/obtenantbackuppolicy_controller.go | 3 ++- internal/resource/obcluster/obcluster_task.go | 2 +- .../obtenantbackuppolicy/obtenantbackuppolicy_manager.go | 2 +- internal/resource/obzone/obzone_task.go | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/controller/observer_controller.go b/internal/controller/observer_controller.go index 6032b7266..2a704cde5 100644 --- a/internal/controller/observer_controller.go +++ b/internal/controller/observer_controller.go @@ -18,7 +18,7 @@ package controller import ( "context" - "fmt" + "strings" "time" "github.com/pkg/errors" @@ -31,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" v1alpha1 "github.com/oceanbase/ob-operator/api/v1alpha1" + oceanbaseconst "github.com/oceanbase/ob-operator/internal/const/oceanbase" resobserver "github.com/oceanbase/ob-operator/internal/resource/observer" "github.com/oceanbase/ob-operator/internal/telemetry" "github.com/oceanbase/ob-operator/pkg/coordinator" @@ -87,7 +88,7 @@ func (r *OBServerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c } // execute finalizers - finalizerName := fmt.Sprintf("observer.oceanbase.com.finalizers.%s", observer.Name) + finalizerName := strings.Join([]string{oceanbaseconst.FinalizerOBServer, observer.Name}, ".") if !observer.ObjectMeta.DeletionTimestamp.IsZero() { needExecuteFinalizer := false for _, finalizer := range observer.ObjectMeta.Finalizers { diff --git a/internal/controller/obtenant_controller.go b/internal/controller/obtenant_controller.go index f917e7281..2547f9b15 100644 --- a/internal/controller/obtenant_controller.go +++ b/internal/controller/obtenant_controller.go @@ -28,6 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" v1alpha1 "github.com/oceanbase/ob-operator/api/v1alpha1" + oceanbaseconst "github.com/oceanbase/ob-operator/internal/const/oceanbase" resobtenant "github.com/oceanbase/ob-operator/internal/resource/obtenant" "github.com/oceanbase/ob-operator/internal/telemetry" "github.com/oceanbase/ob-operator/pkg/coordinator" @@ -71,7 +72,7 @@ func (r *OBTenantReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c } if obtenant.ObjectMeta.DeletionTimestamp.IsZero() { - finalizerName := "finalizers.oceanbase.com.deleteobtenant" + finalizerName := oceanbaseconst.FinalizerDeleteOBTenant if !controllerutil.ContainsFinalizer(obtenant, finalizerName) { controllerutil.AddFinalizer(obtenant, finalizerName) err := r.Client.Update(ctx, obtenant) diff --git a/internal/controller/obtenantbackuppolicy_controller.go b/internal/controller/obtenantbackuppolicy_controller.go index 6b78bea50..8fa27ab20 100644 --- a/internal/controller/obtenantbackuppolicy_controller.go +++ b/internal/controller/obtenantbackuppolicy_controller.go @@ -25,6 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "github.com/oceanbase/ob-operator/api/v1alpha1" + oceanbaseconst "github.com/oceanbase/ob-operator/internal/const/oceanbase" resbackuppolicy "github.com/oceanbase/ob-operator/internal/resource/obtenantbackuppolicy" "github.com/oceanbase/ob-operator/internal/telemetry" "github.com/oceanbase/ob-operator/pkg/coordinator" @@ -57,7 +58,7 @@ func (r *OBTenantBackupPolicyReconciler) Reconcile(ctx context.Context, req ctrl return ctrl.Result{}, client.IgnoreNotFound(err) } - finalizerName := "obtenantbackuppolicy.finalizers.oceanbase.com" + finalizerName := oceanbaseconst.FinalizerBackupPolicy // examine DeletionTimestamp to determine if the policy is under deletion if policy.ObjectMeta.DeletionTimestamp.IsZero() { if !controllerutil.ContainsFinalizer(policy, finalizerName) { diff --git a/internal/resource/obcluster/obcluster_task.go b/internal/resource/obcluster/obcluster_task.go index 87c55485c..bc44224dd 100644 --- a/internal/resource/obcluster/obcluster_task.go +++ b/internal/resource/obcluster/obcluster_task.go @@ -158,7 +158,7 @@ func CreateOBZone(m *OBClusterManager) tasktypes.TaskError { labels := make(map[string]string) labels[oceanbaseconst.LabelRefUID] = string(m.OBCluster.GetUID()) labels[oceanbaseconst.LabelRefOBCluster] = m.OBCluster.Name - finalizerName := "finalizers.oceanbase.com.deleteobzone" + finalizerName := oceanbaseconst.FinalizerDeleteOBZone finalizers := []string{finalizerName} obzone := &v1alpha1.OBZone{ ObjectMeta: metav1.ObjectMeta{ diff --git a/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_manager.go b/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_manager.go index 974dc9791..4ce4d81a5 100644 --- a/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_manager.go +++ b/internal/resource/obtenantbackuppolicy/obtenantbackuppolicy_manager.go @@ -64,7 +64,7 @@ func (m *ObTenantBackupPolicyManager) GetStatus() string { func (m *ObTenantBackupPolicyManager) CheckAndUpdateFinalizers() error { policy := m.BackupPolicy - finalizerName := "obtenantbackuppolicy.finalizers.oceanbase.com" + finalizerName := oceanbaseconst.FinalizerBackupPolicy finalizerFinished := false if controllerutil.ContainsFinalizer(policy, finalizerName) { obcluster, err := m.getOBCluster() diff --git a/internal/resource/obzone/obzone_task.go b/internal/resource/obzone/obzone_task.go index 010c08e74..3e9fe1f3b 100644 --- a/internal/resource/obzone/obzone_task.go +++ b/internal/resource/obzone/obzone_task.go @@ -76,7 +76,7 @@ func CreateOBServer(m *OBZoneManager) tasktypes.TaskError { migrateAnnoVal, migrateAnnoExist := resourceutils.GetAnnotationField(m.OBZone, oceanbaseconst.AnnotationsSourceClusterAddress) for i := currentReplica; i < m.OBZone.Spec.Topology.Replica; i++ { serverName := m.generateServerName() - finalizerName := "finalizers.oceanbase.com.deleteobserver" + finalizerName := oceanbaseconst.FinalizerDeleteOBServer finalizers := []string{finalizerName} labels := make(map[string]string) cluster, _ := m.OBZone.Labels[oceanbaseconst.LabelRefOBCluster]