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

[Agent][Deploy] - sz ga

Browse Source
This commit is contained in:
zeaslity
2024-05-18 09:09:27 +08:00
parent d7be02253f
commit 46e488f891
8 changed files with 118 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
agent-go/a_init/AgentInitialization.go
View File

@@ -308,10 +308,15 @@ func uniformAgentServerName(agentInfo *a_status.AgentInfo, agentServerInfo *a_ag
// 不是标准的AgentName格式
city := agentServerInfo.City
city = strings.Title(city)
if strings.Contains(city, " ") {
city = strings.Join(strings.Split(city, " "), "")
if city == "" {
city = "Local"
} else {
city = strings.Title(city)
if strings.Contains(city, " ") {
city = strings.Join(strings.Split(city, " "), "")
}
}
// uniform city format
agentServerInfo.City = city

2
agent-go/main.go
View File

@@ -9,6 +9,8 @@ import (
var log = logger.Log
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}"
// /root/go/bin/gox -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
func main() {
// 解析命令行参数

15
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(), 8, 58, 30, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 18, 30, 00, 0, now.Location())
duration := time.Duration(0)
@@ -271,21 +271,28 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
time.Sleep(duration)
cmiiEnv := demo
//appName := "cmii-uav-platform"
//appName := "cmii-uav-platform"i
//newTag := "5.4.0-032601"
appNameTagMap := map[string]string{
//"cmii-uav-multilink": "5.5.0",
"cmii-uav-industrial-portfolio": "5.5.0-050801",
"cmii-uav-platform": "5.6.0-051301",
}
for appName, newTag := range appNameTagMap {
ok, oldImageTag, newImageTag := UpdateCmiiDeploymentImageTag(cmiiEnv, appName, newTag)
assert.Equal(t, ok, true, "update image tag failed !")
if !ok {
log.ErrorF("update image tag failed !")
UpdateCmiiDeploymentImageTag(cmiiEnv, appName, oldImageTag)
}
utils.SplitLinePrint()
check := DefaultCmiiOperator.DeploymentStatusCheck(cmiiEnv, appName, 300)
assert.Equal(t, check, true, "deployment run failed!")
if !check {
UpdateCmiiDeploymentImageTag(cmiiEnv, appName, oldImageTag)
}
deploy := DefaultCmiiOperator.DeploymentOneInterface(cmiiEnv, appName)

5
agent-operator/CmiiOperator_test.go
View File

@@ -53,10 +53,11 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
},
FullNameImageList: nil,
ProjectVersion: "",
ProjectName: "xjyd",
ProjectName: "szga",
DirectHarborHost: "harbor.wdd.io",
DownloadImage: true,
CompressImageToGzip: true,
UploadToDemoMinio: true,
UploadToDemoMinio: false,
ShouldDirectPushToHarbor: false,
}

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

@@ -36,3 +36,5 @@
2024-04-30-11-57-00 uavcloud-demo cmii-uav-platform 5.5.0-042903 5.5.0-043001
2024-04-30-17-22-52 uavcloud-demo cmii-uav-industrial-portfolio 5.5.0-042901 5.5.0-043001
2024-05-08-08-58-30 uavcloud-demo cmii-uav-industrial-portfolio 5.5.0-043001 5.5.0-050801
2024-05-10-19-55-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0 5.6.0-051001
2024-05-13-18-30-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense 5.6.0-051301

78
agent-operator/real_project/szga/Config.go Normal file
View File

@@ -0,0 +1,78 @@
package szga
var AllZipFileName = []string{
"harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-app-release:4.2.0-validation",
"harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810",
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.6.0-051602",
"harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.3.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.6.0-051501",
"harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.6.0-0513",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta",
"harbor.cdcyy.com.cn/cmii/cmii-uav-lifecycle:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.6.0-051401",
"harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-emergency-rescue:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.6.0-051503",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.6.0-mr830-051502",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:5.6.0-051401",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.3.0-hjltt",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:5.6.0-051401",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:4.1.6-24238-qingdao",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392",
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195",
"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA",
}

11
server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java
View File

@@ -62,6 +62,11 @@ public class AcceptAgentInitInfo {
12);
put("Xiamen",
13);
put("Shenzhen",
14);
put("Local",
15);
}};
@@ -246,8 +251,14 @@ public class AcceptAgentInitInfo {
" ",
""
);
if (serverName.startsWith("-")) {
// empty city situation
serverName = "Local" + serverName;
}
serverInfoVO.setServerName(serverName);
// validate serverName
String[] split = serverName.split("-");
if (split.length <= 2 || !ALL_SERVER_CITY_INDEX.containsKey(split[0]) || !ALL_SERVER_ARCH_INFO.contains(split[1])) {

6
server/src/main/resources/application.yml
View File

@@ -9,7 +9,7 @@ spring:
allow-circular-references: true
allow-bean-definition-overriding: true
rabbitmq:
host: 42.192.52.227
host: 172.28.0.10
port: 20672
username: boge
password: boge8tingH
@@ -24,7 +24,7 @@ spring:
max-interval: 65000
initial-interval: 2000
redis:
host: 42.192.52.227
host: 172.28.0.10
port: 21370
database: 0
password: boge8tingH
@@ -46,7 +46,7 @@ spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://172.28.0.10:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: boge
password: boge8tingH
type: com.zaxxer.hikari.HikariDataSource