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

[agent-operator] -cmii image sync

Browse Source
This commit is contained in:
zeaslity
2024-06-26 15:32:18 +08:00
parent fea6407d48
commit 4c6bb8750a
6 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent-deploy/d_app/CmiiImageConfig.go
View File

@@ -39,6 +39,10 @@ var CmiiBackendAppMap = map[string]string{
"cmii-uav-bridge": "5.2.0", "cmii-uav-bridge": "5.2.0",
"cmii-uas-lifecycle": "5.2.0", "cmii-uas-lifecycle": "5.2.0",
"cmii-uas-gateway": "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{ var CmiiFrontendAppMap = map[string]string{

106
agent-deploy/e_cmii/ImageDownSync.sh
View File

@@ -5,11 +5,11 @@
#### 需要修改以下的内容 ### #### 需要修改以下的内容 ###
cmlc_app_image_list="cmlc-app-images-4.1.6.txt" # 需要修改版本 cmlc_app_image_list="cmlc-app-images-4.1.6.txt" # 需要修改版本
rancher_image_list="kubernetes-images-2.5.7-1.20.4.txt" # 一般不需要修改 rancher_image_list="kubernetes-images-2.5.7-1.20.4.txt" # 一般不需要修改
middleware_image_list="middleware-images.txt" # 一般不需要修改 middleware_image_list="middleware-images.txt" # 一般不需要修改
#DockerRegisterDomain="20.47.129.116:8033" # 需要根据实际修改 #DockerRegisterDomain="20.47.129.116:8033" # 需要根据实际修改
DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改 DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改
HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致
#### 需要修改以上的内容 ### #### 需要修改以上的内容 ###
#### 需要修改以上的内容 ### #### 需要修改以上的内容 ###
@@ -58,90 +58,88 @@ downloadAllNeededImagesAndCompress() {
compressPacName="$(echo ${1} | cut -d"." -f1).tar.gz" compressPacName="$(echo ${1} | cut -d"." -f1).tar.gz"
echo "Creating ${compressPacName} with $(echo ${pulled} | wc -w | tr -d '[:space:]') images" 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 shift
done done
echo "已经完成打包工作！" echo "已经完成打包工作！"
} }
pushRKEImageToHarbor(){ pushRKEImageToHarbor() {
linux_images=() linux_images=()
while IFS= read -r i; do while IFS= read -r i; do
[ -z "${i}" ] && continue [ -z "${i}" ] && continue
linux_images+=("${i}"); linux_images+=("${i}")
done < "${rancher_image_list}" 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 docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn
for i in "${linux_images[@]}"; do for i in "${linux_images[@]}"; do
[ -z "${i}" ] && continue [ -z "${i}" ] && continue
case $i in case $i in
*/*) */*)
image_name="${DockerRegisterDomain}/${i}" image_name="${DockerRegisterDomain}/${i}"
;; ;;
*) *)
image_name="${DockerRegisterDomain}/rancher/${i}" image_name="${DockerRegisterDomain}/rancher/${i}"
;; ;;
esac esac
echo "开始镜像至私有仓库推送：${image_name}" echo "开始镜像至私有仓库推送：${image_name}"
docker tag "${i}" "${image_name}" docker tag "${i}" "${image_name}"
docker push "${image_name}" docker push "${image_name}"
echo "-------------------------------------------------" echo "-------------------------------------------------"
done done
} }
pushCMLCAPPImageToHarbor(){ pushCMLCAPPImageToHarbor() {
app_images=() app_images=()
while IFS= read -r i; do while IFS= read -r i; do
[ -z "${i}" ] && continue [ -z "${i}" ] && continue
app_images+=("${i}"); app_images+=("${i}")
done < "${cmlc_app_image_list}" done <"${cmlc_app_image_list}"
docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn 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 for app in "${app_images[@]}"; do
[ -z "${app}" ] && continue [ -z "${app}" ] && continue
image_name="${DockerRegisterDomain}/$(echo ${app} | cut -d"/" -f2-8)" image_name="${DockerRegisterDomain}/$(echo ${app} | cut -d"/" -f2-8)"
echo "开始镜像至私有仓库推送：${image_name}" echo "开始镜像至私有仓库推送：${image_name}"
docker tag "${app}" "${image_name}" docker tag "${app}" "${image_name}"
docker push "${image_name}" docker push "${image_name}"
echo "-------------------------------------------------" echo "-------------------------------------------------"
done done
} }
pushMiddlewareImageToHarbor(){ pushMiddlewareImageToHarbor() {
middleware_image=() middleware_image=()
while IFS= read -r i; do while IFS= read -r i; do
[ -z "${i}" ] && continue [ -z "${i}" ] && continue
middleware_image+=("${i}"); middleware_image+=("${i}")
done < "${middleware_image_list}" 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 docker login -u rad02_drone -p Drone@1234 harbor.cdcyy.com.cn
for app in "${middleware_image[@]}"; do for app in "${middleware_image[@]}"; do
[ -z "${app}" ] && continue [ -z "${app}" ] && continue
case ${app} in case ${app} in
*/*/*) */*/*)
image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f3-8)" image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f3-8)"
;; ;;
*/*) */*)
image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f2-8)" image_name="${DockerRegisterDomain}/cmii/$(echo "${app}" | cut -d"/" -f2-8)"
;; ;;
esac esac
echo "开始镜像至私有仓库推送：${image_name}" echo "开始镜像至私有仓库推送：${image_name}"
docker tag "${app}" "${image_name}" docker tag "${app}" "${image_name}"
docker push "${image_name}" docker push "${image_name}"
echo "-------------------------------------------------" echo "-------------------------------------------------"
done done
} }
#downloadAllNeededImagesAndCompress "${middleware_image_list}" #downloadAllNeededImagesAndCompress "${middleware_image_list}"
downloadAllNeededImages "${middleware_image_list}" downloadAllNeededImages "${middleware_image_list}"

2
agent-operator/CmiiDeployOperator.go
View File

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

2
agent-operator/CmiiDeployOperator_test.go
View File

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

4
message_pusher/main.go
View File

@@ -2,11 +2,11 @@ package main
import ( import (
"github.com/gin-gonic/gin" "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/docs"
"io.wdd.message_pusher/router" "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 // @title Swagger Example API
// @version 1.0 // @version 1.0

6
server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
View File

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