From 9b6520d3f2886ef45b5e9730447e23837a5d0aa0 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 4 Jun 2024 16:53:37 +0800 Subject: [PATCH] [Agent][Deploy] - update --- agent-operator/CmiiK8sOperator_test.go | 4 +- agent-operator/CmiiOperator_test.go | 13 +-- agent-operator/deploy/OctopusDeploy.go | 80 +++++++++++++------ agent-operator/deploy/z_dep/G.go | 4 +- agent-operator/image/CmiiImageSync.go | 34 ++++---- agent-operator/log/cmii-update-log.txt | 1 + .../server/func/TestBaseFuncScheduler.java | 16 ++-- 7 files changed, 93 insertions(+), 59 deletions(-) diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go index 35fd70c..0cc68ca 100644 --- a/agent-operator/CmiiK8sOperator_test.go +++ b/agent-operator/CmiiK8sOperator_test.go @@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) { // 计算20:00的时间 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) @@ -276,7 +276,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) { appNameTagMap := map[string]string{ //"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 { diff --git a/agent-operator/CmiiOperator_test.go b/agent-operator/CmiiOperator_test.go index 4d9c40b..0aa3fa1 100644 --- a/agent-operator/CmiiOperator_test.go +++ b/agent-operator/CmiiOperator_test.go @@ -49,16 +49,19 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) { // 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。 sync := ImageSyncEntity{ 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, ProjectVersion: "", - ProjectName: "szga", - DirectHarborHost: "harbor.wdd.io", + ProjectName: "bjtg", + DirectHarborHost: "10.250.0.110", DownloadImage: true, - CompressImageToGzip: true, + CompressImageToGzip: false, UploadToDemoMinio: false, - ShouldDirectPushToHarbor: false, + ShouldDirectPushToHarbor: true, } // 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。 diff --git a/agent-operator/deploy/OctopusDeploy.go b/agent-operator/deploy/OctopusDeploy.go index a808f85..5fd1cb0 100644 --- a/agent-operator/deploy/OctopusDeploy.go +++ b/agent-operator/deploy/OctopusDeploy.go @@ -4,6 +4,9 @@ import ( "os" image2 "wdd.io/agent-common/image" "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/z_dep" ) @@ -14,37 +17,38 @@ func OctopusDeploy() { // common environment common := &z_dep.CommonEnvironmentConfig{ - WebIP: "172.28.0.251", + WebIP: "10.250.0.110", WebPort: "8888", - HarborIP: "172.28.0.251", + HarborIP: "10.250.0.110", HarborPort: "8033", - Namespace: "szga", + Namespace: "bjtg", TagVersion: "5.5.0", TenantEnv: "", - MinioPublicIP: "172.28.0.251", - MinioInnerIP: "172.28.0.251", - NFSServerIP: "172.28.0.251", + MinioPublicIP: "10.250.0.110", + MinioInnerIP: "10.250.0.110", + NFSServerIP: "10.250.0.110", } - //a_dashboard.K8sDashboardDeploy(common) - // - //a_nfs.NFSDeploy(common) - //a_nfs.NFSTestDeploy(common) - // - //// pvc - //b_middle.PVCDeploy(common) - // - //// middlewares - //b_middle.MidMySQlDeploy(common) - //b_middle.MidRedisDeploy(common) - //b_middle.MidEmqxDeploy(common) - //b_middle.MidMongoDeploy(common) - //b_middle.MidRabbitMQDeploy(common) - //b_middle.MidRabbitMQDeploy(common) - //b_middle.MidNacosDeploy(common) - // - //configMapDeploy(common) - //c_app.IngressDeploy(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) + + // pvc + b_middle.PVCDeploy(common) + + // middlewares + b_middle.MidMySQlDeploy(common) + b_middle.MidRedisDeploy(common) + b_middle.MidEmqxDeploy(common) + b_middle.MidMongoDeploy(common) + b_middle.MidRabbitMQDeploy(common) + b_middle.MidRabbitMQDeploy(common) + b_middle.MidNacosDeploy(common) + + configMapDeploy(common) + c_app.IngressDeploy(common) gzipFilePrefix := "/root/octopus_image/xjyd/" 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) { os.Remove(c_app.BackendApplyFilePath) @@ -89,7 +111,13 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap for appName, tag := range backendImageVersionMap { c_app.DefaultCmiiBackendConfig.AppName = appName 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) } } diff --git a/agent-operator/deploy/z_dep/G.go b/agent-operator/deploy/z_dep/G.go index 6ce0750..2dbe2b2 100644 --- a/agent-operator/deploy/z_dep/G.go +++ b/agent-operator/deploy/z_dep/G.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "github.com/go-playground/validator/v10" + "os" "runtime" "text/template" "wdd.io/agent-common/assert" @@ -20,7 +21,7 @@ var log = logger.Log func init() { switch runtime.GOOS { 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 ApplyFilePrefix = "MacOS value" case "windows": @@ -29,6 +30,7 @@ func init() { ApplyFilePrefix = "Unknown OS" } + _ = os.Mkdir(ApplyFilePrefix, os.ModePerm) fmt.Printf("ApplyFilePrefix: %s\n", ApplyFilePrefix) } diff --git a/agent-operator/image/CmiiImageSync.go b/agent-operator/image/CmiiImageSync.go index cfbaeb4..2ceb51e 100644 --- a/agent-operator/image/CmiiImageSync.go +++ b/agent-operator/image/CmiiImageSync.go @@ -247,24 +247,24 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s } targetImageName := targetHarborHost + ":8033/" + targetProject + "/" + imageName - fmt.Println(cmiiImageFullName) - fmt.Println(targetImageName) + //fmt.Println(cmiiImageFullName) + //fmt.Println(targetImageName) - //if TagFromSourceToTarget(cmiiImageFullName, targetImageName) { - // pushResult := UploadToOctopusKindHarbor(targetImageName) - // if pushResult == nil { - // errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) - // log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s error error !", targetImageName) - // break - // } - // scanner := bufio.NewScanner(pushResult) - // for scanner.Scan() { - // - // } - // log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName) - //} else { - // errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) - //} + if TagFromSourceToTarget(cmiiImageFullName, targetImageName) { + pushResult := UploadToOctopusKindHarbor(targetImageName) + if pushResult == nil { + errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) + log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s error error !", targetImageName) + break + } + scanner := bufio.NewScanner(pushResult) + for scanner.Scan() { + + } + log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName) + } else { + errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName) + } } diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt index 3409300..656b334 100644 --- a/agent-operator/log/cmii-update-log.txt +++ b/agent-operator/log/cmii-update-log.txt @@ -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-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-06-03-17-31-36 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-sense-052201 5.6.0-060301 diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index 8a357b6..9103106 100644 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -136,15 +136,15 @@ public class TestBaseFuncScheduler { // AppFunctionEnum.DEPLOY_CHRONY_SERVER, // AppFunctionEnum.DEPLOY_RKE - AppFunctionEnum.DEPLOY_K8S_DASHBOARD, - AppFunctionEnum.DEPLOY_NFS, - AppFunctionEnum.DEPLOY_TEST_NFS +// AppFunctionEnum.DEPLOY_K8S_DASHBOARD, +// AppFunctionEnum.DEPLOY_NFS, +// AppFunctionEnum.DEPLOY_TEST_NFS -// AppFunctionEnum.DEPLOY_K8S_NAMESPACE, -// AppFunctionEnum.DEPLOY_K8S_PVC, -// AppFunctionEnum.DEPLOY_K8S_MYSQL, -// AppFunctionEnum.DEPLOY_K8S_REDIS, -// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES + AppFunctionEnum.DEPLOY_K8S_NAMESPACE, + AppFunctionEnum.DEPLOY_K8S_PVC, + AppFunctionEnum.DEPLOY_K8S_MYSQL, + AppFunctionEnum.DEPLOY_K8S_REDIS, + AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES // AppFunctionEnum.DEPLOY_INGRESS, // AppFunctionEnum.DEPLOY_FRONTEND,