diff --git a/agent-common/real_project/jsntejpt/Config.go b/agent-common/real_project/jsntejpt/Config.go new file mode 100644 index 0000000..81d7b59 --- /dev/null +++ b/agent-common/real_project/jsntejpt/Config.go @@ -0,0 +1,79 @@ +package jsntejpt + +var AllCmiiImageList = []string{ + "harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.5.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.7.0-29766-0815", + "harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0", + "harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:5.7.0-30403", + "harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:5.7.0-0805", + "harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810", + "harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta", + "harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.7.0-29766-0819", + "harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-hw-080201", + "harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-app-release:4.2.0-validation", + "harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.7.0-0814", + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.7.0-31369-yunnan-082001", + "harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.7.0-29766-0815", + "harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.7.0-0725", + "harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.5.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-emergency-rescue:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-dispatchh5:5.6.0-0708", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.7.0-0820", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:5.7.0-29322", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.7.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.7.0-29267-0820", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.3.0-hjltt", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:5.7.0-29322", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:5.7.0-29766-0815", + "harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA", + "harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195", + "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0", +} diff --git a/agent-deploy/a_dashboard/TemplateK8SDashboard.go b/agent-deploy/a_dashboard/TemplateK8SDashboard.go index 2e5c17f..dd8ac8d 100755 --- a/agent-deploy/a_dashboard/TemplateK8SDashboard.go +++ b/agent-deploy/a_dashboard/TemplateK8SDashboard.go @@ -30,7 +30,7 @@ spec: ports: - port: 443 targetPort: 8443 - nodePort: 30554 + nodePort: 39999 selector: k8s-app: kubernetes-dashboard type: NodePort diff --git a/agent-deploy/e_cmii/CmiiEnvConfiguration.go b/agent-deploy/e_cmii/CmiiEnvConfiguration.go index 2a5426f..30a56d8 100644 --- a/agent-deploy/e_cmii/CmiiEnvConfiguration.go +++ b/agent-deploy/e_cmii/CmiiEnvConfiguration.go @@ -51,10 +51,10 @@ var CmiiOutSideConfig = &CmiiEnvConfig{ CmiiFrontendConfig: d_app.CmiiFrontendConfig{}, CmiiBackendConfig: d_app.CmiiBackendConfig{}, CmiiSrsConfig: d_app.CmiiSrsConfig{ - RtmpPort: "30935", + RtmpPort: "31935", WebRTCPort: "30090", SrtPort: "30556", - WebApiPort: "30557", + WebApiPort: "30080", MySQLK8sAdminPassword: "fP#UaH6qQ3)8", }, } diff --git a/agent-operator/CmiiDeployOperator_test.go b/agent-operator/CmiiDeployOperator_test.go index a5bd3bf..5a6d4f8 100755 --- a/agent-operator/CmiiDeployOperator_test.go +++ b/agent-operator/CmiiDeployOperator_test.go @@ -3,6 +3,7 @@ package main import ( "testing" image2 "wdd.io/agent-common/image" + "wdd.io/agent-common/real_project/jsntejpt" "wdd.io/agent-common/real_project/zhejianyidong_erjipingtai" "wdd.io/agent-deploy/z_dep" ) @@ -84,17 +85,17 @@ func TestCmiiEnvDeploy_JiangSuNanTong(t *testing.T) { // 江苏南通 commonEnv := &z_dep.CommonEnvironmentConfig{ - WebIP: "111.2.224.59", + WebIP: "10.40.51.5", WebPort: "8088", - HarborIPOrCustomImagePrefix: "192.168.10.3", + HarborIPOrCustomImagePrefix: "10.40.51.5", HarborPort: "8033", - Namespace: "zjyd", + Namespace: "jsntejpt", TagVersion: "5.7.0", - NFSServerIP: "192.168.10.3", - MinioInnerIP: "192.168.10.2", + NFSServerIP: "10.40.51.5", + MinioInnerIP: "10.40.51.5", } - CmiiEnvDeployOffline(commonEnv, true, zhejianyidong_erjipingtai.Cmii570ImageList) + CmiiEnvDeployOffline(commonEnv, true, jsntejpt.AllCmiiImageList) } diff --git a/agent-operator/ImageSyncDLTU.sh b/agent-operator/ImageSyncDLTU.sh index 353fb8a..60c2fe0 100644 --- a/agent-operator/ImageSyncDLTU.sh +++ b/agent-operator/ImageSyncDLTU.sh @@ -3,7 +3,7 @@ all_image_list_txt="all-cmii-image-list.txt" # 需要修改版本 gzip_image_list_txt="all-gzip-image-list.txt" # 一般不需要修改 oss_prefix_url="https://oss.demo.uavcmlc.com/cmlc-installation" -local_gzip_path="/root/wdd/octopus_image" +local_gzip_path="/root/octopus_image" DockerRegisterDomain="10.40.51.5:8033" # 需要根据实际修改 HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 @@ -127,16 +127,31 @@ Load_Tag_Upload(){ print_red "bad arguments" ;; esac - shift # past argument or value done } ltu(){ - while IFS= read -r file; do - [ -z "${file}" ] && continue - echo "read gzip file full name is $file" - done < "$(find $local_gzip_path -type f -name "*.tar.gz")" + all_file_list=$(find $local_gzip_path -type f -name "*.tar.gz") + + for file in $all_file_list; do + echo "offline gzip file is => : $file" + image_full_name=$(docker load -i ${file} | head -n1 |awk -F': ' '{print $2}') + + app_name=$(echo "$image_full_name" | sed 's|.*/||g') + echo "extract short name is $app_name" + + if echo $image_full_name | grep -q "rancher" + then + print_green "tag image to => $DockerRegisterDomain/rancher/$app_name" + docker tag ${image_full_name} $DockerRegisterDomain/rancher/$app_name + docker push $DockerRegisterDomain/rancher/$app_name + else + print_green "tag image to => $DockerRegisterDomain/cmii/$app_name" + docker tag ${image_full_name} $DockerRegisterDomain/cmii/$app_name + docker push $DockerRegisterDomain/cmii/$app_name + fi + done } diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index c492398..451e8ff 100755 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -131,7 +131,7 @@ public class TestBaseFuncScheduler { // baseFuncScheduler.runProcedure(projectDeployContext); // 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110 - harborFuncScheduler.runProcedure(projectDeployContext); +// harborFuncScheduler.runProcedure(projectDeployContext); List appFunctionEnumList = List.of( @@ -165,7 +165,7 @@ public class TestBaseFuncScheduler { projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure); projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure); -// baseFuncScheduler.runProcedure(projectDeployContext); + baseFuncScheduler.runProcedure(projectDeployContext); } }