fix: add get previous version cluster info for rollback operation

Signed-off-by: YuTang Song <2313186065@qq.com>

Author: leebrouse

pkg/microservice/aslan/core/common/repository/models/env_svc_version.go

@@ -30,6 +30,7 @@ type EnvServiceVersion struct {
 	ProductName    string                         `bson:"product_name"              json:"product_name"`
 	EnvName        string                         `bson:"env_name"                  json:"env_name"`
 	Namespace      string                         `bson:"namespace"                 json:"namespace"`
+	ClusterName    string                         `bson:"cluster_name,omitempty"    json:"cluster_name,omitempty"`
 	Production     bool                           `bson:"production"                json:"production"`
 	Revision       int64                          `bson:"revision"                  json:"revision"`
 	Operation      config.EnvOperation            `bson:"operation"                 json:"operation"`

pkg/microservice/aslan/core/common/service/version.go

@@ -157,7 +157,24 @@ func GetEnvServiceVersionYaml(ctx *internalhandler.Context, projectName, envName
 			Namespace:   envSvcRevision.Namespace,
 			Production:  envSvcRevision.Production,
 		}
-		parsedYaml, err := kube.RenderEnvService(fakeEnv, envSvcRevision.Service.GetServiceRender(), envSvcRevision.Service)
+		clusterName := envSvcRevision.ClusterName
+		if clusterName == "" {
+			cluster, err := kube.GetCluster(env.ClusterID)
+			if err != nil {
+				return resp, err
+			}
+			clusterName = cluster.Name
+		}
+		svcTmpl, err := repository.QueryTemplateService(&commonrepo.ServiceFindOption{
+			ServiceName: envSvcRevision.Service.ServiceName,
+			ProductName: envSvcRevision.ProductName,
+			Type:        envSvcRevision.Service.Type,
+			Revision:    envSvcRevision.Service.Revision,
+		}, envSvcRevision.Production)
+		if err != nil {
+			return resp, fmt.Errorf("failed to find %s/%s/%d service template, isProduction %v, error: %v", envSvcRevision.ProductName, envSvcRevision.Service.ServiceName, envSvcRevision.Service.Revision, envSvcRevision.Production, err)
+		}
+		parsedYaml, err := kube.RenderEnvServiceWithTempl(fakeEnv, envSvcRevision.Service.GetServiceRender(), envSvcRevision.Service, svcTmpl, clusterName)
 		if err != nil {
 			err = fmt.Errorf("Failed to render env Service %s, error: %v", envSvcRevision.Service.ServiceName, err)
 			return resp, err
@@ -407,7 +424,8 @@ func RollbackEnvServiceVersion(ctx *internalhandler.Context, projectName, envNam
 					VariableKVs:           envSvcVersion.Service.GetServiceRender().OverrideYaml.RenderVariableKVs,
 					Containers:            envSvcVersion.Service.Containers,
 				}
-				_, _, resources, err := kube.GenerateRenderedYaml(option)
+				var resources []*kube.WorkloadResource
+				_, _, resources, err = kube.GenerateRenderedYaml(option)
 				if err != nil {
 					return nil, e.ErrRollbackEnvServiceVersion.AddErr(fmt.Errorf("failed to generate service yaml, error: %v", err))
 				}
@@ -434,7 +452,24 @@ func RollbackEnvServiceVersion(ctx *internalhandler.Context, projectName, envNam
 					Namespace:   envSvcVersion.Namespace,
 					Production:  envSvcVersion.Production,
 				}
-				parsedYaml, err := kube.RenderEnvService(fakeEnv, envSvcVersion.Service.GetServiceRender(), envSvcVersion.Service)
+				clusterName := envSvcVersion.ClusterName
+				if clusterName == "" {
+					cluster, err := kube.GetCluster(env.ClusterID)
+					if err != nil {
+						return nil, e.ErrRollbackEnvServiceVersion.AddErr(err)
+					}
+					clusterName = cluster.Name
+				}
+				svcTmpl, err := repository.QueryTemplateService(&commonrepo.ServiceFindOption{
+					ServiceName: envSvcVersion.Service.ServiceName,
+					ProductName: envSvcVersion.ProductName,
+					Type:        envSvcVersion.Service.Type,
+					Revision:    envSvcVersion.Service.Revision,
+				}, envSvcVersion.Production)
+				if err != nil {
+					return nil, e.ErrRollbackEnvServiceVersion.AddErr(fmt.Errorf("failed to find %s/%s/%d service template, isProduction %v, error: %v", envSvcVersion.ProductName, envSvcVersion.Service.ServiceName, envSvcVersion.Service.Revision, envSvcVersion.Production, err))
+				}
+				parsedYaml, err := kube.RenderEnvServiceWithTempl(fakeEnv, envSvcVersion.Service.GetServiceRender(), envSvcVersion.Service, svcTmpl, clusterName)
 				if err != nil {
 					err = fmt.Errorf("Failed to render env %s, service %s, revision %d, error: %v", envSvcVersion.EnvName, envSvcVersion.Service.ServiceName, envSvcVersion.Service.Revision, err)
 					return nil, e.ErrRollbackEnvServiceVersion.AddErr(err)

pkg/microservice/aslan/core/common/util/version.go

@@ -50,11 +50,22 @@ func CreateEnvServiceVersion(env *models.Product, prodSvc *models.ProductService
 		return fmt.Errorf("failed to find template product %s, error: %v", env.ProductName, err)
 	}
 
+	clusterName := ""
+	var cluster *models.K8SCluster
+	if env.ClusterID != "" {
+		cluster, err = commonrepo.NewK8SClusterColl().FindByID(env.ClusterID)
+		if err != nil {
+			return fmt.Errorf("failed to find cluster by id %s, error: %v", env.ClusterID, err)
+		}
+		clusterName = cluster.Name
+	}
+
 	svcVersionColl := mongodb.NewEnvServiceVersionCollWithSession(session)
 	version := &models.EnvServiceVersion{
 		ProductName:     env.ProductName,
 		EnvName:         env.EnvName,
 		Namespace:       env.Namespace,
+		ClusterName:     clusterName,
 		Production:      env.Production,
 		Revision:        revision,
 		Service:         prodSvc,