From 0bc6ecc75dd7d778f8ba82be15d8e05c307e4faf Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 26 Mar 2024 14:21:05 +0800 Subject: [PATCH] [Cmii][ImageSync] -Image Function --- agent-go/executor/BaseFunction_test.go | 2 +- agent-go/executor/ImageFunction_test.go | 24 ++++++++++ agent-operator/main.go | 18 +++++-- .../real_project/xmyd/CmiiConfig.go | 47 +++++++++++++++++++ 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 agent-go/executor/ImageFunction_test.go diff --git a/agent-go/executor/BaseFunction_test.go b/agent-go/executor/BaseFunction_test.go index 6ccd79e..217b9de 100644 --- a/agent-go/executor/BaseFunction_test.go +++ b/agent-go/executor/BaseFunction_test.go @@ -21,7 +21,7 @@ var agentOP = &AgentOsOperator{ AgentServerInfo: ®ister.AgentServerInfo{ ServerName: "", ServerIPPbV4: "", - ServerIPInV4: "10.250.0.147", + ServerIPInV4: "10.250.0.100", ServerIPPbV6: "", ServerIPInV6: "", Location: "", diff --git a/agent-go/executor/ImageFunction_test.go b/agent-go/executor/ImageFunction_test.go new file mode 100644 index 0000000..34ad215 --- /dev/null +++ b/agent-go/executor/ImageFunction_test.go @@ -0,0 +1,24 @@ +package executor + +import ( + "fmt" + "strconv" + "testing" + "wdd.io/agent-common/utils" +) + +func TestAgentOsOperator_Sync(t *testing.T) { + + funcArgs := []string{ + "", + "", + "", + "", + "", + "", + "", + } + sync, strings := agentOP.Sync("DOWNLOAD_DOCKER_IMAGE", funcArgs...) + fmt.Println("func result are => " + strconv.FormatBool(sync)) + utils.BeautifulPrint(strings) +} diff --git a/agent-operator/main.go b/agent-operator/main.go index fc6a42a..5c2ddc2 100644 --- a/agent-operator/main.go +++ b/agent-operator/main.go @@ -3,6 +3,7 @@ package main import ( "os" "wdd.io/agent-common/utils" + "wdd.io/agent-operator/real_project/xmyd" ) var LocalKubeConfigFile = "/root/.kube/config" @@ -29,10 +30,14 @@ func main() { op := CmiiK8sOperator{} op.BuildCurrentClientFromConfig(readFile) + CmiiOperator = op // ops // update + result := UpdateCmiiImageTagFromNameTagMap(realNamespace, xmyd.Real540ImageTagMap) + utils.BeautifulPrint(result) + //for _, imageFullName := range xmyd.AllCmiiImageTagList { // appName := image.ImageFullNameToAppName(imageFullName) // if appName == "" { @@ -49,9 +54,16 @@ func main() { // //} + // backup system app tag + //backendMap, frontendMap, srsMap := BackupAllCmiiDeploymentToMap(realNamespace) + //utils.BeautifulPrint(backendMap) + //utils.BeautifulPrint(frontendMap) + //utils.BeautifulPrint(srsMap) + // scale deployment - CmiiOperator = op - ScaleCmiiFrontendDeploymentToDesiredReplicas(realNamespace, 1) - ScaleCmiiBackendDeploymentToDesiredReplicas(realNamespace, 1) + //ScaleCmiiFrontendDeploymentToDesiredReplicas(realNamespace, 1) + //ScaleCmiiBackendDeploymentToDesiredReplicas(realNamespace, 1) + + // update from map } diff --git a/agent-operator/real_project/xmyd/CmiiConfig.go b/agent-operator/real_project/xmyd/CmiiConfig.go index 0ff43a9..852a4e6 100644 --- a/agent-operator/real_project/xmyd/CmiiConfig.go +++ b/agent-operator/real_project/xmyd/CmiiConfig.go @@ -65,3 +65,50 @@ var AllCmiiImageTagList = []string{ "ossrs/srs:v5.0.195", "harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA", } + +var Real540ImageTagMap = map[string]string{ + "cmii-admin-data": "5.4.0", + "cmii-admin-gateway": "5.4.0", + "cmii-admin-user": "5.4.0", + "cmii-open-gateway": "5.4.0", + "cmii-suav-supervision": "5.4.0", + "cmii-uav-airspace": "5.4.0", + "cmii-uav-alarm": "5.4.0", + "cmii-uav-brain": "5.4.0", + "cmii-uav-cloud-live": "5.4.0", + "cmii-uav-cms": "5.4.0", + "cmii-uav-developer": "5.4.0", + "cmii-uav-device": "5.4.0", + "cmii-uav-emergency": "5.4.0", + "cmii-uav-gateway": "5.4.0", + "cmii-uav-gis-server": "5.2.0", + "cmii-uav-industrial-portfolio": "5.4.0-xmyd-0326", + "cmii-uav-integration": "5.4.0", + "cmii-uav-logger": "5.4.0", + "cmii-uav-material-warehouse": "5.4.0", + "cmii-uav-mission": "5.4.0-xmyd-032501", + "cmii-uav-mqtthandler": "5.4.0-xmyd-032501", + "cmii-uav-notice": "5.4.0", + "cmii-uav-oauth": "5.4.0", + "cmii-uav-process": "5.4.0", + "cmii-uav-surveillance": "5.4.0", + "cmii-suav-platform-supervision": "5.4.0", + "cmii-suav-platform-supervisionh5": "5.4.0", + "cmii-uav-platform": "5.4.0-xmyd-032501", + "cmii-uav-platform-ai-brain": "5.4.0", + "cmii-uav-platform-armypeople": "5.4.0-xmyd-032502", + "cmii-uav-platform-base": "5.4.0", + "cmii-uav-platform-cms-portal": "5.4.0", + "cmii-uav-platform-detection": "5.4.0", + "cmii-uav-platform-emergency-rescue": "5.4.0", + "cmii-uav-platform-logistics": "5.4.0", + "cmii-uav-platform-media": "5.4.0", + "cmii-uav-platform-mws": "5.4.0", + "cmii-uav-platform-oms": "5.4.0", + "cmii-uav-platform-open": "5.4.0", + "cmii-uav-platform-security": "5.4.0", + "cmii-uav-platform-seniclive": "5.4.0", + "cmii-uav-platform-share": "5.4.0", + "cmii-uav-platform-splice": "5.4.0", + "cmii-uav-platform-visualization": "5.4.0", +}