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

[Agent][Deploy] - cmii deploy template rearrange

Browse Source
This commit is contained in:
zeaslity
2024-06-18 09:52:28 +08:00
parent 51fbb2027d
commit 6b2dc33a34
46 changed files with 12655 additions and 13960 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,21 +6,20 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
"github.com/klauspost/pgzip"
"io"
"io/fs"
"os"
"regexp"
"strconv"
"strings"
"wdd.io/agent-operator/config"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
"github.com/klauspost/pgzip"
image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/logger"
"wdd.io/agent-common/utils"
"wdd.io/agent-deploy/d_app"
)
var apiClient = newClient()
@@ -554,17 +553,17 @@ func GenerateCmiiTagVersionImageMap(specificTag string) (backendMap, frontendMap
}
backendMap = make(map[string]string, len(config.CmiiBackendAppMap))
frontendMap = make(map[string]string, len(config.CmiiFrontendAppMap))
srsMap = make(map[string]string, len(config.CmiiSrsAppMap))
backendMap = make(map[string]string, len(d_app.CmiiBackendAppMap))
frontendMap = make(map[string]string, len(d_app.CmiiFrontendAppMap))
srsMap = make(map[string]string, len(d_app.CmiiSrsAppMap))
for imageName, _ := range config.CmiiBackendAppMap {
for imageName, _ := range d_app.CmiiBackendAppMap {
backendMap[imageName] = specificTag
}
for imageName, _ := range config.CmiiFrontendAppMap {
for imageName, _ := range d_app.CmiiFrontendAppMap {
frontendMap[imageName] = specificTag
}
for imageName, imageTag := range config.CmiiSrsAppMap {
for imageName, imageTag := range d_app.CmiiSrsAppMap {
srsMap[imageName] = imageTag
}
@@ -595,13 +594,13 @@ func WriteDependencyImageToFile() {
middleFile := imageFilePrefix + "middle-image.txt"
_ = os.Remove(middleFile)
for _, image := range config.MiddlewareAmd64 {
for _, image := range d_app.MiddlewareAmd64 {
utils.AppendContentToFile(image+"\n", middleFile)
}
rkeFile := imageFilePrefix + "rke-image.txt"
_ = os.Remove(rkeFile)
for _, image := range config.Rancher1204Amd64 {
for _, image := range d_app.Rancher1204Amd64 {
utils.AppendContentToFile(image+"\n", rkeFile)
}
}

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

@@ -8,7 +8,7 @@ import (
"wdd.io/agent-common/assert"
"wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
"wdd.io/agent-operator/config"
"wdd.io/agent-deploy/d_app"
"wdd.io/agent-operator/real_project/zjjt"
)
@@ -129,7 +129,7 @@ func TestImageFullNameToGzipFileName(t *testing.T) {
"busybox",
}
test = append(test, config.MiddlewareAmd64...)
test = append(test, d_app.MiddlewareAmd64...)
for _, s := range test {
gzipFileName := image.ImageFullNameToGzipFileName(s)