[Agent][Deploy] - update cmii deploy part

agent-operator/CmiiDeployOperator.go

@@ -6,53 +6,39 @@ import (
 	"path/filepath"
 	"strings"
 	"wdd.io/agent-common/utils"
-	agent_deploy "wdd.io/agent-deploy"
+	agentdeploy "wdd.io/agent-deploy"
 	"wdd.io/agent-deploy/z_dep"
 	"wdd.io/agent-operator/image"
 )
 
-func CmiiEnvDeploy(cmiiNamespace string, shouldDoCompleteDeploy bool, deploySpecificTag string, backupFromEnv string) {
+func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompleteDeploy bool, backupFromEnv string) {
 
-	folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + cmiiNamespace + "/"
+	folderPrefix := "/home/wdd/IdeaProjects/ProjectOctopus/agent-deploy/" + deployCommonEnv.Namespace + "/"
 
-	tenantEnv := cmiiNamespace
-	if strings.Contains(cmiiNamespace, "-") {
-		split := strings.Split(cmiiNamespace, "-")
+	tenantEnv := deployCommonEnv.Namespace
+	// uavcloud-devflight ==> devflight
+	// uavcloud-dev       ==> dev
+	if strings.Contains(tenantEnv, "-") {
+		split := strings.Split(tenantEnv, "-")
 		tenantEnv = split[len(split)-1]
+	} else {
+		// demo ==> ""
+		// cqlyj ==> ""
+		tenantEnv = ""
 	}
 
-	// chongqing sanhua
-	common := &z_dep.CommonEnvironmentConfig{
-		WebIP:           "36.133.115.164",
-		WebPort:         "58888",
-		HarborIP:        DirectPushDeployHarborHost + "/cmii/",
-		HarborPort:      "",
-		Namespace:       cmiiNamespace,
-		TagVersion:      deploySpecificTag,
-		TenantEnv:       tenantEnv,
-		ApplyFilePrefix: folderPrefix,
-	}
-	// common environment
-	//common := &z_dep.CommonEnvironmentConfig{
-	//	WebIP:           "lab.uavcmlc.com",
-	//	WebPort:         "",
-	//	HarborIP:        image2.CmiiHarborPrefix,
-	//	HarborPort:      "",
-	//	Namespace:       cmiiNamespace,
-	//	TagVersion:      deploySpecificTag,
-	//	TenantEnv:       tenantEnv,
-	//	ApplyFilePrefix: folderPrefix,
-	//}
+	// assign folder prefix
+	deployCommonEnv.ApplyFilePrefix = folderPrefix
 
 	var backendMap map[string]string
 	var frontendMap map[string]string
 	var srsMap map[string]string
 
 	// 输出特定版本的Tag
-	backendMap, frontendMap, srsMap = image.GenerateCmiiTagVersionImageMap(deploySpecificTag)
+	backendMap, frontendMap, srsMap = image.GenerateCmiiTagVersionImageMap(deployCommonEnv.TagVersion)
 
 	if backupFromEnv != "" {
-		//  从 backupFromEnv 环境拉取
+		//  从 backupFromEnv 环境拉取特定版本的所有Tag
 		backendMapFromEnv, frontendMapFromEnv, srsMapFromEnv := BackupAllCmiiDeploymentToMap(backupFromEnv)
 
 		backendMap = utils.MergeMap(backendMap, backendMapFromEnv)
@@ -64,13 +50,15 @@ func CmiiEnvDeploy(cmiiNamespace string, shouldDoCompleteDeploy bool, deploySpec
 	utils.BeautifulPrintWithTitle(frontendMap, "frontendMap")
 	utils.BeautifulPrintWithTitle(srsMap, "srsMap")
 
-	common.GenerateApplyFilePath()
+	//
+	deployCommonEnv.GenerateApplyFilePath()
 
+	// do generate all application files
 	// generate and get all old stuff
-	agent_deploy.CmiiEnvironmentDeploy(shouldDoCompleteDeploy, common, backendMap, frontendMap)
+	agentdeploy.CmiiEnvironmentDeploy(shouldDoCompleteDeploy, deployCommonEnv, backendMap, frontendMap)
 
 	// test
-	//GetNodeWideByKubectl(cmiiNamespace)
+	//GetNodeWideByKubectl(deployNamespace)
 
 	// clear old apply file
 	//clearOldApplyStuff(common, shouldDoCompleteDeploy)
@@ -191,14 +179,3 @@ func clearOldApplyStuff(common *z_dep.CommonEnvironmentConfig, shouldDoCompleteD
 
 	return true
 }
-
-// rearrangeCmiiDeploySequence 重新排序CmiiDeploy顺序
-func rearrangeCmiiDeploySequence(files []os.DirEntry) {
-
-	for _, file := range files {
-		if filepath.Ext(file.Name()) == ".yaml" || filepath.Ext(file.Name()) == ".yml" {
-			//filePath := filepath.Join(oldApplyYamlFolder, file.Name())
-			//DeleteByKubectl(filePath, cmiiEnv)
-		}
-	}
-}

agent-operator/CmiiDeployOperator.md

@@ -0,0 +1,18 @@
+# 新增应用的流程
+
+---
+
+## 前端
+
+1. agent-deploy/d_app/CmiiImageConfig.go 新增应用名称CmiiFrontendAppMap
+2. agent-deploy/d_app/FrontendConfigMap.go 新增 短名称FrontendShortNameMaps ClientId的内容FrontendClientIdMaps
+
+## 后段
+
+1. agent-deploy/d_app/CmiiImageConfig.go 新增应用名称CmiiBackendAppMap
+
+---
+
+# CmiiEnvDeploy
+
+1. 

agent-operator/CmiiDeployOperator_test.go

@@ -1,9 +1,41 @@
 package main
 
-import "testing"
+import (
+	"testing"
+	image2 "wdd.io/agent-common/image"
+	"wdd.io/agent-deploy/z_dep"
+)
 
 func TestCmiiEnvDeploy(t *testing.T) {
 
-	CmiiEnvDeploy("wrj", true, "5.6.0", demo)
+	deployNamespace := devFlight
+
+	//  deploy to cmii environment
+	cmiiDeployCommonEnv := &z_dep.CommonEnvironmentConfig{
+		WebIP:                       "lab.uavcmlc.com",
+		WebPort:                     "",
+		HarborIPOrCustomImagePrefix: image2.CmiiHarborPrefix,
+		HarborPort:                  "",
+		Namespace:                   deployNamespace,
+		TagVersion:                  "5.6.0",
+	}
+
+	CmiiEnvDeploy(cmiiDeployCommonEnv, true, deployNamespace)
+
+}
+
+func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
+
+	// chongqing sanhua
+	commonEnv := &z_dep.CommonEnvironmentConfig{
+		WebIP:                       "36.133.115.164",
+		WebPort:                     "58888",
+		HarborIPOrCustomImagePrefix: "chongqingcis-9b4a3da9.ecis.chongqing-1.cmecloud.cn/cmii/",
+		HarborPort:                  "",
+		Namespace:                   "wrj",
+		TagVersion:                  "5.6.0",
+	}
+
+	CmiiEnvDeploy(commonEnv, true, demo)
 
 }

agent-operator/real_project/cqga/2-harbor-docker-compose.yaml

@@ -160,6 +160,7 @@ services:
     container_name: harbor-portal
     extra_hosts:
       - "harbor.wdd.io:20.4.16.200"
+      -
     restart: always
     cap_drop:
       - ALL