fix(k8s-dbs): 修正meta中FindByParams函数的查询条件缺少K8sClusterConfig的ID TencentBlueKing#10808

Shinnosukeys · groobyming · commit 3d6fc750b596 · 2025-05-28T18:27:19.000+08:00
diff --git a/dbm-services/k8s-dbs/core/helper/opsrequest_helper.go b/dbm-services/k8s-dbs/core/helper/opsrequest_helper.go
@@ -712,10 +712,12 @@ func UpdateValWithHScaling(
 func UpdateValWithCompList(
 	releaseMetaProvider metaprovider.AddonClusterReleaseProvider,
 	request *entity.Request,
+	k8sClusterConfigID uint64,
 ) (*metaentity.AddonClusterReleaseEntity, error) {
 	paramsRelease := map[string]interface{}{
-		"release_name": request.ClusterName,
-		"namespace":    request.Namespace,
+		"k8s_cluster_config_id": k8sClusterConfigID,
+		"release_name":          request.ClusterName,
+		"namespace":             request.Namespace,
 	}
 	releaseEntity, err := releaseMetaProvider.FindByParams(paramsRelease)
 	if err != nil {
diff --git a/dbm-services/k8s-dbs/core/provider/cluster_provider.go b/dbm-services/k8s-dbs/core/provider/cluster_provider.go
@@ -273,8 +273,9 @@ func (c *ClusterProvider) UpdateCluster(request *coreentity.Request) error {
 
 	// replace with the updated value
 	paramsRelease := map[string]interface{}{
-		"release_name": request.ClusterName,
-		"namespace":    request.Namespace,
+		"k8s_cluster_config_id": k8sClusterConfig.ID,
+		"release_name":          request.ClusterName,
+		"namespace":             request.Namespace,
 	}
 	releaseEntity, err := c.releaseMetaProvider.FindByParams(paramsRelease)
 	if err != nil {
@@ -313,8 +314,9 @@ func (c *ClusterProvider) DeleteCluster(request *coreentity.Request) error {
 
 	// delete record about cluster meta in db
 	params := map[string]interface{}{
-		"cluster_name": request.ClusterName,
-		"namespace":    request.Namespace,
+		"k8s_cluster_config_id": k8sClusterConfig.ID,
+		"cluster_name":          request.ClusterName,
+		"namespace":             request.Namespace,
 	}
 	clusterEntity, err := c.clusterMetaProvider.FindByParams(params)
 	if err != nil {
@@ -327,8 +329,9 @@ func (c *ClusterProvider) DeleteCluster(request *coreentity.Request) error {
 
 	// delete record about addon cluster release in db
 	paramsRelease := map[string]interface{}{
-		"release_name": request.ClusterName,
-		"namespace":    request.Namespace,
+		"k8s_cluster_config_id": k8sClusterConfig.ID,
+		"release_name":          request.ClusterName,
+		"namespace":             request.Namespace,
 	}
 	releaseEntity, err := c.releaseMetaProvider.FindByParams(paramsRelease)
 	if err != nil {
diff --git a/dbm-services/k8s-dbs/core/provider/ops_provider.go b/dbm-services/k8s-dbs/core/provider/ops_provider.go
@@ -184,7 +184,7 @@ func (o *OpsRequestProvider) VerticalScaling(request *coreentity.Request) (*core
 		return nil, err
 	}
 
-	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)
+	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -235,8 +235,9 @@ func (o *OpsRequestProvider) HorizontalScaling(request *coreentity.Request) (*co
 	}
 
 	paramsRelease := map[string]interface{}{
-		"release_name": request.ClusterName,
-		"namespace":    request.Namespace,
+		"k8s_cluster_config_id": k8sClusterConfig.ID,
+		"release_name":          request.ClusterName,
+		"namespace":             request.Namespace,
 	}
 	releaseEntity, err := o.releaseMetaProvider.FindByParams(paramsRelease)
 	if err != nil {
@@ -302,7 +303,7 @@ func (o *OpsRequestProvider) VolumeExpansion(request *coreentity.Request) (*core
 		return nil, err
 	}
 
-	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)
+	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)
 	if err != nil {
 		return nil, err
 	}
@@ -518,7 +519,7 @@ func (o *OpsRequestProvider) UpgradeCluster(request *coreentity.Request) (*coree
 		return nil, err
 	}
 
-	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)
+	_, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)
 	if err != nil {
 		return nil, err
 	}
diff --git a/dbm-services/k8s-dbs/metadata/dbaccess/tests/addoncluster_release_dbaccess_test.go b/dbm-services/k8s-dbs/metadata/dbaccess/tests/addoncluster_release_dbaccess_test.go
@@ -216,7 +216,7 @@ func TestListRelease(t *testing.T) {
 }
 
 func TestGetClusterReleaseByParams(t *testing.T) {
-	db, err := initClusterTable()
+	db, err := InitAddonClusterReleaseTb()
 	assert.NoError(t, err)
 
 	dbAccess := dbaccess.NewAddonClusterReleaseDbAccess(db)
@@ -235,8 +235,9 @@ func TestGetClusterReleaseByParams(t *testing.T) {
 	fmt.Printf("Created addon cluster release %+v\n", addedClusterRelease)
 
 	params := map[string]interface{}{
-		"release_name": "test-release",
-		"namespace":    "test-namespace",
+		"k8s_cluster_config_id": 1,
+		"release_name":          "test-release",
+		"namespace":             "test-namespace",
 	}
 	findClusterRelease, err := dbAccess.FindByParams(params)
 	assert.NoError(t, err, "Failed to find addon cluster release")
diff --git a/dbm-services/k8s-dbs/metadata/dbaccess/tests/cluster_dbaccess_test.go b/dbm-services/k8s-dbs/metadata/dbaccess/tests/cluster_dbaccess_test.go
@@ -172,8 +172,9 @@ func TestGetClusterByParams(t *testing.T) {
 	fmt.Printf("Created cluster %+v\n", addedCluster)
 
 	params := map[string]interface{}{
-		"cluster_name": "mycluster",
-		"namespace":    "default",
+		"k8s_cluster_config_id": 1,
+		"cluster_name":          "mycluster",
+		"namespace":             "default",
 	}
 	findCluster, err := dbAccess.FindByParams(params)
 	assert.NoError(t, err, "Failed to find cluster")
diff --git a/dbm-services/k8s-dbs/metadata/provider/tests/addoncluster_release_provider_test.go b/dbm-services/k8s-dbs/metadata/provider/tests/addoncluster_release_provider_test.go
@@ -193,7 +193,7 @@ func TestListClusterRelease(t *testing.T) {
 }
 
 func TestGetClusterReleaseByParams(t *testing.T) {
-	db, err := initClusterTable()
+	db, err := InitClusterReleaseTb()
 	assert.NoError(t, err)
 
 	dbAccess := dbaccess.NewAddonClusterReleaseDbAccess(db)
@@ -216,8 +216,9 @@ func TestGetClusterReleaseByParams(t *testing.T) {
 	fmt.Printf("Created addon cluster release %+v\n", addedCluster)
 
 	params := map[string]interface{}{
-		"release_name": "test-release",
-		"namespace":    "test-namespace",
+		"k8s_cluster_config_id": 1,
+		"release_name":          "test-release",
+		"namespace":             "test-namespace",
 	}
 	foundClusterRelease, err := dbAccess.FindByParams(params)
 	assert.NoError(t, err, "Failed to find addon cluster release")
diff --git a/dbm-services/k8s-dbs/metadata/provider/tests/cluster_provider_test.go b/dbm-services/k8s-dbs/metadata/provider/tests/cluster_provider_test.go
@@ -188,8 +188,9 @@ func TestGetClusterByParams(t *testing.T) {
 	fmt.Printf("Created cluster %+v\n", addedCluster)
 
 	params := map[string]interface{}{
-		"cluster_name": "mycluster",
-		"namespace":    "default",
+		"k8s_cluster_config_id": 1,
+		"cluster_name":          "mycluster",
+		"namespace":             "default",
 	}
 	foundCluster, err := dbAccess.FindByParams(params)
 	assert.NoError(t, err, "Failed to find cluster")

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (o OpsRequestProvider) VerticalScaling(request coreentity.Request) (*core`
`184`	`184`	`return nil, err`
`185`	`185`	`}`
`186`	`186`
`187`		`- _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)`
	`187`	`+ _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)`
`188`	`188`	`if err != nil {`
`189`	`189`	`return nil, err`
`190`	`190`	`}`
`@@ -235,8 +235,9 @@ func (o OpsRequestProvider) HorizontalScaling(request coreentity.Request) (*co`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`paramsRelease := map[string]interface{}{`
`238`		`- "release_name": request.ClusterName,`
`239`		`- "namespace": request.Namespace,`
	`238`	`+ "k8s_cluster_config_id": k8sClusterConfig.ID,`
	`239`	`+ "release_name": request.ClusterName,`
	`240`	`+ "namespace": request.Namespace,`
`240`	`241`	`}`
`241`	`242`	`releaseEntity, err := o.releaseMetaProvider.FindByParams(paramsRelease)`
`242`	`243`	`if err != nil {`
`@@ -302,7 +303,7 @@ func (o OpsRequestProvider) VolumeExpansion(request coreentity.Request) (*core`
`302`	`303`	`return nil, err`
`303`	`304`	`}`
`304`	`305`
`305`		`- _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)`
	`306`	`+ _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)`
`306`	`307`	`if err != nil {`
`307`	`308`	`return nil, err`
`308`	`309`	`}`
`@@ -518,7 +519,7 @@ func (o OpsRequestProvider) UpgradeCluster(request coreentity.Request) (*coree`
`518`	`519`	`return nil, err`
`519`	`520`	`}`
`520`	`521`
`521`		`- _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request)`
	`522`	`+ _, err = serviceHelper.UpdateValWithCompList(o.releaseMetaProvider, request, k8sClusterConfig.ID)`
`522`	`523`	`if err != nil {`
`523`	`524`	`return nil, err`
`524`	`525`	`}`