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

[agent-deploy] - bug fix

Browse Source
This commit is contained in:
zeaslity
2024-04-26 15:57:28 +08:00
parent 7f4a4d877e
commit 421f53a8aa
22 changed files with 7369 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,7 @@ func PullFromCmiiHarbor(imageName string) (pullResult io.ReadCloser) {
func PullFromCmiiHarborByMap(imageVersionMap map[string]string, silentMode bool) (fullImageNameList, errorPullImageList []string) {
fullImageNameList = ConvertCmiiImageMapToList(imageVersionMap)
fullImageNameList = CmiiImageMapToFullNameList(imageVersionMap)
return fullImageNameList, PullFromFullNameList(fullImageNameList)
}
@@ -474,7 +474,7 @@ func SaveToTarGZ(targetImageName, folderPathPrefix string) bool {
return true
}
func ConvertCmiiImageMapToList(cmiiImageVersionMap map[string]string) (fullImageNameList []string) {
func CmiiImageMapToFullNameList(cmiiImageVersionMap map[string]string) (fullImageNameList []string) {
for image, tag := range cmiiImageVersionMap {
s := image2.CmiiHarborPrefix + image + ":" + tag
@@ -484,14 +484,14 @@ func ConvertCmiiImageMapToList(cmiiImageVersionMap map[string]string) (fullImage
return fullImageNameList
}
func ConvertCmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[string]string) {
func CmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[string]string) {
allFileInFolder, err := utils.ListAllFileInFolder(gzipFileFolder)
if err != nil {
return nil
}
cmiiImageVersionMap = make(map[string]string, len(allFileInFolder))
cmiiImageVersionMap = make(map[string]string)
for _, gzipFileName := range allFileInFolder {
log.DebugF("gzip file name is %s", gzipFileName)
imageName, imageTag := image2.GzipFileNameToImageNameAndTag(gzipFileName)
@@ -501,6 +501,22 @@ func ConvertCmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionM
return cmiiImageVersionMap
}
func FrontendBackendImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap map[string]string) {
frontendImageVersionMap = make(map[string]string)
backendImageVersionMap = make(map[string]string)
for imageName, imageTag := range cmiiImageVersionMap {
if strings.Contains(imageName, "platform") {
frontendImageVersionMap[imageName] = imageTag
} else {
backendImageVersionMap[imageName] = imageTag
}
}
return frontendImageVersionMap, backendImageVersionMap
}
func loginToDockerHub(HarborFullHost string) {
if HarborFullHost == "" {

10
agent-operator/image/CmiiImageSync_test.go
View File

@@ -8,6 +8,7 @@ import (
"wdd.io/agent-common/assert"
"wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
"wdd.io/agent-operator/real_project/zjjt"
)
func TestGetRunningContainer(t *testing.T) {
@@ -198,7 +199,14 @@ func TestSaveSpecificImageToGzipFile(t *testing.T) {
func TestConvertCmiiImageMapFromGzipFolder(t *testing.T) {
versionMap := ConvertCmiiImageMapFromGzipFolder(OfflineImageGzipFolderPrefix)
versionMap := CmiiImageMapFromGzipFolder(OfflineImageGzipFolderPrefix)
utils.BeautifulPrint(versionMap)
}
func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
frontendImageVersionMap, backendImageVersionMap := FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
utils.BeautifulPrint(frontendImageVersionMap)
utils.BeautifulPrint(backendImageVersionMap)
}