[Agent][Deploy] - optimize cmii image

agent-common/image/ImageNameConvert.go

@@ -1,6 +1,8 @@
 package image
 
 import (
+	"os"
+	"path/filepath"
 	"strings"
 	"wdd.io/agent-common/logger"
 )
@@ -172,3 +174,31 @@ func GzipFileNameToImageNameAndTag(gzipFileName string) (imageName, imageTag str
 
 	return "", ""
 }
+
+func GzipFolderPathToCmiiImageTagMaps(gzipFolderPath string) (frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap map[string]string) {
+
+	frontendImageVersionMap = make(map[string]string)
+	backendImageVersionMap = make(map[string]string)
+	srsImageVersionMap = make(map[string]string)
+
+	filepath.WalkDir(gzipFolderPath, func(path string, d os.DirEntry, err error) error {
+		//fmt.Println(path)
+		name := d.Name()
+		if strings.HasSuffix(name, ".tar.gz") {
+			imageName, imageTag := GzipFileNameToImageNameAndTag(name)
+			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 nil
+	})
+
+	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
+}

agent-common/image/ImageNameConvert_test.go

@@ -2,7 +2,11 @@ package image
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
 	"testing"
+	"wdd.io/agent-common/utils"
 )
 
 func TestImageFullNameToGzipFileName(t *testing.T) {
@@ -195,3 +199,34 @@ func TestGzipFileNameToImageFullName(t *testing.T) {
 		fmt.Println("--------------------")
 	}
 }
+
+func TestImageGzipFileNameToImageFullName(t *testing.T) {
+
+	frontendMap := make(map[string]string)
+	backendMap := make(map[string]string)
+	srsMap := make(map[string]string)
+
+	gzipFilePrefix := "/root/octopus_image/xjyd/"
+	filepath.WalkDir(gzipFilePrefix, func(path string, d os.DirEntry, err error) error {
+		//fmt.Println(path)
+		name := d.Name()
+		if strings.HasSuffix(name, ".tar.gz") {
+			imageName, imageTag := GzipFileNameToImageNameAndTag(name)
+			if strings.Contains(imageName, "platform") {
+				frontendMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "srs") {
+				srsMap[imageName] = imageTag
+			} else if strings.Contains(imageName, "operator") {
+				srsMap[imageName] = imageTag
+			} else {
+				backendMap[imageName] = imageTag
+			}
+		}
+
+		return nil
+	})
+
+	utils.BeautifulPrint(backendMap)
+	utils.BeautifulPrint(frontendMap)
+	utils.BeautifulPrint(srsMap)
+}

agent-operator/deploy/OctopusDeploy.go

@@ -2,11 +2,10 @@ package deploy
 
 import (
 	"os"
+	image2 "wdd.io/agent-common/image"
 	"wdd.io/agent-common/logger"
 	"wdd.io/agent-operator/deploy/c_app"
 	"wdd.io/agent-operator/deploy/z_dep"
-	"wdd.io/agent-operator/image"
-	"wdd.io/agent-operator/real_project/zjjt"
 )
 
 var log = logger.Log
@@ -47,7 +46,7 @@ func OctopusDeploy() {
 	//configMapDeploy(common)
 	//c_app.IngressDeploy(common)
 	//
-	//frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	//frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
 	//
 	//backendDeploy(common, backendImageVersionMap)
 	//frontendDeploy(common, frontendImageVersionMap)
@@ -58,19 +57,21 @@ func CmiiAppDeploy() {
 
 	// common environment
 	common := &z_dep.CommonEnvironmentConfig{
-		WebIP:         "10.100.2.121",
+		WebIP:         "36.133.201.78",
 		WebPort:       "8888",
-		HarborIP:      "10.100.2.121",
+		HarborIP:      "192.168.0.14",
 		HarborPort:    "8033",
-		Namespace:     "zjjt",
+		Namespace:     "xjyd",
 		TagVersion:    "5.5.0",
 		TenantEnv:     "",
-		MinioPublicIP: "10.100.2.116",
+		MinioPublicIP: "36.133.201.146",
-		MinioInnerIP:  "10.100.2.116",
+		MinioInnerIP:  "192.168.0.21",
-		NFSServerIP:   "10.100.2.121",
+		NFSServerIP:   "192.168.0.14",
 	}
 
-	frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	//frontendImageVersionMap, backendImageVersionMap, _ := image.FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	gzipFilePrefix := "/root/octopus_image/xjyd/"
+	frontendImageVersionMap, backendImageVersionMap, _ := image2.GzipFolderPathToCmiiImageTagMaps(gzipFilePrefix)
 
 	backendDeploy(common, backendImageVersionMap)
 	frontendDeploy(common, frontendImageVersionMap)

agent-operator/image/CmiiImageSync.go

@@ -523,20 +523,25 @@ func CmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[
 	return cmiiImageVersionMap
 }
 
-func FrontendBackendImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap map[string]string) {
+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
+	return frontendImageVersionMap, backendImageVersionMap, srsImageVersionMap
 }
 
 func loginToDockerHub(HarborFullHost string) {

agent-operator/image/CmiiImageSync_test.go

@@ -205,7 +205,7 @@ func TestConvertCmiiImageMapFromGzipFolder(t *testing.T) {
 }
 
 func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
-	frontendImageVersionMap, backendImageVersionMap := FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
+	frontendImageVersionMap, backendImageVersionMap := FrontendBackendSrsImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
 
 	utils.BeautifulPrint(frontendImageVersionMap)
 	utils.BeautifulPrint(backendImageVersionMap)

agent-operator/real_project/xzyd/Config.go

@@ -0,0 +1 @@
+package xzyd