From baa60d2821fe1ab195cf801d9ea46e2fa4b588b3 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@icloud.com>
Date: Tue, 11 Aug 2026 11:57:48 +0800
Subject: [PATCH] fix(kubeserver): remove deleted cluster resources

---
 pkg/kubeserver/initial/client.go            |  1 +
 pkg/kubeserver/models/history_data_clean.go | 81 +++++++++++++++++++++
 pkg/kubeserver/options/options.go           |  4 +
 3 files changed, 86 insertions(+)
 create mode 100644 pkg/kubeserver/models/history_data_clean.go

diff --git a/pkg/kubeserver/initial/client.go b/pkg/kubeserver/initial/client.go
index c48c91b0f..8bd6ba905 100644
--- a/pkg/kubeserver/initial/client.go
+++ b/pkg/kubeserver/initial/client.go
@@ -23,6 +23,7 @@ func InitClient(cron *cronman.SCronJobManager) {
 	client.InitClustersManager(manager.ClusterManager())
 
 	cron.AddJobEveryFewHour("AutoPurgeSplitable", 4, 30, 0, db.AutoPurgeSplitable, false)
+	cron.AddJobEveryFewDays("AutoCleanK8sHistoryData", 1, 3, 30, 0, models.AutoCleanK8sHistoryData, false)
 
 	cron.AddJobAtIntervalsWithStartRun("StartKubeClusterHealthCheck", 5*time.Minute, models.ClusterManager.ClusterHealthCheckTask, true)
 	cron.AddJobAtIntervalsWithStartRun("StartKubeClusterAutoSyncTask", 30*time.Minute, models.ClusterManager.StartAutoSyncTask, true)
diff --git a/pkg/kubeserver/models/history_data_clean.go b/pkg/kubeserver/models/history_data_clean.go
new file mode 100644
index 000000000..7f17db1ff
--- /dev/null
+++ b/pkg/kubeserver/models/history_data_clean.go
@@ -0,0 +1,81 @@
+package models
+
+import (
+	"context"
+	"time"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
+	"yunion.io/x/pkg/gotypes"
+
+	"yunion.io/x/onecloud/pkg/cloudcommon/db"
+	"yunion.io/x/onecloud/pkg/mcclient"
+
+	"yunion.io/x/kubecomps/pkg/kubeserver/options"
+)
+
+func collectClusterK8sManagers(man ISyncableManager, out *[]db.IHistoryDataManager) {
+	for _, sub := range man.GetSubManagers() {
+		collectClusterK8sManagers(sub, out)
+	}
+	if hM, ok := man.(db.IHistoryDataManager); ok {
+		*out = append(*out, hM)
+	}
+}
+
+// CleanK8sHistoryData hard-deletes soft-deleted rows of in-cluster K8s resources
+// (ClusterManager sub-tree). Cluster/Machine/Fed* are not included.
+func CleanK8sHistoryData(ctx context.Context, timeBefore time.Time) {
+	managers := make([]db.IHistoryDataManager, 0)
+	for _, man := range GetClusterManager().GetSubManagers() {
+		collectClusterK8sManagers(man, &managers)
+	}
+	for _, hM := range managers {
+		keyword := ""
+		if km, ok := hM.(db.IModelManager); ok {
+			keyword = km.Keyword()
+		}
+		start := time.Now()
+		cnt, err := hM.HistoryDataClean(ctx, timeBefore)
+		if err != nil {
+			log.Errorf("clean %s history data error: %v", keyword, err)
+			continue
+		}
+		if cnt > 0 {
+			log.Infof("clean %d %s history data cost %s", cnt, keyword, time.Since(start).Round(time.Second))
+		}
+	}
+}
+
+// AutoCleanK8sHistoryData is the cron entry that purges soft-deleted K8s resources
+// older than options.K8sHistoryDataKeepDays.
+func AutoCleanK8sHistoryData(ctx context.Context, userCred mcclient.TokenCredential, startRun bool) {
+	keepDays := options.Options.K8sHistoryDataKeepDays
+	if keepDays <= 0 {
+		keepDays = 30
+	}
+	timeBefore := time.Now().AddDate(0, 0, -keepDays)
+	log.Infof("AutoCleanK8sHistoryData start, keep_days=%d, before=%s", keepDays, timeBefore.Format(time.RFC3339))
+	CleanK8sHistoryData(ctx, timeBefore)
+}
+
+// PerformHistoryDataClean is the clusters class action that cleans soft-deleted
+// in-cluster K8s resources older than the given keep days.
+func (m *SClusterManager) PerformHistoryDataClean(
+	ctx context.Context,
+	userCred mcclient.TokenCredential,
+	query, data jsonutils.JSONObject,
+) (jsonutils.JSONObject, error) {
+	keepDays := options.Options.K8sHistoryDataKeepDays
+	if keepDays <= 0 {
+		keepDays = 30
+	}
+	if !gotypes.IsNil(data) && data.Contains("day") {
+		day, _ := data.Int("day")
+		keepDays = int(day)
+	}
+	timeBefore := time.Now().AddDate(0, 0, -keepDays)
+	log.Infof("PerformHistoryDataClean keep_days=%d, before=%s", keepDays, timeBefore.Format(time.RFC3339))
+	go CleanK8sHistoryData(ctx, timeBefore)
+	return nil, nil
+}
diff --git a/pkg/kubeserver/options/options.go b/pkg/kubeserver/options/options.go
index 06f727405..732680242 100644
--- a/pkg/kubeserver/options/options.go
+++ b/pkg/kubeserver/options/options.go
@@ -43,6 +43,10 @@ type KubeServerOptions struct {
 	OfflineRegistryServiceURL string `help:"offline registry service url"`
 
 	RunningMode string `help:"running mode" choices:"k8s|docker-compose" default:"k8s"`
+
+	// K8sHistoryDataKeepDays is how long soft-deleted in-cluster K8s resources
+	// (pods, deployments, etc.) are retained before hard delete. Default 30 days.
+	K8sHistoryDataKeepDays int `help:"days to keep soft-deleted k8s cluster resources" default:"30"`
 }
 
 const (