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

[agent-deploy] - xzyd project

Browse Source
This commit is contained in:
zeaslity
2024-06-04 16:53:56 +08:00
parent 1c7974f262
commit 2872800e6d
6 changed files with 127 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
agent-go/a_init/BastionInitializaion.go
View File

@@ -100,8 +100,6 @@ func BastionModeInit() {
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
bastion_init.PrintBastionHelp() bastion_init.PrintBastionHelp()
for {
fmt.Println() fmt.Println()
fmt.Print("enter ==> ") fmt.Print("enter ==> ")
@@ -142,7 +140,6 @@ func BastionModeInit() {
default: default:
fmt.Println("inputCommand is not exist ! Please input again") fmt.Println("inputCommand is not exist ! Please input again")
} }
}
} }

2
agent-go/main.go
View File

@@ -9,7 +9,7 @@ import (
var log = logger.Log var log = logger.Log
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/agent-operator_{{.OS}}_{{.Arch}}" // C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
// /root/go/bin/gox -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}" // /root/go/bin/gox -osarch="linux/amd64" -output "build/octopus-agent_{{.OS}}_{{.Arch}}"
// bash <(curl -sL http://172.28.0.10:9000/octopus/init-script-wdd.sh) --offline --url http://172.28.0.10:9000 --agent-install // bash <(curl -sL http://172.28.0.10:9000/octopus/init-script-wdd.sh) --offline --url http://172.28.0.10:9000 --agent-install

2
agent-operator/deploy/c_app/FrontendConfigMap.go
View File

@@ -3,7 +3,7 @@ package c_app
var FrontendShortNameMaps = map[string]string{ var FrontendShortNameMaps = map[string]string{
"cmii-suav-platform-supervision": "supervision", "cmii-suav-platform-supervision": "supervision",
"cmii-suav-platform-supervisionh5": "supervisionh5", "cmii-suav-platform-supervisionh5": "supervisionh5",
"cmii-uav-platform": "platform", "cmii-uav-platform": "",
"cmii-uav-platform-ai-brain": "ai-brain", "cmii-uav-platform-ai-brain": "ai-brain",
"cmii-uav-platform-armypeople": "armypeople", "cmii-uav-platform-armypeople": "armypeople",
"cmii-uav-platform-base": "base", "cmii-uav-platform-base": "base",

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

@@ -36,6 +36,13 @@
2024-04-30-11-57-00 uavcloud-demo cmii-uav-platform 5.5.0-042903 5.5.0-043001 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-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-08-08-58-30 uavcloud-demo cmii-uav-industrial-portfolio 5.5.0-043001 5.5.0-050801
2024-05-14-15-42-00 uavcloud-demo cmii-uav-material-warehouse 5.6.0 5.6.0-051401
2024-05-14-15-49-27 uavcloud-demo cmii-uav-platform-uas 5.6.0 5.6.0-051401
2024-05-14-15-49-31 uavcloud-demo cmii-uav-platform-uasms 5.6.0 5.6.0-051401
2024-05-14-17-30-00 uavcloud-demo cmii-uav-platform 5.6.0 5.6.0-051401
2024-05-15-09-55-03 uavcloud-demo cmii-uav-platform 5.6.0-051401 5.6.0-mr830-051501
2024-05-16-18-13-14 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-051501 5.6.0-051601
2024-05-27-09-00-19 uavcloud-demo cmii-uav-platform-media 5.6.0 5.6.0-052701
2024-05-10-19-55-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0 5.6.0-051001 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 2024-05-13-18-30-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense 5.6.0-051301
2024-06-03-17-31-36 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-052201 5.6.0-060301 2024-06-03-17-31-36 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-052201 5.6.0-060301

149
agent-operator/main.go
View File

@@ -1,8 +1,11 @@
package main package main
import ( import (
"bufio"
"flag" "flag"
"fmt"
"os" "os"
"strings"
"wdd.io/agent-common/utils" "wdd.io/agent-common/utils"
) )
@@ -85,84 +88,84 @@ func main() {
// C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/operator_{{.OS}}_{{.Arch}}" // C:\Users\wddsh\go\bin\gox.exe -osarch="linux/amd64" -output "build/operator_{{.OS}}_{{.Arch}}"
//RealProjectRunner() //RealProjectRunner()
var mode string
flag.StringVar(&mode, "mode", "mode", "agent run mode")
flag.Parse()
BuildDefaultK8sOperator()
BackupAllDeploymentFromEnv(mode)
// 解析命令行参数
//var mode string //var mode string
//flag.StringVar(&mode, "mode", "mode", "agent run mode") //flag.StringVar(&mode, "mode", "mode", "agent run mode")
//flag.Parse() //flag.Parse()
// //
//if mode == "image" {
//
//BuildDefaultK8sOperator() //BuildDefaultK8sOperator()
// // 堡垒机模式 的 镜像美容
// // 初始化堡垒机模式
// for {
// //
// reader := bufio.NewReader(os.Stdin) //BackupAllDeploymentFromEnv(mode)
// for {
// fmt.Printf(DLTUHelp) //解析命令行参数
// fmt.Print("enter ==> ") var mode string
// flag.StringVar(&mode, "mode", "mode", "agent run mode")
// text, _ := reader.ReadString('\n') flag.Parse()
// split := strings.Split(text, " ")
// var result []string if mode == "image" {
// for _, s := range split {
// text = strings.TrimSpace(s) BuildDefaultK8sOperator()
// if text == "" { // 堡垒机模式 的 镜像美容
// continue // 初始化堡垒机模式
// } for {
//
// result = append(result, text) reader := bufio.NewReader(os.Stdin)
// } for {
// fmt.Printf(DLTUHelp)
// if len(result) != 6 { fmt.Print("enter ==> ")
// fmt.Println("input error!")
// fmt.Printf(DLTUHelp) text, _ := reader.ReadString('\n')
// return split := strings.Split(text, " ")
// } var result []string
// for _, s := range split {
// ossUrlPrefix := result[1] text = strings.TrimSpace(s)
// ossFileName := result[2] if text == "" {
// localGzipFolderOrGzipFile := result[3] continue
// harborHostFullName := result[4] }
// namespace := result[5]
// result = append(result, text)
// fmt.Println("ossUrlPrefix: ", ossUrlPrefix) }
// fmt.Println("ossFileName: ", ossFileName)
// fmt.Println("localGzipFolderOrGzipFile: ", localGzipFolderOrGzipFile) if len(result) != 6 {
// fmt.Println("harborHostFullName: ", harborHostFullName) fmt.Println("input error!")
// fmt.Println("namespace: ", namespace) fmt.Printf(DLTUHelp)
// fmt.Println() return
// }
// downloadFromOss := true
// if ossFileName == "0" { ossUrlPrefix := result[1]
// downloadFromOss = false ossFileName := result[2]
// } localGzipFolderOrGzipFile := result[3]
// harborHostFullName := result[4]
// // DLTU namespace := result[5]
// targetImageFullNameList := DownloadLoadTagUpload(downloadFromOss, ossUrlPrefix, ossFileName, localGzipFolderOrGzipFile, harborHostFullName)
// fmt.Println("ossUrlPrefix: ", ossUrlPrefix)
// // 是否需要更新 fmt.Println("ossFileName: ", ossFileName)
// if namespace != "" { fmt.Println("localGzipFolderOrGzipFile: ", localGzipFolderOrGzipFile)
// for _, targetImageFullName := range targetImageFullNameList { fmt.Println("harborHostFullName: ", harborHostFullName)
// if !DefaultCmiiOperator.DeploymentUpdateTagByImageFullName(namespace, targetImageFullName) { fmt.Println("namespace: ", namespace)
// fmt.Printf("[Update] update [%s] [%s] failed", namespace, targetImageFullName) fmt.Println()
// }
// } downloadFromOss := true
// } if ossFileName == "0" {
// downloadFromOss = false
// fmt.Println() }
// }
// } // DLTU
//} else if mode == "operator" { targetImageFullNameList := DownloadLoadTagUpload(downloadFromOss, ossUrlPrefix, ossFileName, localGzipFolderOrGzipFile, harborHostFullName)
//
//} // 是否需要更新
if namespace != "" {
for _, targetImageFullName := range targetImageFullNameList {
if !DefaultCmiiOperator.DeploymentUpdateTagByImageFullName(namespace, targetImageFullName) {
fmt.Printf("[Update] update [%s] [%s] failed", namespace, targetImageFullName)
}
}
}
fmt.Println()
}
}
} else if mode == "operator" {
}
} }

10
server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
View File

@@ -42,20 +42,18 @@ public class TestImageSyncScheduler {
)); ));
ArrayList<String> ImageFullNameList = new ArrayList<>(List.of( ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
// "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-052901"
// "harbor.cdcyy.com.cn/cmii/cmii/srs:v5.0.195"
"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.4.0-xmyd-050901"
)); ));
Boolean downloadAndCompressOnly = false; Boolean downloadAndCompressOnly = false;
// String projectNamespace = "wdd"; // wdd // String projectNamespace = "wdd"; // wdd
// String projectNamespace = "cqlyj"; // 重庆林业局 String projectNamespace = "cqlyj"; // 重庆林业局
// String projectNamespace = "jlyd"; // 吉林移动 // String projectNamespace = "jlyd"; // 吉林移动
String projectNamespace = "xmyd"; // 厦门移动 // String projectNamespace = "xmyd"; // 厦门移动
// String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd // String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
String innerWorkerAgentName = "Chengdu-amd64-71-3571gd"; //prod String innerWorkerAgentName = "Chengdu-amd64-71-3571gda5"; //prod
// 之下不要修改 除非你知道自己在干什么！ // 之下不要修改 除非你知道自己在干什么！