fix: bugs in backup policy creation

Author: lizzy-0323

internal/cli/backup/create.go

@@ -75,21 +75,18 @@ func buildBackupPolicyApiType(nn types.NamespacedName, obcluster string, p *Crea
 		JobKeepWindow: numberToDay(p.JobKeepDays),
 		LogArchive: v1alpha1.LogArchiveConfig{
 			Destination: apitypes.BackupDestination{
-				Path:            p.ArchivePath,
-				Type:            apitypes.BackupDestType(p.DestType),
-				OSSAccessSecret: "",
+				Path: p.ArchivePath,
+				Type: apitypes.BackupDestType(p.DestType),
 			},
 			SwitchPieceInterval: "1d",
 		},
 		DataBackup: v1alpha1.DataBackupConfig{
 			Destination: apitypes.BackupDestination{
-				Path:            p.BakDataPath,
-				Type:            apitypes.BackupDestType(p.DestType),
-				OSSAccessSecret: "",
+				Path: p.BakDataPath,
+				Type: apitypes.BackupDestType(p.DestType),
 			},
 			FullCrontab:        p.FullCrontab,
 			IncrementalCrontab: p.IncrementalCrontab,
-			EncryptionSecret:   "",
 		},
 		DataClean: v1alpha1.CleanPolicy{
 			RecoveryWindow: numberToDay(p.RecoveryDays),
@@ -114,6 +111,10 @@ func CreateTenantBackupPolicy(ctx context.Context, o *CreateOptions) (*v1alpha1.
 	if err := util.CheckTenantStatus(tenant); err != nil {
 		return nil, err
 	}
+	// Check if backup policy already exists
+	if backupPolicy, _ := clients.GetTenantBackupPolicy(ctx, nn); backupPolicy != nil {
+		return nil, errors.New("Backup policy already exists")
+	}
 	backupPolicy, err := buildBackupPolicyApiType(nn, tenant.Spec.ClusterName, o)
 	if err != nil {
 		return nil, err
@@ -154,11 +155,17 @@ func CreateTenantBackupPolicy(ctx context.Context, o *CreateOptions) (*v1alpha1.
 			return nil, err
 		}
 	}
+	blockOwnerDeletion := true
+	backupPolicy.SetOwnerReferences([]metav1.OwnerReference{{
+		APIVersion:         tenant.APIVersion,
+		Kind:               tenant.Kind,
+		Name:               tenant.GetObjectMeta().GetName(),
+		UID:                tenant.GetObjectMeta().GetUID(),
+		BlockOwnerDeletion: &blockOwnerDeletion,
+	}})
 	// set labels for backup policy
 	backupPolicy.Labels = map[string]string{
-		oceanbaseconst.LabelTenantName:      o.Name,
-		oceanbaseconst.LabelRefUID:          string(tenant.GetObjectMeta().GetUID()),
-		oceanbaseconst.LabelRefBackupPolicy: o.Name + "-backup-policy",
+		oceanbaseconst.LabelRefOBServer: string(tenant.Spec.ClusterName),
 	}
 	policy, err := clients.CreateTenantBackupPolicy(ctx, backupPolicy)
 	if err != nil {

internal/cli/backup/delete.go

@@ -14,21 +14,39 @@ See the Mulan PSL v2 for more details.
 package backup
 
 import (
+	"context"
+
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/oceanbase/ob-operator/internal/cli/generic"
+	"github.com/oceanbase/ob-operator/internal/clients"
 )
 
 type DeleteOptions struct {
 	generic.ResourceOption
+	force bool
 }
 
 func NewDeleteOptions() *DeleteOptions {
 	return &DeleteOptions{}
 }
 
+func DeleteTenantBackupPolicy(ctx context.Context, o *DeleteOptions) error {
+	nn := types.NamespacedName{Name: o.Name, Namespace: o.Namespace}
+	policy, err := clients.GetTenantBackupPolicy(ctx, nn)
+	if err != nil {
+		return err
+	}
+	if o.force {
+		return clients.ForceDeleteTenantBackupPolicy(ctx, types.NamespacedName{Name: policy.Name, Namespace: policy.Namespace})
+	}
+	return clients.DeleteTenantBackupPolicy(ctx, types.NamespacedName{Name: policy.Name, Namespace: policy.Namespace})
+}
+
 // AddFlags add basic flags for tenant management
 func (o *DeleteOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&o.Name, FLAG_NAME, "", "The name of the ob tenant")
 	cmd.Flags().StringVar(&o.Namespace, FLAG_NAMESPACE, DEFAULT_NAMESPACE, "The namespace of the ob tenant")
+	cmd.Flags().BoolVarP(&o.force, FLAG_FORCE, "f", DEFAULT_FORCE, "Force delete the ob tenant backup policy")
 }

internal/cli/backup/enter.go

@@ -38,10 +38,14 @@ const (
 	// Schedule flags
 	FLAG_INCREMENTAL = "inc"
 	FLAG_FULL        = "full"
+
 	// Access flags
 	FLAG_OSS_ACCESS_ID           = "oss-access-id"
 	FLAG_OSS_ACCESS_KEY          = "oss-access-key"
 	FLAG_BAK_ENCRYPTION_PASSWORD = "bak-encryption-password"
+
+	// Force flag
+	FLAG_FORCE = "force"
 )
 
 // Default values for backup policy management
@@ -55,4 +59,5 @@ const (
 	DEFAULT_SCHEDULE_TYPE       = "weekly"
 	DEFAULT_BACKUP_TYPE         = "full"
 	DEFAULT_STATUS              = "RUNNING"
+	DEFAULT_FORCE               = false
 )

internal/cli/cmd/backup/delete.go

@@ -15,11 +15,9 @@ package backup
 
 import (
 	"github.com/spf13/cobra"
-	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/oceanbase/ob-operator/internal/cli/backup"
 	cmdUtil "github.com/oceanbase/ob-operator/internal/cli/cmd/util"
-	"github.com/oceanbase/ob-operator/internal/clients"
 )
 
 // NewDeleteCmd delete backup policy
@@ -33,11 +31,7 @@ func NewDeleteCmd() *cobra.Command {
 		Args:    cobra.ExactArgs(1),
 		PreRunE: o.Parse,
 		Run: func(cmd *cobra.Command, args []string) {
-			err := clients.DeleteTenantBackupPolicy(cmd.Context(), types.NamespacedName{
-				Namespace: o.Namespace,
-				Name:      o.Name + "-backup-policy",
-			})
-			if err != nil {
+			if err := backup.DeleteTenantBackupPolicy(cmd.Context(), o); err != nil {
 				logger.Fatalln(err)
 			}
 			logger.Printf("Delete backup policy for OBTenant %s successfully", o.Name)

internal/cli/generated/bindata/bindata.go

@@ -29,5 +29,5 @@ func NewListOptions() *ListOptions {
 }
 
 func (o *ListOptions) AddFlags(cmd *cobra.Command) {
-	cmd.Flags().StringVar(&o.Namespace, FLAG_NAMESPACE, DEFAULT_NAMESPACE, "The cluster name tenant belonged to in k8s, if not set, use the default namespace")
+	cmd.Flags().StringVar(&o.Namespace, FLAG_NAMESPACE, DEFAULT_NAMESPACE, "The namespace tenant belonged to in k8s, if not set, use the default namespace")
 }