From 955db8bbd8913dca315c5b0665e2865e6ab8236d Mon Sep 17 00:00:00 2001 From: zeaslity Date: Thu, 11 Apr 2024 10:36:19 +0800 Subject: [PATCH] [Cmii][ImageSync] - DCU part modified --- agent-operator/CmiiK8sOperator_test.go | 29 +++++++++++--------------- agent-operator/CmiiMinioOperator.go | 10 ++++----- agent-operator/CmiiOperator_test.go | 4 ++-- agent-operator/image/CmiiImageSync.go | 2 +- cmii_operator/log/cmii-update-log.txt | 4 ++++ 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go index 5630fb0..38c031f 100644 --- a/agent-operator/CmiiK8sOperator_test.go +++ b/agent-operator/CmiiK8sOperator_test.go @@ -245,34 +245,29 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) { // 计算20:00的时间 now := time.Now() - targetTime := time.Date(now.Year(), now.Month(), now.Day(), 20, 0, 0, 0, now.Location()) + targetTime := time.Date(now.Year(), now.Month(), now.Day(), 16, 12, 0, 0, now.Location()) - // 如果当前时间已经过了20:00，那么就跳到下一天 - if now.After(targetTime) { - targetTime = targetTime.Add(24 * time.Hour) + duration := time.Duration(0) + + if !now.After(targetTime) { + // 计算到20:00的剩余时间 + duration = targetTime.Sub(now) + } else { + // 如果当前时间已经过了20:00，那么就跳到下一天 + //targetTime = targetTime.Add(24 * time.Hour) } - // 计算到20:00的剩余时间 - duration := targetTime.Sub(now) + fmt.Println(duration) // 等待到20:00 time.Sleep(duration) - cmiiEnv := demo + cmiiEnv := devFlight //appName := "cmii-uav-platform" //newTag := "5.4.0-032601" appNameTagMap := map[string]string{ - "cmii-uav-waypoint": "5.4.0-032901", - "cmii-uav-platform-armypeople": "5.4.0-032901", - "cmii-uav-platform-open": "5.4.0-032901", - "cmii-admin-data": "5.4.0-032901", - "cmii-uav-industrial-portfolio": "5.4.0-032901", - "cmii-uav-mqtthandler": "5.4.0-032901", - "cmii-uav-alarm": "5.4.0-032501", - "cmii-uav-device": "5.4.0-032501", - "cmii-suav-supervision": "5.4.0-032501", - "cmii-uav-airspace": "5.4.0-032501", + "cmii-uav-industrial-portfolio": "5.4.0-041001", } for appName, newTag := range appNameTagMap { diff --git a/agent-operator/CmiiMinioOperator.go b/agent-operator/CmiiMinioOperator.go index 57c7a17..3757999 100644 --- a/agent-operator/CmiiMinioOperator.go +++ b/agent-operator/CmiiMinioOperator.go @@ -21,9 +21,9 @@ type CmiiMinioOperator struct { } const ( - DefaultLocalEndpoint = "http://10.250.0.100:9000" - DefaultPublicEndpoint = "http://42.192.52.227:9000" - DemoEndpoint = "https://oss.demo.uavcmlc.com:18000" + DefaultLocalEndpoint = "10.250.0.100:9000" + DefaultPublicEndpoint = "42.192.52.227:9000" + DemoEndpoint = "oss.demo.uavcmlc.com:18000" DefaultAccessKeyID = "cmii" DefaultSecretAccessKey = "B#923fC7mk" DefaultOctopusBucketName = "octopus" @@ -50,7 +50,7 @@ func (op CmiiMinioOperator) buildCmiiMinioOperator() { if op.DemoClient == nil { // 初始化Minio客户端对象。 - op.PublicClient, err = minio.New(DemoEndpoint, DefaultAccessKeyID, DefaultSecretAccessKey, false) + op.DemoClient, err = minio.New(DemoEndpoint, DefaultAccessKeyID, DefaultSecretAccessKey, false) if err != nil { log.ErrorF("[buildCmiiMinioOperator] - build for DemoClient error ! => %s", err.Error()) } @@ -73,7 +73,7 @@ func (op CmiiMinioOperator) UploadToPublicOctopus(filePath, fileName string) boo func (op CmiiMinioOperator) UploadToDemo(bucketName, filePath, fileName string) bool { op.buildCmiiMinioOperator() - return op.uploadToOss(op.PublicClient, bucketName, filePath, fileName) + return op.uploadToOss(op.DemoClient, bucketName, filePath, fileName) } func (op CmiiMinioOperator) uploadToOctopus(client *minio.Client, filePath, fileName string) bool { diff --git a/agent-operator/CmiiOperator_test.go b/agent-operator/CmiiOperator_test.go index f1d3e9e..081efcd 100644 --- a/agent-operator/CmiiOperator_test.go +++ b/agent-operator/CmiiOperator_test.go @@ -58,14 +58,14 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) { ProjectVersion: "", DirectHarborHost: "", CompressImageToGzip: false, - UploadToDemoMinio: false, + UploadToDemoMinio: true, ShouldDirectPushToHarbor: false, } // 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。 result := sync.PullFromEntityAndSyncConditionally() - utils.BeautifulPrint(sync) + utils.BeautifulPrint(result) // 添加断言以检查函数的输出，例如： if len(result.ErrorPullImageList) != 0 { diff --git a/agent-operator/image/CmiiImageSync.go b/agent-operator/image/CmiiImageSync.go index c6034b2..e5250e2 100644 --- a/agent-operator/image/CmiiImageSync.go +++ b/agent-operator/image/CmiiImageSync.go @@ -312,7 +312,7 @@ func PullCmiiFromFileJson(filePathName string) { func PullFromFullNameList(fullImageNameList []string) (errorPullImageList []string) { for _, fullImageName := range fullImageNameList { - + log.DebugF("start to pull => [%s]", fullImageName) pullResult := PullFromCmiiHarbor(fullImageName) if pullResult == nil { errorPullImageList = append(errorPullImageList, fullImageName) diff --git a/cmii_operator/log/cmii-update-log.txt b/cmii_operator/log/cmii-update-log.txt index 7b38f3e..4361bd1 100644 --- a/cmii_operator/log/cmii-update-log.txt +++ b/cmii_operator/log/cmii-update-log.txt @@ -27,3 +27,7 @@ 2024-03-29-20-09-25 uavcloud-demo cmii-uav-alarm 5.4.0-0321 5.4.0-032501 2024-03-29-20-10-45 uavcloud-demo cmii-uav-device 5.4.0-0321 5.4.0-032501 2024-03-29-20-12-18 uavcloud-demo cmii-suav-supervision 5.2.0 5.4.0-032501 +2024-04-08-14-28-00 uavcloud-devflightcmii-uav-industrial-portfolio 5.5.0-snapshot 5.4.0-040801 +2024-04-08-15-02-00 uavcloud-devflightcmii-uav-industrial-portfolio 5.4.0-040801 5.4.0-040802 +2024-04-08-17-30-00 uavcloud-devflightcmii-uav-industrial-portfolio 5.4.0-040802 5.4.0-040803 +2024-04-10-16-12-00 uavcloud-devflightcmii-uav-industrial-portfolio 5.5.0-snapshot 5.4.0-041001