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

[Agent][Deploy] - add zjyd

Browse Source
This commit is contained in:
zeaslity
2024-08-20 09:35:32 +08:00
parent 1828116d8a
commit 40b540f082
252 changed files with 21873 additions and 25482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,27 +510,6 @@ func CmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[
return cmiiImageVersionMap
}
func FrontendBackendSrsImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap map[string]string) {
frontendImageVersionMap = make(map[string]string)
backendImageVersionMap = make(map[string]string)
srsImageVersionMap = make(map[string]string)
for imageName, imageTag := range cmiiImageVersionMap {
if strings.Contains(imageName, "platform") {
frontendImageVersionMap[imageName] = imageTag
} else if strings.Contains(imageName, "srs") {
srsImageVersionMap[imageName] = imageTag
} else if strings.Contains(imageName, "operator") {
srsImageVersionMap[imageName] = imageTag
} else {
backendImageVersionMap[imageName] = imageTag
}
}
return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
}
// GenerateCmiiTagVersionImageMap 生成特定版本的ImageTagMap
func GenerateCmiiTagVersionImageMap(specificTag string) (backendMap, frontendMap, srsMap map[string]string) {
matched, _ := regexp.MatchString(`^\d+\.\d+\.\d+$`, specificTag)

8
agent-operator/image/CmiiImageOperator_test.go
View File

@@ -9,7 +9,6 @@ import (
"wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
"wdd.io/agent-deploy/d_app"
"wdd.io/agent-operator/real_project/zjjt"
)
func TestGetRunningContainer(t *testing.T) {
@@ -205,13 +204,6 @@ func TestConvertCmiiImageMapFromGzipFolder(t *testing.T) {
utils.BeautifulPrint(versionMap)
}
func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
frontendImageVersionMap, backendImageVersionMap, _ := FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
utils.BeautifulPrint(frontendImageVersionMap)
utils.BeautifulPrint(backendImageVersionMap)
}
func TestImageNameToTargetImageFullName(t *testing.T) {
AllCmiiImageTagList := []string{

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

@@ -135,8 +135,8 @@ func TestHarborOperator_ArtifactDeleteOne(t *testing.T) {
}
func TestHarborOperator_CmiiTagFilter(t *testing.T) {
TestHarborOperator_BuildOperator(t)
imageMap := DefaultHarborOperator.CmiiTagFilter("5")
TestHarborOperator_BuildOperator_CMII(t)
imageMap := DefaultHarborOperator.CmiiTagFilter("5.7")
utils.BeautifulPrint(imageMap)
}