From 49aa6dae9a1466827068c8e9d6bf537f690a2e2d Mon Sep 17 00:00:00 2001 From: asterRyan <137432928+PeiranXu-108@users.noreply.github.com> Date: Mon, 1 Sep 2025 17:38:59 +0800 Subject: [PATCH] fix(dbprovider): the database deployed from the laf backup cannot be deleted (#5915) fix:The database deployed from the laf backup cannot be deleted --- frontend/providers/dbprovider/src/utils/json2Yaml.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frontend/providers/dbprovider/src/utils/json2Yaml.ts b/frontend/providers/dbprovider/src/utils/json2Yaml.ts index f958684db..97c6eb1cb 100644 --- a/frontend/providers/dbprovider/src/utils/json2Yaml.ts +++ b/frontend/providers/dbprovider/src/utils/json2Yaml.ts @@ -8,7 +8,8 @@ import { MigrationRemark, RedisHAConfig, crLabelKey, - defaultDBEditValue + defaultDBEditValue, + sealafDeployKey } from '@/constants/db'; import { StorageClassName } from '@/store/env'; import type { @@ -50,10 +51,16 @@ export const json2CreateCluster = ( const data: DBEditType = { ...defaultDBEditValue, ...rawData }; const resources = distributeResources(data); + // Remove sealaf-app label for restored databases to allow normal deletion + const filteredLabels = { ...data.labels }; + if (backupInfo?.name && filteredLabels[sealafDeployKey]) { + delete filteredLabels[sealafDeployKey]; + } + const metadata = { finalizers: ['cluster.kubeblocks.io/finalizer'], labels: { - ...data.labels, + ...filteredLabels, 'clusterdefinition.kubeblocks.io/name': data.dbType, 'clusterversion.kubeblocks.io/name': data.dbVersion, [crLabelKey]: data.dbName