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

Merge remote-tracking branch 'origin/local-ss' into local-ss

Browse Source
This commit is contained in:
zeaslity
2024-06-04 16:53:47 +08:00
parent a7498d3176 9b6520d3f2
commit 1c7974f262
7 changed files with 93 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent-operator/CmiiK8sOperator_test.go
View File

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间 // 计算20:00的时间
now := time.Now() now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 18, 30, 00, 0, now.Location()) targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 30, 00, 0, now.Location())
duration := time.Duration(0) duration := time.Duration(0)
@@ -276,7 +276,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
appNameTagMap := map[string]string{ appNameTagMap := map[string]string{
//"cmii-uav-multilink": "5.5.0", //"cmii-uav-multilink": "5.5.0",
"cmii-uav-platform": "5.6.0-051301", "cmii-uav-industrial-portfolio": "5.6.0-060301",
} }
for appName, newTag := range appNameTagMap { for appName, newTag := range appNameTagMap {

13
agent-operator/CmiiOperator_test.go
View File

@@ -49,16 +49,19 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。 // 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
sync := ImageSyncEntity{ sync := ImageSyncEntity{
CmiiNameTagList: []string{ CmiiNameTagList: []string{
//"cmii-uav-platform:5.5.0-offline", "cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
"cmii-uav-industrial-portfolio:5.4.0-bjdyt-052801",
"cmii-uav-platform-armypeople:5.4.0-bjdyt-052802",
"cmii-uav-platform:5.4.0-bjdyt-052901",
}, },
FullNameImageList: nil, FullNameImageList: nil,
ProjectVersion: "", ProjectVersion: "",
ProjectName: "szga", ProjectName: "bjtg",
DirectHarborHost: "harbor.wdd.io", DirectHarborHost: "10.250.0.110",
DownloadImage: true, DownloadImage: true,
CompressImageToGzip: true, CompressImageToGzip: false,
UploadToDemoMinio: false, UploadToDemoMinio: false,
ShouldDirectPushToHarbor: false, ShouldDirectPushToHarbor: true,
} }
// 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。 // 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。

80
agent-operator/deploy/OctopusDeploy.go
View File

@@ -4,6 +4,9 @@ import (
"os" "os"
image2 "wdd.io/agent-common/image" image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/logger" "wdd.io/agent-common/logger"
"wdd.io/agent-operator/deploy/a_dashboard"
"wdd.io/agent-operator/deploy/a_nfs"
"wdd.io/agent-operator/deploy/b_middle"
"wdd.io/agent-operator/deploy/c_app" "wdd.io/agent-operator/deploy/c_app"
"wdd.io/agent-operator/deploy/z_dep" "wdd.io/agent-operator/deploy/z_dep"
) )
@@ -14,37 +17,38 @@ func OctopusDeploy() {
// common environment // common environment
common := &z_dep.CommonEnvironmentConfig{ common := &z_dep.CommonEnvironmentConfig{
WebIP: "172.28.0.251", WebIP: "10.250.0.110",
WebPort: "8888", WebPort: "8888",
HarborIP: "172.28.0.251", HarborIP: "10.250.0.110",
HarborPort: "8033", HarborPort: "8033",
Namespace: "szga", Namespace: "bjtg",
TagVersion: "5.5.0", TagVersion: "5.5.0",
TenantEnv: "", TenantEnv: "",
MinioPublicIP: "172.28.0.251", MinioPublicIP: "10.250.0.110",
MinioInnerIP: "172.28.0.251", MinioInnerIP: "10.250.0.110",
NFSServerIP: "172.28.0.251", NFSServerIP: "10.250.0.110",
} }
//a_dashboard.K8sDashboardDeploy(common) // kubectl -n kube-system describe secret $(kubectl -n kube-system get secret | grep admin-user | awk '{print $1}')
// a_dashboard.K8sDashboardDeploy(common)
//a_nfs.NFSDeploy(common)
//a_nfs.NFSTestDeploy(common) a_nfs.NFSDeploy(common)
// a_nfs.NFSTestDeploy(common)
//// pvc
//b_middle.PVCDeploy(common) // pvc
// b_middle.PVCDeploy(common)
//// middlewares
//b_middle.MidMySQlDeploy(common) // middlewares
//b_middle.MidRedisDeploy(common) b_middle.MidMySQlDeploy(common)
//b_middle.MidEmqxDeploy(common) b_middle.MidRedisDeploy(common)
//b_middle.MidMongoDeploy(common) b_middle.MidEmqxDeploy(common)
//b_middle.MidRabbitMQDeploy(common) b_middle.MidMongoDeploy(common)
//b_middle.MidRabbitMQDeploy(common) b_middle.MidRabbitMQDeploy(common)
//b_middle.MidNacosDeploy(common) b_middle.MidRabbitMQDeploy(common)
// b_middle.MidNacosDeploy(common)
//configMapDeploy(common)
//c_app.IngressDeploy(common) configMapDeploy(common)
c_app.IngressDeploy(common)
gzipFilePrefix := "/root/octopus_image/xjyd/" gzipFilePrefix := "/root/octopus_image/xjyd/"
frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix) frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix)
@@ -82,6 +86,24 @@ func CmiiAppDeploy() {
} }
var IgnoreCmiiBackendAppName = map[string]string{
"cmii-uav-grid-datasource": "0",
"cmii-uav-grid-manage": "",
"cmii-uav-grid-engine": "",
"cmii-uav-kpi-monitor": "",
"cmii-uav-gis-server": "",
"cmii-app-release": "",
"cmii-uav-autowaypoint": "",
"cmii-uav-integration": "",
"cmii-uav-developer": "",
"cmii-open-gateway": "",
"cmii-uav-brain": "",
"cmii-uav-data-post-process": "",
"cmii-uav-multilink": "",
"cmii-uav-alarm": "",
"cmii-uav-tower": "",
}
func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) { func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) {
os.Remove(c_app.BackendApplyFilePath) os.Remove(c_app.BackendApplyFilePath)
@@ -89,7 +111,13 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap
for appName, tag := range backendImageVersionMap { for appName, tag := range backendImageVersionMap {
c_app.DefaultCmiiBackendConfig.AppName = appName c_app.DefaultCmiiBackendConfig.AppName = appName
c_app.DefaultCmiiBackendConfig.ImageTag = tag c_app.DefaultCmiiBackendConfig.ImageTag = tag
c_app.DefaultCmiiBackendConfig.Replicas = "1" _, ok := IgnoreCmiiBackendAppName[appName]
if ok {
c_app.DefaultCmiiBackendConfig.Replicas = "0"
} else {
c_app.DefaultCmiiBackendConfig.Replicas = "1"
}
c_app.DefaultCmiiBackendConfig.BackendDeploy(common) c_app.DefaultCmiiBackendConfig.BackendDeploy(common)
} }
} }

4
agent-operator/deploy/z_dep/G.go
View File

@@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
"os"
"runtime" "runtime"
"text/template" "text/template"
"wdd.io/agent-common/assert" "wdd.io/agent-common/assert"
@@ -20,7 +21,7 @@ var log = logger.Log
func init() { func init() {
switch runtime.GOOS { switch runtime.GOOS {
case "linux": case "linux":
ApplyFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/deploy/z_5.5.0/" ApplyFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-operator/deploy/z_bjtg/"
case "darwin": // macOS case "darwin": // macOS
ApplyFilePrefix = "MacOS value" ApplyFilePrefix = "MacOS value"
case "windows": case "windows":
@@ -29,6 +30,7 @@ func init() {
ApplyFilePrefix = "Unknown OS" ApplyFilePrefix = "Unknown OS"
} }
_ = os.Mkdir(ApplyFilePrefix, os.ModePerm)
fmt.Printf("ApplyFilePrefix: %s\n", ApplyFilePrefix) fmt.Printf("ApplyFilePrefix: %s\n", ApplyFilePrefix)
} }

34
agent-operator/image/CmiiImageSync.go
View File

@@ -247,24 +247,24 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
} }
targetImageName := targetHarborHost + ":8033/" + targetProject + "/" + imageName targetImageName := targetHarborHost + ":8033/" + targetProject + "/" + imageName
fmt.Println(cmiiImageFullName) //fmt.Println(cmiiImageFullName)
fmt.Println(targetImageName) //fmt.Println(targetImageName)
//if TagFromSourceToTarget(cmiiImageFullName, targetImageName) { if TagFromSourceToTarget(cmiiImageFullName, targetImageName) {
// pushResult := UploadToOctopusKindHarbor(targetImageName) pushResult := UploadToOctopusKindHarbor(targetImageName)
// if pushResult == nil { if pushResult == nil {
// errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName)
// log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s error error !", targetImageName) log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s error error !", targetImageName)
// break break
// } }
// scanner := bufio.NewScanner(pushResult) scanner := bufio.NewScanner(pushResult)
// for scanner.Scan() { for scanner.Scan() {
//
// } }
// log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName) log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName)
//} else { } else {
// errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName)
//} }
} }

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

@@ -38,3 +38,4 @@
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-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

16
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -136,15 +136,15 @@ public class TestBaseFuncScheduler {
// AppFunctionEnum.DEPLOY_CHRONY_SERVER, // AppFunctionEnum.DEPLOY_CHRONY_SERVER,
// AppFunctionEnum.DEPLOY_RKE // AppFunctionEnum.DEPLOY_RKE
AppFunctionEnum.DEPLOY_K8S_DASHBOARD, // AppFunctionEnum.DEPLOY_K8S_DASHBOARD,
AppFunctionEnum.DEPLOY_NFS, // AppFunctionEnum.DEPLOY_NFS,
AppFunctionEnum.DEPLOY_TEST_NFS // AppFunctionEnum.DEPLOY_TEST_NFS
// AppFunctionEnum.DEPLOY_K8S_NAMESPACE, AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
// AppFunctionEnum.DEPLOY_K8S_PVC, AppFunctionEnum.DEPLOY_K8S_PVC,
// AppFunctionEnum.DEPLOY_K8S_MYSQL, AppFunctionEnum.DEPLOY_K8S_MYSQL,
// AppFunctionEnum.DEPLOY_K8S_REDIS, AppFunctionEnum.DEPLOY_K8S_REDIS,
// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES
// AppFunctionEnum.DEPLOY_INGRESS, // AppFunctionEnum.DEPLOY_INGRESS,
// AppFunctionEnum.DEPLOY_FRONTEND, // AppFunctionEnum.DEPLOY_FRONTEND,