fix: conditions for select registercenter instance from db

internal/apps/msp/resource/deploy/handlers/mysql/mysql.go

@@ -22,8 +22,6 @@
 
 	"github.com/pkg/errors"
 
-	"github.com/erda-project/erda/pkg/strutil"
-
 	"github.com/erda-project/erda/apistructs"
 	conf "github.com/erda-project/erda/cmd/erda-server/conf/msp"
 	"github.com/erda-project/erda/internal/apps/msp/instance/db"
@@ -33,6 +31,7 @@
 	"github.com/erda-project/erda/pkg/crypto/uuid"
 	"github.com/erda-project/erda/pkg/mysqlhelper"
 	"github.com/erda-project/erda/pkg/parser/diceyml"
+	"github.com/erda-project/erda/pkg/strutil"
 )
 
 func (p *provider) IsMatch(tmc *db.Tmc) bool {
@@ -141,6 +140,21 @@
 	return h.DefaultDeployHandler.DoDeploy(serviceGroupDeployRequest, resourceInfo, tmcInstance, clusterConfig)
 }
 
+func (h *provider) CheckIfNeedTmcInstance(req *handlers.ResourceDeployRequest, resourceInfo *handlers.ResourceInfo) (*db.Instance, bool, error) {
+	// mysql remove the `version` condition. because in the old cluster nacos[1.1.0] depend on mysql[5.7] but now depend on mysql[8.0]
+	var where = map[string]any{
+		"engine":     resourceInfo.TmcVersion.Engine,
+		"az":         req.Az,
+		"status":     handlers.TmcInstanceStatusRunning,
+		"is_deleted": "N",
+	}
+	instance, ok, err := h.InstanceDb.First(where)
+	if err != nil {
+		return nil, false, err
+	}
+	return instance, !ok, nil
+}
+
 func (p *provider) DoPostDeployJob(tmcInstance *db.Instance, serviceGroupDeployResult interface{}, clusterConfig map[string]string) (map[string]string, error) {
 	serviceGroup := serviceGroupDeployResult.(*apistructs.ServiceGroup)
 	mysqlMap := ParseResp2MySQLDtoMap(tmcInstance, serviceGroup)

internal/apps/msp/resource/deploy/handlers/mysql/mysql_test.go

@@ -16,10 +16,15 @@ package mysql
 
 import (
 	"encoding/json"
+	"reflect"
 	"testing"
 
 	"github.com/erda-project/erda/apistructs"
 	"github.com/erda-project/erda/internal/apps/msp/instance/db"
+	"github.com/erda-project/erda/internal/apps/msp/resource/deploy/handlers"
+	"github.com/erda-project/erda/internal/apps/msp/resource/utils"
+
+	"bou.ke/monkey"
 )
 
 func TestTryReadFile(t *testing.T) {
@@ -59,3 +64,35 @@ func TestParseResp2MySQLDtoMap(t *testing.T) {
 		t.Fatal("failed to parse")
 	}
 }
+
+func TestCheckIfNeedTmcInstance(t *testing.T) {
+	p := &provider{
+		DefaultDeployHandler: &handlers.DefaultDeployHandler{
+			InstanceDb: &db.InstanceDB{},
+		},
+	}
+	req := &handlers.ResourceDeployRequest{
+		Engine: "mysql",
+		Uuid:   utils.GetRandomId(),
+		Az:     "test-cluster",
+	}
+	info := &handlers.ResourceInfo{
+		Tmc: &db.Tmc{},
+		TmcVersion: &db.TmcVersion{
+			Engine: "mysql",
+		},
+	}
+
+	monkey.PatchInstanceMethod(reflect.TypeOf(p.InstanceDb), "First", func(DB *db.InstanceDB, where map[string]any) (*db.Instance, bool, error) {
+		return &db.Instance{
+			Engine:    "mysql",
+			Version:   "9.0",
+			ReleaseID: "i am release id!",
+			Status:    "RUNNING",
+			Az:        "test-cluster",
+			Config:    "",
+		}, false, nil
+	})
+
+	_, _, _ = p.CheckIfNeedTmcInstance(req, info)
+}

internal/tools/orchestrator/dbclient/addon_instance.go

@@ -118,6 +118,7 @@
 	var instance AddonInstance
 	if err := db.Where("addon_name = ?", addonName).
 		Where("az = ?", cluster).
+		Where("status = ?", apistructs.AddonAttached).
 		Where("is_deleted = ?", apistructs.AddonNotDeleted).
 		First(&instance).Error; err != nil {
 		if gorm.IsRecordNotFoundError(err) {

internal/tools/orchestrator/services/addon/addon.go

@@ -3145,8 +3145,10 @@
 		createItem := needDeployAddons[index]
 		switch v.AddonName {
 		case RegisterCenterAddon:
+			logrus.Infof("register-center version: [%s]->[%s] in cluster: %s", createItem.Options["version"], regVersion, req.ClusterName)
 			createItem.Options["version"] = regVersion
 		case ConfigCenterAddon:
+			logrus.Infof("config-center version: [%s]->[%s] in cluster: %s", createItem.Options["version"], confVersion, req.ClusterName)
 			createItem.Options["version"] = confVersion
 		}
 		instanceRes, err := a.AttachAndCreate(&createItem)