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

[Agent][Operator] - image sync

Browse Source
This commit is contained in:
zeaslity
2024-04-26 16:36:19 +08:00
parent 421f53a8aa
commit 318a5a8026
7 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
agent-common/pusher/CmiiUpdateMessage.go
View File

@@ -22,17 +22,16 @@ type CmiiUpdateMessage struct {
}
type Message struct { // TODO combine with server.message
ID string
Event string
Time int64
Topic string
Message string
Title string
Priority int
Tags []string
Click string
Icon string
Attachment *Attachment
ID string
Event string
Time int64
Topic string
Message string
Title string
Priority int
Tags []string
Click string
Icon string
// Additional fields
TopicURL string

5
agent-operator/CmiiK8sOperator_test.go
View File

@@ -251,7 +251,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 57, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 45, 00, 0, now.Location())
duration := time.Duration(0)
@@ -273,7 +273,8 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
//newTag := "5.4.0-032601"
appNameTagMap := map[string]string{
"cmii-uav-platform-media": "5.4.0",
//"cmii-uav-multilink": "5.5.0",
"cmii-uav-data-post-process": "5.5.0-042501",
}
for appName, newTag := range appNameTagMap {

2
agent-operator/CmiiMinioOperator.go
View File

@@ -198,7 +198,7 @@ func (op *MinioOperator) UploadFile(bucketNameWithSuffix, filePath, fileName str
// 使用PutObject上传文件
// fileName ==> tmp/123/123.txt
// realFileName ==> 123.txt
log.InfoF("[UploadFile] - upload from [%s] to [%s]", filePath+realFileName, op.MinioEndpoint+"/"+bucketNameWithSuffix+"/"+fileName)
log.InfoF("[UploadFile] - upload from [%s] to [%s]", filePath+realFileName, op.MinioEndpoint+"/"+bucketNameWithSuffix+fileName)
n, err := op.Client.FPutObject(bucketNameWithSuffix, fileName, filePath+realFileName, minio.PutObjectOptions{})
if err != nil {
log.ErrorF("[UploadFile] - upload [%s] to [%s] error %s", filePath+realFileName, op.MinioEndpoint+"/"+bucketNameWithSuffix+"/"+fileName, err.Error())

3
agent-operator/CmiiOperator.go
View File

@@ -181,10 +181,9 @@ func DownloadCompressUpload(fullNameList []string, shouldGzip bool, gzipFolderFu
bucketName := "cmlc-installation/" + trimPrefix
log.InfoF("gzip file location in demo oss is %s", DefaultDemoEndpoint+"/"+bucketName)
minioOperator := CmiiMinioOperator{}
for _, gzipFileName := range allGzipFileNameList {
if !minioOperator.UploadToDemo(bucketName, gzipFolderFullPath, gzipFileName) {
if !DefaultCmiiMinioOperator.UploadToDemo(bucketName, gzipFolderFullPath, gzipFileName) {
log.ErrorF("upload of %s to demo oss error !", gzipFolderFullPath+gzipFileName)
}
}

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

@@ -142,7 +142,7 @@ func PruneAllCmiiImages() (errorRemoveImageNameList []string) {
for _, imageSummary := range imageGetAll {
for _, repoTag := range imageSummary.RepoTags {
if strings.HasPrefix(repoTag, image2.CmiiHarborPrefix) {
if strings.HasPrefix(repoTag, image2.CmiiHarborPrefix) || strings.HasPrefix(repoTag, "harbor.wdd.io") || strings.Contains(repoTag, ":8033") {
for _, tag := range imageSummary.RepoTags {
_, err := apiClient.ImageRemove(context.TODO(), imageSummary.ID, types.ImageRemoveOptions{
Force: true,

65
agent-operator/real_project/zjjt/RealImageConfig.go Normal file
View File

@@ -0,0 +1,65 @@
package zjjt
var RealImagePullList = []string{
"harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.4.0-032501",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.3.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.5.0-041801",
"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-uav-autowaypoint:4.2.0-beta",
"harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810",
"harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.5.0-0419",
"harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.5.0-0419",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.5.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.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.5.0",
"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",
}

23
cmii_operator/log/cmii-update-log.txt Normal file
View File

@@ -0,0 +1,23 @@
2024-04-18-17-20-00 uavcloud-demo cmii-uav-integration 5.5.0 5.5.0-0418
2024-04-19-09-30-00 uavcloud-demo cmii-uav-platform-open 5.5.0 5.5.0-0419
2024-04-22-09-18-00 uavcloud-demo cmii-uav-airspace 5.5.0 5.5.0-0422
2024-04-22-14-20-00 uavcloud-demo cmii-uav-airspace 5.5.0-0422 5.5.0-042201
2024-04-22-16-57-00 uavcloud-demo cmii-uav-airspace 5.5.0-042201 5.5.0-042202
2024-04-23-09-27-00 uavcloud-demo cmii-uav-device 5.5.0 5.5.0-042301
2024-04-23-11-15-00 uavcloud-demo cmii-uav-platform 5.5.0 5.5.0-042301
2024-04-23-11-17-00 uavcloud-demo cmii-suav-platform-supervision 5.5.0 5.5.0-042301
2024-04-23-16-28-06 uavcloud-dev cmii-suav-platform-supervision 5.2.0-test 5.5.0-042301
2024-04-23-17-35-00 uavcloud-dev cmii-uav-platform-armypeople 5.5.0-validation 5.5.0-042301
2024-04-23-17-36-00 uavcloud-demo cmii-uav-platform-armypeople 5.5.0-042201 5.5.0-042301
2024-04-24-12-00-00 uavcloud-demo cmii-uav-platform 5.5.0-042301 5.5.0-042401
2024-04-24-12-00-07 uavcloud-demo cmii-uav-airspace 5.5.0-042202 5.5.0-042401
2024-04-24-12-01-47 uavcloud-demo cmii-uav-industrial-portfolio 5.5.0-042201 5.5.0-042401
2024-04-24-12-03-14 uavcloud-demo cmii-uav-surveillance 5.5.0 5.5.0-042401
2024-04-24-17-30-00 uavcloud-demo cmii-uav-platform 5.5.0-042401 5.5.0-042402
2024-04-24-17-30-07 uavcloud-demo cmii-uav-cloud-live 5.5.0 5.5.0-042401
2024-04-24-17-31-51 uavcloud-demo cmii-uav-mission 5.5.0 5.5.0-042401
2024-04-25-09-36-00 uavcloud-demo cmii-uav-platform 5.5.0-042402 5.5.0-042501
2024-04-25-09-37-12 uavcloud-demo cmii-uav-industrial-portfolio 5.5.0-042401 5.5.0-042501
2024-04-25-17-42-00 uavcloud-demo cmii-uav-platform 5.5.0-042501 5.5.0-042503
2024-04-25-17-42-06 uavcloud-demo cmii-uav-platform-splice 5.5.0 5.5.0-042501
2024-04-25-17-45-00 uavcloud-demo cmii-uav-data-post-process 5.5.0 5.5.0-042501