From 4c6bb8750aa1138a7982db9619927e281554c705 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Wed, 26 Jun 2024 15:32:18 +0800 Subject: [PATCH] [agent-operator] -cmii image sync --- agent-deploy/d_app/CmiiImageConfig.go | 4 + agent-deploy/e_cmii/ImageDownSync.sh | 106 +++++++++--------- agent-operator/CmiiDeployOperator.go | 2 +- agent-operator/CmiiDeployOperator_test.go | 2 +- message_pusher/main.go | 4 +- .../server/func/TestImageSyncScheduler.java | 6 +- 6 files changed, 63 insertions(+), 61 deletions(-) diff --git a/agent-deploy/d_app/CmiiImageConfig.go b/agent-deploy/d_app/CmiiImageConfig.go index 02672a6..e032125 100755 --- a/agent-deploy/d_app/CmiiImageConfig.go +++ b/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{ diff --git a/agent-deploy/e_cmii/ImageDownSync.sh b/agent-deploy/e_cmii/ImageDownSync.sh index 4f477a2..6ff28a6 100644 --- a/agent-deploy/e_cmii/ImageDownSync.sh +++ b/agent-deploy/e_cmii/ImageDownSync.sh @@ -5,11 +5,11 @@ #### 需要修改以下的内容 ### cmlc_app_image_list="cmlc-app-images-4.1.6.txt" # 需要修改版本 -rancher_image_list="kubernetes-images-2.5.7-1.20.4.txt" # 一般不需要修改 -middleware_image_list="middleware-images.txt" # 一般不需要修改 +rancher_image_list="kubernetes-images-2.5.7-1.20.4.txt" # 一般不需要修改 +middleware_image_list="middleware-images.txt" # 一般不需要修改 #DockerRegisterDomain="20.47.129.116:8033" # 需要根据实际修改 -DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改 -HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 +DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改 +HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 #### 需要修改以上的内容 ### #### 需要修改以上的内容 ### @@ -58,90 +58,88 @@ 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}" + [ -z "${i}" ] && continue + 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 - [ -z "${i}" ] && continue - case $i in - */*) - image_name="${DockerRegisterDomain}/${i}" - ;; - *) - image_name="${DockerRegisterDomain}/rancher/${i}" - ;; - esac + [ -z "${i}" ] && continue + case $i in + */*) + image_name="${DockerRegisterDomain}/${i}" + ;; + *) + image_name="${DockerRegisterDomain}/rancher/${i}" + ;; + esac - echo "开始镜像至私有仓库推送：${image_name}" - docker tag "${i}" "${image_name}" - docker push "${image_name}" - echo "-------------------------------------------------" + echo "开始镜像至私有仓库推送：${image_name}" + docker tag "${i}" "${image_name}" + docker push "${image_name}" + echo "-------------------------------------------------" done } -pushCMLCAPPImageToHarbor(){ +pushCMLCAPPImageToHarbor() { app_images=() while IFS= read -r i; do - [ -z "${i}" ] && continue - app_images+=("${i}"); - done < "${cmlc_app_image_list}" + [ -z "${i}" ] && continue + 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)" - echo "开始镜像至私有仓库推送：${image_name}" - docker tag "${app}" "${image_name}" - docker push "${image_name}" - echo "-------------------------------------------------" + [ -z "${app}" ] && continue + image_name="${DockerRegisterDomain}/$(echo ${app} | cut -d"/" -f2-8)" + echo "开始镜像至私有仓库推送：${image_name}" + docker tag "${app}" "${image_name}" + docker push "${image_name}" + echo "-------------------------------------------------" done } -pushMiddlewareImageToHarbor(){ +pushMiddlewareImageToHarbor() { middleware_image=() while IFS= read -r i; do - [ -z "${i}" ] && continue - middleware_image+=("${i}"); - done < "${middleware_image_list}" + [ -z "${i}" ] && continue + 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 - case ${app} in - */*/*) - image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f3-8)" - ;; - */*) - image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f2-8)" - ;; - esac + [ -z "${app}" ] && continue + case ${app} in + */*/*) + image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f3-8)" + ;; + */*) + image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f2-8)" + ;; + esac - echo "开始镜像至私有仓库推送：${image_name}" - docker tag "${app}" "${image_name}" - docker push "${image_name}" - echo "-------------------------------------------------" + echo "开始镜像至私有仓库推送：${image_name}" + docker tag "${app}" "${image_name}" + docker push "${image_name}" + echo "-------------------------------------------------" done } - #downloadAllNeededImagesAndCompress "${middleware_image_list}" downloadAllNeededImages "${middleware_image_list}" diff --git a/agent-operator/CmiiDeployOperator.go b/agent-operator/CmiiDeployOperator.go index ac0fb1c..6b675ba 100755 --- a/agent-operator/CmiiDeployOperator.go +++ b/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 ---------------------") diff --git a/agent-operator/CmiiDeployOperator_test.go b/agent-operator/CmiiDeployOperator_test.go index 1fa30d0..4b21403 100755 --- a/agent-operator/CmiiDeployOperator_test.go +++ b/agent-operator/CmiiDeployOperator_test.go @@ -4,5 +4,5 @@ import "testing" func TestCmiiEnvDeploy(t *testing.T) { - CmiiEnvDeploy(true) + CmiiEnvDeploy(false) } diff --git a/message_pusher/main.go b/message_pusher/main.go index 4d02754..4ec21d7 100755 --- a/message_pusher/main.go +++ b/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 diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java index 56337c4..abb287d 100755 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -38,7 +38,7 @@ public class TestImageSyncScheduler { public void runImageSync() { ArrayList CmiiAppNameList = new ArrayList<>(List.of( - "cmii-uav-platform:5.4.0-25263-061101" + "cmii-uav-platform:5.3.0-061901" )); ArrayList 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