zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Agent][Deploy] - srs part

Browse Source
This commit is contained in:
zeaslity
2024-06-28 10:22:21 +08:00
parent 4c6bb8750a
commit 657b771475
49 changed files with 36146 additions and 34264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
agent-operator/CmiiDeployOperator.go
View File

@@ -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")

2
agent-operator/CmiiDeployOperator_test.go
View File

@@ -4,5 +4,5 @@ import "testing"
func TestCmiiEnvDeploy(t *testing.T) {
CmiiEnvDeploy(false)
CmiiEnvDeploy(dev, true, "5.6.0", dev)
}

12
agent-operator/CmiiK8sOperator_test.go
View File

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 10, 45, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 30, 00, 0, now.Location())
duration := time.Duration(0)
@@ -275,12 +275,12 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
//newTag := "5.4.0-032601"
appNameTagMap := map[string]string{
//"cmii-uav-multilink": "5.5.0",
//"cmii-uav-process": "5.6.0-060601",
//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
//"cmii-uav-data-post-process": "5.6.0-062401",
//"cmii-uav-industrial-portfolio": "5.6.0-061303",
"cmii-uav-industrial-portfolio": "5.6.0-061901",
//"cmii-uas-lifecycle": "5.6.0",
//"cmii-uas-lifecycle": "5.6.0-061401",
//"cmii-uav-multilink": "5.5.0",
"cmii-uav-developer": "5.6.0-062701",
"cmii-uav-airspace": "5.6.0-062701",
}
for appName, newTag := range appNameTagMap {

2
agent-operator/K8sOperator_test.go
View File

@@ -213,7 +213,7 @@ func TestCmiiK8sOperator_PodFizz2(t *testing.T) {
func TestCmiiK8sOperator_PodByNodeName(t *testing.T) {
cmiiEnv := devOperation
nodeName := "dev-04.ecs.io"
nodeName := "dev-master-01"
exists := DefaultCmiiOperator.PodByNodeName(cmiiEnv, nodeName)
exists = FilterAllCmiiPodSoft(exists)

5
agent-operator/image/CmiiImageOperator.go
View File

@@ -549,8 +549,9 @@ func FrontendBackendSrsImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]s
func GenerateCmiiTagVersionImageMap(specificTag string) (backendMap, frontendMap, srsMap map[string]string) {
matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+$`, specificTag)
if !matched {
log.ErrorF("srs tag is not match ! %s", specificTag)
sprintf := fmt.Sprintf("tag is not match ! [%s]", specificTag)
log.Error(sprintf)
panic(sprintf)
}
backendMap = make(map[string]string, len(d_app.CmiiBackendAppMap))

21
agent-operator/log/cmii-update-log.txt
View File

@@ -64,3 +64,24 @@
2024-06-14-17-49-53 uavcloud-demo cmii-uas-lifecycle 5.6.0 5.6.0-061401
2024-06-18-09-13-18 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-061602 5.6.0-061801
2024-06-19-10-45-45 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-061801 5.6.0-061901
2024-06-21-10-12-00 uavcloud-demo cmii-uav-platform-dispatchh5 5.6.0 5.6.0-0621
2024-06-21-12-12-00 uavcloud-demo cmii-uav-data-post-process 5.6.0-060401 5.6.0-062101
2024-06-21-12-13-32 uavcloud-demo cmii-uav-user 5.6.0 5.6.0-062102
2024-06-21-12-18-33 uavcloud-demo cmii-uav-user 5.6.0-062101 5.6.0
2024-06-21-17-05-00 uavcloud-demo cmii-uav-platform-dispatchh5 5.6.0-0621 5.6.0-062102
2024-06-21-17-05-05 uavcloud-demo cmii-uav-platform 5.6.0-0619 5.6.0-25263-ai-0621
2024-06-21-17-35-10 uavcloud-demo cmii-uav-platform 5.6.0-25263-ai-0621 5.6.0-25263-ai-062102
2024-06-24-09-25-00 uavcloud-demo cmii-uav-platform 5.6.0-25263-ai-062102 5.6.0-25263-ai-062401
2024-06-24-09-28-26 uavcloud-demo cmii-uav-platform 5.6.0-25263-ai-062401 5.6.0-25263-ai-062102
2024-06-24-15-46-49 uavcloud-demo cmii-uav-platform-dispatchh5 5.6.0-062102 5.6.0-062401
2024-06-24-17-32-00 uavcloud-demo cmii-uav-data-post-process 5.6.0-062101 5.6.0-062401
2024-06-25-11-40-00 uavcloud-demo cmii-uav-platform 5.6.0-25263-062401 5.6.0-25263-062501
2024-06-26-11-07-00 uavcloud-demo cmii-uav-platform-uas 5.6.0-0620 5.6.0-062601
2024-06-26-11-50-00 uavcloud-demo cmii-uav-airspace 5.6.0 5.6.0-062601
2024-06-26-11-50-04 uavcloud-demo cmii-uav-platform 5.6.0-25263-062501 5.6.0-0626
2024-06-26-17-40-00 uavcloud-demo cmii-uav-material-warehouse 5.6.0 5.6.0-062601
2024-06-26-17-45-01 uavcloud-demo cmii-uav-material-warehouse 5.6.0-062601 5.6.0
2024-06-26-17-45-02 uavcloud-demo cmii-uav-tower 5.5.0 5.6.0-062601
2024-06-26-17-54-00 uavcloud-demo cmii-uav-material-warehouse 5.6.0 5.6.0-062602
2024-06-27-17-30-00 uavcloud-demo cmii-uav-developer 5.6.0 5.6.0-062701
2024-06-27-17-31-28 uavcloud-demo cmii-uav-airspace 5.6.0-062601 5.6.0-062701