feat: implement business service in trisolaris

ZhengYa-0110 · SongZhen0704 · commit a2e3ca829e49 · 2025-11-01T16:08:45.000+08:00
diff --git a/server/controller/common/const.go b/server/controller/common/const.go
@@ -747,6 +747,12 @@ const CLICK_HOUSE_VERSION = "24"
 const TAP_TYPE_VALUE_CLOUD_NETWORK = 3
 
 const (
-	CUSTOM_SERVICE_TYPE_IP   = 1
-	CUSTOM_SERVICE_TYPE_PORT = 2
+	CUSTOM_SERVICE_TYPE_IP          = 1
+	CUSTOM_SERVICE_TYPE_PORT        = 2
+	CUSTOM_SERVICE_TYPE_CHOST       = 3
+	CUSTOM_SERVICE_TYPE_POD_SERVICE = 4
+	CUSTOM_SERVICE_TYPE_POD_GROUP   = 5
+
+	CUSTOM_SERVICE_MATCH_TYPE_NAME = 1
+	CUSTOM_SERVICE_MATCH_TYPE_UID  = 2
 )
diff --git a/server/controller/common/resource_type.go b/server/controller/common/resource_type.go
@@ -48,6 +48,7 @@ const (
 	RESOURCE_TYPE_POD_NODE_EN                        = "pod_node"
 	RESOURCE_TYPE_VM_POD_NODE_CONNECTION_EN          = "vm_pod_node_connection"
 	RESOURCE_TYPE_POD_NAMESPACE_EN                   = "pod_namespace"
+	RESOURCE_TYPE_POD_NS_EN                          = "pod_ns" // pod_ns is alias of pod_namespace
 	RESOURCE_TYPE_POD_INGRESS_EN                     = "pod_ingress"
 	RESOURCE_TYPE_POD_INGRESS_RULE_EN                = "pod_ingress_rule"
 	RESOURCE_TYPE_POD_INGRESS_RULE_BACKEND_EN        = "pod_ingress_rule_backend"
diff --git a/server/controller/db/mysql/migrator/schema/rawsql/init.sql b/server/controller/db/mysql/migrator/schema/rawsql/init.sql
@@ -732,6 +732,7 @@ CREATE TABLE IF NOT EXISTS pod_cluster (
     region              CHAR(64) DEFAULT '',
     sub_domain          CHAR(64) DEFAULT '',
     domain              CHAR(64) DEFAULT '',
+    uid                 CHAR(64) DEFAULT '',
     lcuuid              CHAR(64) DEFAULT '',
     created_at          DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at          DATETIME NOT NULL ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
@@ -863,6 +864,7 @@ CREATE TABLE IF NOT EXISTS pod_namespace (
     region              CHAR(64) DEFAULT '',
     sub_domain          CHAR(64) DEFAULT '',
     domain              CHAR(64) DEFAULT '',
+    uid                 CHAR(64) DEFAULT '',
     lcuuid              CHAR(64) DEFAULT '',
     created_at          DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at          DATETIME NOT NULL ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
@@ -2729,7 +2731,7 @@ CREATE TABLE IF NOT EXISTS custom_service (
     id                  INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
     name                VARCHAR(128) NOT NULL,
     type                INTEGER DEFAULT 0 COMMENT '0: unknown 1: IP 2: PORT 3: chost 4: pod_service 5: pod_group',
-    match_type          INTEGER DEFAULT 0 COMMENT '0: unkonwn 1: name match 2: uid match',
+    match_type          INTEGER DEFAULT 1 COMMENT '0: unkonwn 1: name match 2: uid match',
     epc_id              INTEGER DEFAULT 0,
     pod_cluster_id      INTEGER DEFAULT 0,
     pod_namespace_id    INTEGER DEFAULT 0,
diff --git a/server/controller/db/mysql/migrator/schema/rawsql/issu/6.6.1.53.sql b/server/controller/db/mysql/migrator/schema/rawsql/issu/6.6.1.53.sql
@@ -24,6 +24,8 @@ BEGIN
     END IF;
 END;
 
+CALL AddColumnIfNotExists('pod_cluster', 'uid', "CHAR(64) DEFAULT ''", 'domain');
+CALL AddColumnIfNotExists('pod_namespace', 'uid', "CHAR(64) DEFAULT ''", 'domain');
 CALL AddColumnIfNotExists('pod_service', 'uid', "CHAR(64) DEFAULT ''", 'domain');
 CALL AddColumnIfNotExists('pod_group', 'uid', "CHAR(64) DEFAULT ''", 'domain');
 CALL AddColumnIfNotExists('custom_service', 'match_type', "INTEGER DEFAULT 0 COMMENT '0: unkonwn 1: name match 2: uid match'", 'type');
@@ -33,6 +35,13 @@ CALL AddColumnIfNotExists('custom_service', 'pod_cluster_id', "INTEGER DEFAULT 0
 DROP PROCEDURE AddColumnIfNotExists;
 
 ALTER TABLE custom_service MODIFY COLUMN type INTEGER DEFAULT 0 COMMENT '0: unknown 1: IP 2: PORT 3: chost 4: pod_service 5: pod_group';
-ALTER TABLE custom_service MODIFY COLUMN match_type INTEGER DEFAULT 0 COMMENT '0: unkonwn 1: name match 2: uid match';
+ALTER TABLE custom_service MODIFY COLUMN match_type INTEGER DEFAULT 1 COMMENT '0: unkonwn 1: name match 2: uid match';
+
+UPDATE pod_cluster SET uid = CONCAT('pod_cluster-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
+UPDATE pod_namespace SET uid = CONCAT('pod_ns-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
+UPDATE pod_service SET uid = CONCAT('pod_service-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
+UPDATE pod_group SET uid = CONCAT('pod_group-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
+UPDATE vm SET uid = CONCAT('chost-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
+UPDATE epc SET uid = CONCAT('vpc-', UUID_SHORT()) WHERE uid IS NULL OR uid = '';
 
 UPDATE db_version SET version='6.6.1.53';
diff --git a/server/controller/db/mysql/migrator/schema/version.go b/server/controller/db/mysql/migrator/schema/version.go
@@ -18,7 +18,7 @@ package schema
 
 const (
 	DB_VERSION_TABLE    = "db_version"
-	DB_VERSION_EXPECTED = "6.6.1.52"
+	DB_VERSION_EXPECTED = "6.6.1.53"
 )
 
 const (
diff --git a/server/controller/db/mysql/model/platform_rsc_model.go b/server/controller/db/mysql/model/platform_rsc_model.go
@@ -743,6 +743,7 @@ type PodCluster struct {
 	Region         string `gorm:"column:region;type:char(64);default:''" json:"REGION" mapstructure:"REGION"`
 	SubDomain      string `gorm:"column:sub_domain;type:char(64);default:''" json:"SUB_DOMAIN" mapstructure:"SUB_DOMAIN"`
 	Domain         string `gorm:"column:domain;type:char(64);not null" json:"DOMAIN" mapstructure:"DOMAIN"`
+	UID            string `gorm:"column:uid;type:char(64);default:''" json:"UID" mapstructure:"UID"`
 }
 
 func (p PodCluster) GetDomainLcuuid() string {
@@ -764,6 +765,7 @@ type PodNamespace struct {
 	Domain           string            `gorm:"column:domain;type:char(64);not null" json:"DOMAIN" mapstructure:"DOMAIN"`
 	LearnedCloudTags map[string]string `gorm:"column:learned_cloud_tags;type:text;default:'';serializer:json" json:"LEARNED_CLOUD_TAGS" mapstructure:"LEARNED_CLOUD_TAGS"`
 	CustomCloudTags  map[string]string `gorm:"column:custom_cloud_tags;type:text;default:'';serializer:json" json:"CUSTOM_CLOUD_TAGS" mapstructure:"CUSTOM_CLOUD_TAGS"`
+	UID              string            `gorm:"column:uid;type:char(64);default:''" json:"UID" mapstructure:"UID"`
 }
 
 func (p PodNamespace) GetDomainLcuuid() string {
@@ -1085,7 +1087,7 @@ type CustomService struct {
 	OperatedTime   `gorm:"embedded" mapstructure:",squash"`
 	Name           string `gorm:"column:name;type:varchar(128);default:''" json:"NAME" mapstructure:"NAME"`
 	Type           int    `gorm:"column:type;type:int;default:0" json:"TYPE" mapstructure:"TYPE"`
-	MatchType      int    `gorm:"column:match_type;type:int;default:0" json:"MATCH_TYPE" mapstructure:"MATCH_TYPE"`
+	MatchType      int    `gorm:"column:match_type;type:int;default:1" json:"MATCH_TYPE" mapstructure:"MATCH_TYPE"`
 	VPCID          int    `gorm:"column:epc_id;type:int;default:0" json:"EPC_ID" mapstructure:"EPC_ID"`
 	PodClusterID   int    `gorm:"column:pod_cluster_id;type:int;default:0" json:"POD_CLUSTER_ID" mapstructure:"POD_CLUSTER_ID"`
 	PodNamespaceID int    `gorm:"column:pod_namespace_id;type:int;default:0" json:"POD_NAMESPACE_ID" mapstructure:"POD_NAMESPACE_ID"`
diff --git a/server/controller/recorder/updater/pod_cluster.go b/server/controller/recorder/updater/pod_cluster.go
@@ -96,6 +96,7 @@ func (c *PodCluster) generateDBItemToAdd(cloudItem *cloudmodel.PodCluster) (*mys
 		Region:      cloudItem.RegionLcuuid,
 		AZ:          cloudItem.AZLcuuid,
 		VPCID:       vpcID,
+		UID:         ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_CLUSTER_EN),
 	}
 	dbItem.Lcuuid = cloudItem.Lcuuid
 	return dbItem, true
diff --git a/server/controller/recorder/updater/pod_group.go b/server/controller/recorder/updater/pod_group.go
@@ -108,10 +108,7 @@ func (p *PodGroup) generateDBItemToAdd(cloudItem *cloudmodel.PodGroup) (*mysqlmo
 		log.Errorf("failed to convert %s spec JSON to YAML: %s", p.resourceType, cloudItem.Spec, p.metadata.LogPrefixes)
 		return nil, false
 	}
-	// TODO is label required
-	if cloudItem.Label == "" {
-		cloudItem.Label = ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_CHOST_EN)
-	}
+
 	dbItem := &mysqlmodel.PodGroup{
 		Name:           cloudItem.Name,
 		Type:           cloudItem.Type,
@@ -127,6 +124,7 @@ func (p *PodGroup) generateDBItemToAdd(cloudItem *cloudmodel.PodGroup) (*mysqlmo
 		Domain:         p.metadata.GetDomainLcuuid(),
 		Region:         cloudItem.RegionLcuuid,
 		AZ:             cloudItem.AZLcuuid,
+		UID:            ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_GROUP_EN),
 	}
 	dbItem.Lcuuid = cloudItem.Lcuuid
 	return dbItem, true
@@ -149,13 +147,6 @@ func (p *PodGroup) generateUpdateInfo(diffBase *diffbase.PodGroup, cloudItem *cl
 		structInfo.PodNum.Set(diffBase.PodNum, cloudItem.PodNum)
 	}
 
-	if cloudItem.Label == "" {
-		if diffBase.Label == "" {
-			cloudItem.Label = ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_CHOST_EN)
-		} else {
-			cloudItem.Label = diffBase.Label
-		}
-	}
 	if diffBase.Label != cloudItem.Label {
 		mapInfo["label"] = cloudItem.Label
 		structInfo.Label.Set(diffBase.Label, cloudItem.Label)
diff --git a/server/controller/recorder/updater/pod_namespace.go b/server/controller/recorder/updater/pod_namespace.go
@@ -103,6 +103,7 @@ func (n *PodNamespace) generateDBItemToAdd(cloudItem *cloudmodel.PodNamespace) (
 		AZ:               cloudItem.AZLcuuid,
 		LearnedCloudTags: cloudTags,
 		CustomCloudTags:  make(map[string]string),
+		UID:              ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_NAMESPACE_EN),
 	}
 	dbItem.Lcuuid = cloudItem.Lcuuid
 	return dbItem, true
diff --git a/server/controller/recorder/updater/pod_service.go b/server/controller/recorder/updater/pod_service.go
@@ -126,10 +126,7 @@ func (s *PodService) generateDBItemToAdd(cloudItem *cloudmodel.PodService) (*mys
 		log.Errorf("failed to convert %s spec JSON to YAML: %s", s.resourceType, cloudItem.Spec, s.metadata.LogPrefixes)
 		return nil, false
 	}
-	// TODO is label required
-	if cloudItem.Label == "" {
-		cloudItem.Label = ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_CHOST_EN)
-	}
+
 	dbItem := &mysqlmodel.PodService{
 		Name:             cloudItem.Name,
 		Label:            cloudItem.Label,
@@ -150,7 +147,7 @@ func (s *PodService) generateDBItemToAdd(cloudItem *cloudmodel.PodService) (*mys
 		Region:           cloudItem.RegionLcuuid,
 		AZ:               cloudItem.AZLcuuid,
 		VPCID:            vpcID,
-		UID:              cloudItem.Label,
+		UID:              ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_SERVICE_EN),
 	}
 	dbItem.Lcuuid = cloudItem.Lcuuid
 	return dbItem, true
@@ -181,13 +178,6 @@ func (s *PodService) generateUpdateInfo(diffBase *diffbase.PodService, cloudItem
 		structInfo.Name.Set(diffBase.Name, cloudItem.Name)
 	}
 
-	if cloudItem.Label == "" {
-		if diffBase.Label == "" {
-			cloudItem.Label = ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_CHOST_EN)
-		} else {
-			cloudItem.Label = diffBase.Label
-		}
-	}
 	if diffBase.Label != cloudItem.Label {
 		mapInfo["label"] = cloudItem.Label
 		structInfo.Label.Set(diffBase.Label, cloudItem.Label)
diff --git a/server/controller/trisolaris/dbcache/db_data.go b/server/controller/trisolaris/dbcache/db_data.go
@@ -478,7 +478,7 @@ func (d *DBDataCache) GetDataCacheFromDB(db *gorm.DB) {
 	}
 
 	podServices, err := dbmgr.DBMgr[models.PodService](db).GetFields([]string{
-		"id", "name", "type", "service_cluster_ip", "pod_namespace_id", "pod_cluster_id", "epc_id", "az",
+		"id", "name", "type", "service_cluster_ip", "pod_namespace_id", "pod_cluster_id", "epc_id", "az", "uid",
 	})
 	if err == nil {
 		d.podServices = podServices
@@ -513,7 +513,7 @@ func (d *DBDataCache) GetDataCacheFromDB(db *gorm.DB) {
 	} else {
 		log.Error(d.Log(err.Error()))
 	}
-	podGroups, err := dbmgr.DBMgr[models.PodGroup](db).GetFields([]string{"id", "name", "type"})
+	podGroups, err := dbmgr.DBMgr[models.PodGroup](db).GetFields([]string{"id", "name", "type", "uid"})
 	if err == nil {
 		d.podGroups = podGroups
 	} else {
diff --git a/server/controller/trisolaris/metadata/service_data.go b/server/controller/trisolaris/metadata/service_data.go
@@ -18,6 +18,7 @@ package metadata
 
 import (
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -37,6 +38,7 @@ type ServiceRawData struct {
 	podGroupIDToPodServiceID      map[int]int
 	lbIDToVPCID                   map[int]int
 	customServiceIDToIPPorts      map[int]mapset.Set[customServiceIPPortKey]
+	customServiceIDToResourceIDs  map[int][]uint32
 }
 
 type customServiceIPPortKey struct {
@@ -64,6 +66,7 @@ func newServiceRawData() *ServiceRawData {
 		podGroupIDToPodServiceID:      make(map[int]int),
 		lbIDToVPCID:                   make(map[int]int),
 		customServiceIDToIPPorts:      make(map[int]mapset.Set[customServiceIPPortKey]),
+		customServiceIDToResourceIDs:  make(map[int][]uint32),
 	}
 }
 
@@ -139,25 +142,84 @@ func (r *ServiceRawData) ConvertDBData(md *MetaData) {
 	}
 	r.podGroupIDToPodServiceID = podGroupIDToPodServiceID
 
-	r.customServiceIDToIPPorts = r.mergeCustomServices(md, dbDataCache.GetCustomServices())
+	r.mergeCustomServices(md, dbDataCache)
 }
 
-// VPC 内去重规则：
+// IP/PORT 类型 VPC 内去重规则：
 // 1. 按照 ip-port 元素去重后，ip-port 绑定第一个遍历到的服务
 // 2. 如果存在 ip-port 的 port 为空，则其他 ip-port 都丢弃，只保留这一个值
 // mergeCustomServices merges custom services according to the following rules:
 // 1. Deduplicate by ip-port, binding each ip-port to the first encountered service.
 // 2. If any ip has an empty port, discard all other ports for that ip and keep only the empty-port entry.
-func (r *ServiceRawData) mergeCustomServices(md *MetaData, customServices []*models.CustomService) map[int]mapset.Set[customServiceIPPortKey] {
+func (r *ServiceRawData) mergeCustomServices(md *MetaData, dbDataCache *dbcache.DBDataCache) {
+	vmUIDToID := make(map[string]int)
+	vmNameToID := make(map[string]int)
+	for _, vm := range dbDataCache.GetVms() {
+		vmUIDToID[vm.UID] = vm.ID
+		vmNameToID[vm.Name] = vm.ID
+	}
+	podServiceUIDToID := make(map[string]int)
+	podServiceNameToID := make(map[string]int)
+	for _, podService := range dbDataCache.GetPodServices() {
+		podServiceUIDToID[podService.UID] = podService.ID
+		podServiceNameToID[podService.Name] = podService.ID
+	}
+	podGroupUIDToID := make(map[string]int)
+	podGroupNameToID := make(map[string]int)
+	for _, podGroup := range dbDataCache.GetPodGroups() {
+		podGroupUIDToID[podGroup.UID] = podGroup.ID
+		podGroupNameToID[podGroup.Name] = podGroup.ID
+	}
+
+	customServices := dbDataCache.GetCustomServices()
 	customServiceIDToIPPorts := make(map[int]mapset.Set[customServiceIPPortKey])
+	customServiceIDToResourceIDs := make(map[int][]uint32)
+
 	ipPortKeyToServiceID := make(map[customServiceIPPortKey]int) // 记录每个 ip-port 绑定的服务ID
 	hasEmptyPortForIP := make(map[string]bool)                   // 记录每个 VPC 内的 IP 是否有空端口，key格式为 "vpcID:ip"
 
 	for _, cs := range customServices {
+		resources := strings.Split(cs.Resource, ",")
+		if slices.Contains([]int{CUSTOM_SERVICE_TYPE_CHOST, CUSTOM_SERVICE_TYPE_POD_SERVICE, CUSTOM_SERVICE_TYPE_POD_GROUP}, cs.Type) {
+			resourceIDs := make([]uint32, 0)
+			var resourceIDMap map[string]int
+			switch cs.Type {
+			case CUSTOM_SERVICE_TYPE_CHOST:
+				if cs.MatchType == CUSTOM_SERVICE_MATCH_TYPE_UID {
+					resourceIDMap = vmUIDToID
+				} else {
+					resourceIDMap = vmNameToID
+				}
+			case CUSTOM_SERVICE_TYPE_POD_SERVICE:
+				if cs.MatchType == CUSTOM_SERVICE_MATCH_TYPE_UID {
+					resourceIDMap = podServiceUIDToID
+				} else {
+					resourceIDMap = podServiceNameToID
+				}
+			case CUSTOM_SERVICE_TYPE_POD_GROUP:
+				if cs.MatchType == CUSTOM_SERVICE_MATCH_TYPE_UID {
+					resourceIDMap = podGroupUIDToID
+				} else {
+					resourceIDMap = podGroupNameToID
+				}
+			default:
+				continue
+			}
+			for _, resource := range resources {
+				resource = strings.TrimSpace(resource)
+				if resource == "" {
+					continue
+				}
+				if id, ok := resourceIDMap[resource]; ok {
+					resourceIDs = append(resourceIDs, uint32(id))
+				}
+			}
+			customServiceIDToResourceIDs[cs.ID] = resourceIDs
+		}
 		var ipPorts []customServiceIPPortKey
 
 		if cs.Type == CUSTOM_SERVICE_TYPE_IP {
-			ips := strings.Split(cs.Resource, ",")
+			ips := resources
 			for _, ip := range ips {
 				ip = strings.TrimSpace(ip)
 				if ip == "" {
@@ -168,7 +230,7 @@ func (r *ServiceRawData) mergeCustomServices(md *MetaData, customServices []*mod
 				ipPorts = append(ipPorts, ipPortKey)
 			}
 		} else {
-			ipPortStrs := strings.Split(cs.Resource, ",")
+			ipPortStrs := resources
 			for _, ipPortStr := range ipPortStrs {
 				ipPortStr = strings.TrimSpace(ipPortStr)
 				if ipPortStr == "" {
@@ -222,7 +284,8 @@ func (r *ServiceRawData) mergeCustomServices(md *MetaData, customServices []*mod
 		customServiceIDToIPPorts[serviceID] = newIPPorts
 	}
 
-	return customServiceIDToIPPorts
+	r.customServiceIDToIPPorts = customServiceIDToIPPorts
+	r.customServiceIDToResourceIDs = customServiceIDToResourceIDs
 }
 
 func (s *ServiceDataOP) updateServiceRawData(serviceRawData *ServiceRawData) {
@@ -461,6 +524,26 @@ func (s *ServiceDataOP) mergeCustomServices(dbDataCache *dbcache.DBDataCache) []
 	serviceTypeCustomService := trident.ServiceType_CUSTOM_SERVICE
 
 	for _, customService := range dbDataCache.GetCustomServices() {
+		if slices.Contains([]int{CUSTOM_SERVICE_TYPE_CHOST, CUSTOM_SERVICE_TYPE_POD_SERVICE, CUSTOM_SERVICE_TYPE_POD_GROUP}, customService.Type) {
+
+			service := &trident.ServiceInfo{
+				Type:         &serviceTypeCustomService,
+				Id:           proto.Uint32(uint32(customService.ID)),
+				EpcId:        proto.Uint32(uint32(customService.VPCID)),
+				PodClusterId: proto.Uint32(uint32(customService.PodClusterID)),
+			}
+			switch customService.Type {
+			case CUSTOM_SERVICE_TYPE_CHOST:
+				service.ChostIds = s.serviceRawData.customServiceIDToResourceIDs[customService.ID]
+			case CUSTOM_SERVICE_TYPE_POD_SERVICE:
+				service.PodServiceIds = s.serviceRawData.customServiceIDToResourceIDs[customService.ID]
+			case CUSTOM_SERVICE_TYPE_POD_GROUP:
+				service.PodGroupIds = s.serviceRawData.customServiceIDToResourceIDs[customService.ID]
+			}
+			services = append(services, service)
+			continue
+		}
+
 		ipPorts, ok := s.serviceRawData.customServiceIDToIPPorts[customService.ID]
 		if !ok {
 			continue

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package schema`
`18`	`18`
`19`	`19`	`const (`
`20`	`20`	`DB_VERSION_TABLE = "db_version"`
`21`		`- DB_VERSION_EXPECTED = "6.6.1.52"`
	`21`	`+ DB_VERSION_EXPECTED = "6.6.1.53"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ func (c PodCluster) generateDBItemToAdd(cloudItem cloudmodel.PodCluster) (*mys`
`96`	`96`	`Region: cloudItem.RegionLcuuid,`
`97`	`97`	`AZ: cloudItem.AZLcuuid,`
`98`	`98`	`VPCID: vpcID,`
	`99`	`+ UID: ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_CLUSTER_EN),`
`99`	`100`	`}`
`100`	`101`	`dbItem.Lcuuid = cloudItem.Lcuuid`
`101`	`102`	`return dbItem, true`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ func (n PodNamespace) generateDBItemToAdd(cloudItem cloudmodel.PodNamespace) (`
`103`	`103`	`AZ: cloudItem.AZLcuuid,`
`104`	`104`	`LearnedCloudTags: cloudTags,`
`105`	`105`	`CustomCloudTags: make(map[string]string),`
	`106`	`+ UID: ctrlrcommon.GenerateResourceShortUUID(ctrlrcommon.RESOURCE_TYPE_POD_NAMESPACE_EN),`
`106`	`107`	`}`
`107`	`108`	`dbItem.Lcuuid = cloudItem.Lcuuid`
`108`	`109`	`return dbItem, true`