[Agent][Deploy] - srs part

agent-operator/CmiiDeployOperator.go

@@ -12,13 +12,7 @@ import (
 	"wdd.io/agent-operator/image"
 )
 
-func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
-
-	// 部署的环境
-	cmiiNamespace := devOperation
-
-	// 输出特定版本的Tag 或者 从DEMO环境拉取
-	DeploySpecificTag := "5.6.0"
+func CmiiEnvDeploy(cmiiNamespace string, shouldDoCompleteDeploy bool, deploySpecificTag string, backupFromEnv string) {
 
 	folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + cmiiNamespace + "/"
 
@@ -35,7 +29,7 @@ func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
 		HarborIP:        image2.CmiiHarborPrefix,
 		HarborPort:      "",
 		Namespace:       cmiiNamespace,
-		TagVersion:      DeploySpecificTag,
+		TagVersion:      deploySpecificTag,
 		TenantEnv:       tenantEnv,
 		ApplyFilePrefix: folderPrefix,
 	}
@@ -44,12 +38,16 @@ func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
 	var frontendMap map[string]string
 	var srsMap map[string]string
 
-	if DeploySpecificTag == "" {
-		//  从DEMO环境拉取
-		backendMap, frontendMap, srsMap = BackupAllCmiiDeploymentToMap(demo)
-	} else {
-		// 输出特定版本的Tag
-		backendMap, frontendMap, srsMap = image.GenerateCmiiTagVersionImageMap(DeploySpecificTag)
+	// 输出特定版本的Tag
+	backendMap, frontendMap, srsMap = image.GenerateCmiiTagVersionImageMap(deploySpecificTag)
+
+	if backupFromEnv != "" {
+		//  从 backupFromEnv 环境拉取
+		backendMapFromEnv, frontendMapFromEnv, srsMapFromEnv := BackupAllCmiiDeploymentToMap(backupFromEnv)
+
+		backendMap = utils.MergeMap(backendMap, backendMapFromEnv)
+		frontendMap = utils.MergeMap(frontendMap, frontendMapFromEnv)
+		srsMap = utils.MergeMap(srsMap, srsMapFromEnv)
 	}
 
 	utils.BeautifulPrintWithTitle(backendMap, "backendMap")