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

[Agent][GO] - fix deploy bugs

Browse Source
This commit is contained in:
zeaslity
2024-07-17 16:22:40 +08:00
parent 034ae3d25b
commit b7daaddf1e
47 changed files with 25342 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agent-operator/CmiiDeployOperator.go
View File

@@ -24,11 +24,12 @@ func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompl
} else {
// demo ==> ""
// cqlyj ==> ""
tenantEnv = ""
tenantEnv = deployCommonEnv.Namespace
}
// assign folder prefix
deployCommonEnv.ApplyFilePrefix = folderPrefix
deployCommonEnv.TenantEnv = tenantEnv
var backendMap map[string]string
var frontendMap map[string]string
@@ -84,7 +85,7 @@ func CmiiNewAppDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, newAppName
} else {
// demo ==> ""
// cqlyj ==> ""
tenantEnv = ""
tenantEnv = "demo"
}
// assign folder prefix

17
agent-operator/CmiiDeployOperator_test.go
View File

@@ -44,6 +44,23 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
}
func TestCmiiEnvDeploy_LiuXiTongGan(t *testing.T) {
// chongqing sanhua
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "10.250.0.200",
WebPort: "8888",
HarborIPOrCustomImagePrefix: "10.250.0.200",
HarborPort: "8033",
Namespace: "bjtg",
TagVersion: "5.6.0",
NFSServerIP: "10.250.0.200",
}
CmiiEnvDeploy(commonEnv, true, demo)
}
func TestCmiiNewAppDeploy(t *testing.T) {
deployNamespace := devOperation

4
agent-operator/CmiiK8sOperator_test.go
View File

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
// 计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 05, 00, 0, now.Location())
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 14, 35, 00, 0, now.Location())
duration := time.Duration(0)
@@ -277,7 +277,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
appNameTagMap := map[string]string{
//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
//"cmii-uav-data-post-process": "5.6.0-062401",
"cmii-uav-industrial-portfolio": "5.6.0-071601",
"cmii-uav-industrial-portfolio": "5.6.0-071701",
//"cmii-uav-multilink": "5.5.0",
//"cmii-uav-developer": "5.6.0-062701",
//"cmii-uav-platform": "5.6.0-0626",

6
agent-operator/CmiiOperator_test.go
View File

@@ -53,9 +53,9 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
},
FullNameImageList: nil,
ProjectVersion: "",
ProjectName: "cqsh",
DirectHarborHost: "chongqingcis-9b4a3da9.ecis.chongqing-1.cmecloud.cn",
ShouldDownloadImage: true,
ProjectName: "bjtg",
DirectHarborHost: "harbor.wdd.io:8033",
ShouldDownloadImage: false,
ShouldCompressImageToGzip: false,
ShouldUploadToDemoMinio: false,
ShouldDirectPushToHarbor: true,

7
agent-operator/image/CmiiImageOperator.go
View File

@@ -190,9 +190,9 @@ func UploadToOctopusKindHarbor(targetImageName string) (pushResult io.ReadCloser
}
pushResult, err := apiClient.ImagePush(context.TODO(), targetImageName, types.ImagePushOptions{
All: false,
//RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
RegistryAuth: "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
All: false,
RegistryAuth: "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
//RegistryAuth: "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
PrivilegeFunc: nil,
Platform: "amd64",
})
@@ -248,6 +248,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
//fmt.Println(scanner.Text())
}
log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName)
fmt.Println()
} else {
errorPushImageNameList = append(errorPushImageNameList, cmiiImageFullName)
}

27
agent-operator/image/HarborOperator_test.go
View File

@@ -9,7 +9,7 @@ import (
var DefaultHarborOperator *HarborOperator
func TestHarborOperator_BuildOperator(t *testing.T) {
func TestHarborOperator_BuildOperator_CMII(t *testing.T) {
harborOperator := &HarborOperator{
HarborHost: "http://harbor.cdcyy.com.cn",
HarborPort: "",
@@ -28,6 +28,25 @@ func TestHarborOperator_BuildOperator(t *testing.T) {
}
func TestHarborOperator_BuildOperator(t *testing.T) {
harborOperator := &HarborOperator{
HarborHost: "http://harbor.wdd.io",
HarborPort: "8033",
HarborUser: "admin",
HarborPass: "V2ryStr@ngPss",
HarborClient: nil,
}
_, err := harborOperator.BuildOperator()
if err != nil {
t.Logf("error is %s", err.Error())
return
}
DefaultHarborOperator = harborOperator
}
func TestHarborOperator_RepoListAll(t *testing.T) {
TestHarborOperator_BuildOperator(t)
@@ -67,7 +86,7 @@ func TestHarborOperator_ArtifactListAll(t *testing.T) {
}
func TestHarborOperator_CmiiHarborCleanUp(t *testing.T) {
TestHarborOperator_BuildOperator(t)
TestHarborOperator_BuildOperator_CMII(t)
//repoListAll := DefaultHarborOperator.RepoListAll("ran")
repoListAll := DefaultHarborOperator.RepoListAll("cmii")
@@ -117,14 +136,14 @@ func TestHarborOperator_ArtifactDeleteOne(t *testing.T) {
func TestHarborOperator_CmiiTagFilter(t *testing.T) {
TestHarborOperator_BuildOperator(t)
imageMap := DefaultHarborOperator.CmiiTagFilter("4")
imageMap := DefaultHarborOperator.CmiiTagFilter("5")
utils.BeautifulPrint(imageMap)
}
func TestHarborOperator_ArtifactDeleteFromNameTagList(t *testing.T) {
TestHarborOperator_BuildOperator(t)
allCmiiImageList := DefaultHarborOperator.CmiiTagFilter("4")
allCmiiImageList := DefaultHarborOperator.CmiiTagFilter("5.5")
errorDeleteList := DefaultHarborOperator.ArtifactDeleteFromNameTagList("cmii", allCmiiImageList)
utils.BeautifulPrint(errorDeleteList)
}

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

@@ -106,3 +106,4 @@
2024-07-12-11-40-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071201 5.6.0-071202
2024-07-15-10-05-51 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071206 5.6.0-071501
2024-07-16-17-06-59 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071501 5.6.0-071601
2024-07-17-14-37-11 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071601 5.6.0-071701

69
agent-operator/real_project/bgtg/Config.go
View File

@@ -69,3 +69,72 @@ var AllCmiiImageTagList = []string{
"cmii-suav-platform-supervision:5.4.0",
"cmii-uav-airspace:5.4.0-0402",
}
var AllCMiiImageFullNameList560 = []string{
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-30015-29835-071601",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.5.0-30015-061801",
"harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:5.6.0-0716",
"harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.6.0-061202",
"harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.6.0-062401",
"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.6.0-062602",
"harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.6.0-062601",
"harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.6.0-0704",
"harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.6.0-0708",
"harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.6.0-0704",
"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.6.0-060601",
"harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.6.0-30015-070801",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.6.0-0715",
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.6.0-071601",
"harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.6.0-0704",
"harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.6.0-30067-071604",
"harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.6.0-0704",
"harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.6.0-070401",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.6.0-0710",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-dispatchh5:5.6.0-0708",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.6.0-0704",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.6.0-29267-0717",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.6.0-0708",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:5.6.0-0709",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:5.6.0-0709",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.6.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.6.0-28028-071102",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195",
"harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA",
}