[agent-operator] -cmii image sync

agent-deploy/d_app/CmiiImageConfig.go

@@ -39,6 +39,10 @@ var CmiiBackendAppMap = map[string]string{
 	"cmii-uav-bridge":               "5.2.0",
 	"cmii-uas-lifecycle":            "5.2.0",
 	"cmii-uas-gateway":              "5.2.0",
+	"cmii-uav-gis-server":           "5.4.0",
+	"cmii-uav-grid-datasource":      "5.4.0",
+	"cmii-uav-grid-engine":          "5.4.0",
+	"cmii-uav-grid-manage":          "5.4.0",
 }
 
 var CmiiFrontendAppMap = map[string]string{

agent-deploy/e_cmii/ImageDownSync.sh

@@ -58,23 +58,22 @@ downloadAllNeededImagesAndCompress() {
     compressPacName="$(echo ${1} | cut -d"." -f1).tar.gz"
 
     echo "Creating ${compressPacName} with $(echo ${pulled} | wc -w | tr -d '[:space:]') images"
-    docker save $(echo ${pulled}) | gzip --stdout > ${compressPacName}
+    docker save $(echo ${pulled}) | gzip --stdout >${compressPacName}
 
     shift
   done
 
-
   echo "已经完成打包工作！"
 }
 
-pushRKEImageToHarbor(){
+pushRKEImageToHarbor() {
   linux_images=()
   while IFS= read -r i; do
     [ -z "${i}" ] && continue
-      linux_images+=("${i}");
-  done < "${rancher_image_list}"
+    linux_images+=("${i}")
+  done <"${rancher_image_list}"
 
-#  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
+  #  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
   docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn
 
   for i in "${linux_images[@]}"; do
@@ -95,15 +94,15 @@ pushRKEImageToHarbor(){
   done
 }
 
-pushCMLCAPPImageToHarbor(){
+pushCMLCAPPImageToHarbor() {
   app_images=()
   while IFS= read -r i; do
     [ -z "${i}" ] && continue
-      app_images+=("${i}");
-  done < "${cmlc_app_image_list}"
+    app_images+=("${i}")
+  done <"${cmlc_app_image_list}"
 
   docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn
-#  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
+  #  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
   for app in "${app_images[@]}"; do
     [ -z "${app}" ] && continue
     image_name="${DockerRegisterDomain}/$(echo ${app} | cut -d"/" -f2-8)"
@@ -114,14 +113,14 @@ pushCMLCAPPImageToHarbor(){
   done
 }
 
-pushMiddlewareImageToHarbor(){
+pushMiddlewareImageToHarbor() {
   middleware_image=()
   while IFS= read -r i; do
     [ -z "${i}" ] && continue
-      middleware_image+=("${i}");
-  done < "${middleware_image_list}"
+    middleware_image+=("${i}")
+  done <"${middleware_image_list}"
 
-#  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
+  #  docker login -u admin -p ${HarborAdminPass} ${DockerRegisterDomain}
   docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn
   for app in "${middleware_image[@]}"; do
     [ -z "${app}" ] && continue
@@ -141,7 +140,6 @@ pushMiddlewareImageToHarbor(){
   done
 }
 
-
 #downloadAllNeededImagesAndCompress "${middleware_image_list}"
 downloadAllNeededImages "${middleware_image_list}"
 

agent-operator/CmiiDeployOperator.go

@@ -68,7 +68,7 @@ func CmiiEnvDeploy(shouldDoCompleteDeploy bool) {
 	//clearOldApplyStuff(common, shouldDoCompleteDeploy)
 
 	// apply new app
-	applyNewAppStuff(common, shouldDoCompleteDeploy)
+	//applyNewAppStuff(common, shouldDoCompleteDeploy)
 
 	fmt.Println()
 	fmt.Println("-------------------- all done ---------------------")

agent-operator/CmiiDeployOperator_test.go

@@ -4,5 +4,5 @@ import "testing"
 
 func TestCmiiEnvDeploy(t *testing.T) {
 
-	CmiiEnvDeploy(true)
+	CmiiEnvDeploy(false)
 }

message_pusher/main.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/swaggo/files"       // swagger embed files
+	"github.com/swaggo/gin-swagger" // gin-swagger middleware
 	"io.wdd.message_pusher/docs"
 	"io.wdd.message_pusher/router"
 )
-import "github.com/swaggo/gin-swagger" // gin-swagger middleware
-import "github.com/swaggo/files"       // swagger embed files
 
 // @title           Swagger Example API
 // @version         1.0

server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java

@@ -38,7 +38,7 @@ public class TestImageSyncScheduler {
     public void runImageSync() {
 
         ArrayList<String> CmiiAppNameList = new ArrayList<>(List.of(
-                "cmii-uav-platform:5.4.0-25263-061101"
+                "cmii-uav-platform:5.3.0-061901"
         ));
 
         ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
@@ -48,10 +48,10 @@ public class TestImageSyncScheduler {
         Boolean downloadAndCompressOnly = false;
 
 //        String projectNamespace = "wdd"; // wdd
-//        String projectNamespace = "cqlyj"; // 重庆林业局
+        String projectNamespace = "cqlyj"; // 重庆林业局
 //        String projectNamespace = "jlyd"; // 吉林移动
 //        String projectNamespace = "jxyd"; // 吉林移动
-        String projectNamespace = "xmyd"; // 厦门移动
+//        String projectNamespace = "xmyd"; // 厦门移动
 
 //        String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
         String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod