[Agent][Deploy] - cmii update

agent-deploy/OctopusDeploy.go

@@ -2,6 +2,7 @@ package agent_deploy
 
 import (
 	"os"
+	"strings"
 	image2 "wdd.io/agent-common/image"
 	"wdd.io/agent-common/logger"
 	"wdd.io/agent-common/utils"
@@ -108,7 +109,7 @@ var IgnoreCmiiBackendAppName = map[string]string{
 
 func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) {
 
-	os.Remove(c_app.BackendApplyFilePath)
+	os.Remove(z_dep.BackendApplyFilePath)
 
 	for appName, tag := range backendImageVersionMap {
 		c_app.DefaultCmiiBackendConfig.AppName = appName
@@ -126,7 +127,7 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap
 
 func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) {
 
-	os.Remove(c_app.FrontendApplyFilePath)
+	os.Remove(z_dep.FrontendApplyFilePath)
 
 	c_app.FrontendDefaultNginxDeploy(common)
 
@@ -148,7 +149,7 @@ func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionM
 }
 
 func configMapDeploy(common *z_dep.CommonEnvironmentConfig) {
-	os.Remove(c_app.ConfigMapApplyFilePath)
+	os.Remove(z_dep.ConfigMapApplyFilePath)
 
 	for frontendName, shortName := range c_app.FrontendShortNameMaps {
 		c_app.DefaultCmiiFrontendConfig.AppName = frontendName
@@ -169,25 +170,32 @@ func configMapDeploy(common *z_dep.CommonEnvironmentConfig) {
 // CmiiEnvironmentDeploy 部署完整的CMII环境的所有组件
 func CmiiEnvironmentDeploy(isCompleteDeploy bool, cmiiNameSpace string, backendImageVersionMap, frontendImageVersionMap map[string]string) (applyYamlFolder string) {
 
-	// common environment
-	common := &z_dep.CommonEnvironmentConfig{
-		WebIP:      "lab.uavcmlc.com",
-		WebPort:    "",
-		HarborIP:   image2.CmiiHarborPrefix,
-		HarborPort: "",
-		Namespace:  cmiiNameSpace,
-		TagVersion: "5.5.0",
-		TenantEnv:  cmiiNameSpace,
+	folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + cmiiNameSpace + "/"
+
+	tenantEnv := cmiiNameSpace
+	if strings.Contains(cmiiNameSpace, "-") {
+		split := strings.Split(cmiiNameSpace, "-")
+		tenantEnv = split[len(split)-1]
 	}
 
-	folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + common.Namespace + "/"
+	// common environment
+	common := &z_dep.CommonEnvironmentConfig{
+		WebIP:           "lab.uavcmlc.com",
+		WebPort:         "",
+		HarborIP:        image2.CmiiHarborPrefix,
+		HarborPort:      "",
+		Namespace:       cmiiNameSpace,
+		TagVersion:      "5.5.0",
+		TenantEnv:       tenantEnv,
+		ApplyFilePrefix: folderPrefix,
+	}
 
 	// clear old apply file
-	_ = os.Mkdir(folderPrefix, os.ModeDir)
+	_ = os.Mkdir(folderPrefix, os.ModePerm)
 
 	oldApplyFileFolder := folderPrefix + "old"
 	utils.RemoveFolderComplete(oldApplyFileFolder)
-	_ = os.Mkdir(oldApplyFileFolder, os.ModeDir)
+	_ = os.Mkdir(oldApplyFileFolder, os.ModePerm)
 
 	// move all apply file to old folder
 	_ = utils.FolderMoveFiles(folderPrefix, oldApplyFileFolder)
@@ -196,7 +204,9 @@ func CmiiEnvironmentDeploy(isCompleteDeploy bool, cmiiNameSpace string, backendI
 	// ignore redis rabbitmq mongo nacos emqx
 	// sync mysql-data
 
-	z_dep.ApplyFilePrefix = folderPrefix
+	// generate
+	common.GenerateApplyFilePath()
+
 	// generate new apply file for specific environment
 	if isCompleteDeploy {