diff --git a/agent-common/real_project/CmiiImageListConfig.go b/agent-common/real_project/CmiiImageListConfig.go index 96148e9..18594a0 100644 --- a/agent-common/real_project/CmiiImageListConfig.go +++ b/agent-common/real_project/CmiiImageListConfig.go @@ -1,82 +1,86 @@ package real_project var Cmii600ImageList = []string{ + "harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta", + "harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810", - "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:6.0.0-31369-yunnan-091801", - "harbor.cdcyy.com.cn/cmii/cmii-uav-notice:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-admin-user:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-process:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0", - "harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:6.0.0-090901", - "harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:6.0.0-31369-yunnan-092402", + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:6.0.0-31369-101201", "harbor.cdcyy.com.cn/cmii/cmii-uav-user:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0", - "harbor.cdcyy.com.cn/cmii/cmii-open-gateway:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-32108-0930", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-device:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-cms:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:6.0.0-090901", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-open-gateway:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-notice:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-developer:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-process:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-brain:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-app-release:4.2.0-validation", - "harbor.cdcyy.com.cn/cmii/cmii-uav-device:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-logger:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-brain:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-mission:6.0.0-hotfix-091201", - "harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta", - "harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-antwork-091102", "harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.8.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810", + "harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-cms:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-admin-data:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:6.0.0-0910", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.7.0-31464-091905", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-eventsh5:5.8.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:5.7.0-29766-0815", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-advanced5g:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-admin-user:6.0.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508", - "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-dispatchh5:5.6.0-0708", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.7.0-hjltt", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.7.0", - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.7.0-31464-091902", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0", + //"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-eventsh5:5.8.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-emergency-rescue:5.6.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-pilot2-to-cloud:6.0.0-092502", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-dispatchh5:5.6.0-0708", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427", + //"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mianyangh5:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.7.0", + //"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-comtemp:temp-29535-0929", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:6.0.0-32443-101401", "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:6.0.0", - "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0", - "harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:5.7.0-29766-0815", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.7.0-hjltt", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:6.0.0", + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:6.0.0", "harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195", + "harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA", + "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0", } var Cmii570ImageList = []string{ diff --git a/agent-common/real_project/cmii-iot-dispatcher.yaml b/agent-common/real_project/cmii-iot-dispatcher.yaml index c234c2e..6a7427c 100644 --- a/agent-common/real_project/cmii-iot-dispatcher.yaml +++ b/agent-common/real_project/cmii-iot-dispatcher.yaml @@ -2,7 +2,7 @@ kind: Deployment apiVersion: apps/v1 metadata: name: cmii-uav-iot-dispatcher - namespace: ynejpt + namespace: jxejpt labels: app.kubernetes.io/app-version: 5.7.0 app.kubernetes.io/managed-by: octopus-control @@ -28,7 +28,7 @@ spec: claimName: nfs-backend-log-pvc containers: - name: cmii-uav-iot-dispatcher - image: '192.168.118.14:8033/cmii/cmii-uav-iot-dispatcher:5.7.0' + image: '10.20.1.135:8033/cmii/cmii-uav-iot-dispatcher:5.7.0' ports: - name: pod-port containerPort: 8080 @@ -37,7 +37,7 @@ spec: - name: ENV value: develop - name: VERSION - value: 5.7.0 + value: 6.0.0 - name: NACOS_SYSTEM_CONFIG_NAME value: cmii-backend-system - name: NACOS_SERVICE_CONFIG_NAME @@ -53,7 +53,7 @@ spec: - name: SVC_NAME value: cmlc-uav-iot-dispatcher-svc - name: K8S_NAMESPACE - value: ynejpt + value: jxejpt - name: APPLICATION_NAME value: cmii-uav-iot-dispatcher - name: CUST_JAVA_OPTS @@ -68,11 +68,11 @@ spec: - name: NACOS_DISCOVERY_PORT value: '8080' - name: BIZ_CONFIG_GROUP - value: 5.7.0 + value: 6.0.0 - name: SYS_CONFIG_GROUP - value: 5.7.0 + value: 6.0.0 - name: IMAGE_VERSION - value: 5.7.0 + value: 6.0.0 resources: limits: cpu: '2' @@ -107,7 +107,7 @@ kind: Service apiVersion: v1 metadata: name: cmii-uav-iot-dispatcher - namespace: ynejpt + namespace: jxejpt labels: app.kubernetes.io/app-version: 5.7.0 app.kubernetes.io/managed-by: octopus-control diff --git a/agent-operator/CmiiDeployOperator_test.go b/agent-operator/CmiiDeployOperator_test.go index 33b3426..3073a1d 100755 --- a/agent-operator/CmiiDeployOperator_test.go +++ b/agent-operator/CmiiDeployOperator_test.go @@ -188,6 +188,27 @@ func TestCmiiEnvDeploy_YunNanErJiPingTai(t *testing.T) { } +func TestCmiiEnvDeploy_ZhuHaiHengQing(t *testing.T) { + + // 珠海横琴 + commonEnv := &z_dep.CommonEnvironmentConfig{ + WebIP: "10.129.80.218", + WebPort: "8088", + HarborIPOrCustomImagePrefix: "10.129.80.218", + HarborPort: "8033", + Namespace: "zhhq", + TagVersion: "6.0.0", + TenantEnv: "", + MinioPublicIP: "10.129.80.223", + MinioInnerIP: "10.129.80.223", + NFSServerIP: "10.129.80.217", + ApplyFilePrefix: "", + } + + CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii600ImageList) + +} + func TestCmiiEnvDeploy_JiLinYiDong(t *testing.T) { // 吉林移动 diff --git a/agent-operator/ImageSyncOperator_test.go b/agent-operator/ImageSyncOperator_test.go index f38cb8a..c5c6755 100755 --- a/agent-operator/ImageSyncOperator_test.go +++ b/agent-operator/ImageSyncOperator_test.go @@ -51,7 +51,7 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) { sync := ImageSyncEntity{ DownloadCondition: &DownloadEntity{ ShouldDownloadImage: true, - ProjectName: "xmyd_6.0.0", + ProjectName: "zhhq_6.0.0", ProjectVersion: "", CmiiNameTagList: []string{ //"cmii-uav-mqtthandler:5.4.0-bjdyt-052102", 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 dc98081..7fe98a9 100755 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -42,7 +42,7 @@ public class TestImageSyncScheduler { )); ArrayList ImageFullNameList = new ArrayList<>(List.of( - "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:6.0.0-31369-yunnan-092602" + "harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.7.0-32443-102201" )); Boolean downloadAndCompressOnly = false; @@ -51,8 +51,8 @@ public class TestImageSyncScheduler { // String projectNamespace = "cqlyj"; // 重庆林业局 // String projectNamespace = "jlyd"; // 吉林移动 // String projectNamespace = "jxyd"; // 吉林移动 - String projectNamespace = "xmyd"; // 厦门移动 -// String projectNamespace = "ynejpt"; // 云南二级平台 +// String projectNamespace = "xmyd"; // 厦门移动 + String projectNamespace = "ynejpt"; // 云南二级平台 // String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod