fix: inject register-center version and gorm query condition

Signed-off-by: CeerDecy <[email protected]>

internal/tools/orchestrator/dbclient/addon_instance.go

@@ -116,7 +116,7 @@ func (db *DBClient) GetAddonInstance(id string) (*AddonInstance, error) {
 
 func (db *DBClient) GetAddonInstanceByNameAndCluster(addonName, cluster string) (*AddonInstance, error) {
 	var instance AddonInstance
-	if err := db.Where("name = ?", addonName).
+	if err := db.Where("addon_name = ?", addonName).
 		Where("az = ?", cluster).
 		Where("is_deleted = ?", apistructs.AddonNotDeleted).
 		First(&instance).Error; err != nil {

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

@@ -321,9 +321,13 @@ func (a *Addon) BatchCreate(req *apistructs.AddonCreateRequest) error {
 	}
 
 	var hasRegister, hasConfig bool
-	for _, addon := range req.Addons {
+	for i, addon := range req.Addons {
 		if addon.Type == RegisterCenterAddon {
 			hasRegister = true
+			err = a.injectVersion(&req.Addons[i])
+			if err != nil {
+				return errors.Wrapf(err, "inject version to [%s] error ", addon.Type)
+			}
 		}
 		if addon.Type == ConfigCenterAddon {
 			hasConfig = true
@@ -3880,3 +3884,28 @@ func (a *Addon) CheckDeployCondition(addonName, addonPlan, workspace string) (bo
 	//}
 	return true, nil
 }
+
+func (a *Addon) injectVersion(addon *apistructs.AddonCreateItem) error {
+	if addon.Options == nil {
+		addon.Options = make(map[string]string)
+	}
+	if v, ok := addon.Options["Version"]; ok && v != "" {
+		return nil
+	}
+
+	versionMap, err := GetCache().Get(addon.Type)
+	if err != nil {
+		return fmt.Errorf("can't get addon [%s] from cache, %v", addon.Type, err)
+	}
+	addons, ok := versionMap.(*VersionMap)
+	if !ok {
+		return fmt.Errorf("can't convert to VersionMap")
+	}
+	defaultAddon, ok := addons.GetDefault()
+	if !ok {
+		return fmt.Errorf("there are no default addons [%s]", addon.Type)
+	}
+
+	addon.Options["Version"] = defaultAddon.Version
+	return nil
+}