[Agent][Deploy] - cqsh

agent-deploy/d_app/CmiiImageConfig.go

@@ -43,6 +43,7 @@ var CmiiBackendAppMap = map[string]string{
 	"cmii-uav-grid-datasource":      "5.4.0",
 	"cmii-uav-grid-engine":          "5.4.0",
 	"cmii-uav-grid-manage":          "5.4.0",
+	"cmii-uav-sense-adapter":        "5.4.0",
 }
 
 var CmiiFrontendAppMap = map[string]string{

agent-deploy/uavcloud-devoperation/k8s-configmap.yaml

@@ -1,6 +1,76 @@
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-supervision
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "supervision",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-open
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "open",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-security
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "security",
+      AppClientId: "APP_JUSEMc7afyWXxvE7"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-jiangsuwenlv
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "jiangsuwenlv",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-supervisionh5
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "supervisionh5",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-detection
   namespace: uavcloud-devoperation
@@ -29,34 +99,6 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-security
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "security",
-      AppClientId: "APP_JUSEMc7afyWXxvE7"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-securityh5
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "securityh5",
-      AppClientId: "APP_N3ImO0Ubfu9peRHD"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-seniclive
   namespace: uavcloud-devoperation
@@ -71,132 +113,6 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-qinghaitourism
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qinghaitourism",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-visualization
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "visualization",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-base
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "base",
-      AppClientId: "APP_9LY41OaKSqk2btY0"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-multiterminal
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "multiterminal",
-      AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-supervisionh5
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervisionh5",
-      AppClientId: "APP_qqSu82THfexI8PLM"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-qingdao
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qingdao",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-media
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "media",
-      AppClientId: "APP_4AU8lbifESQO4FD6"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-oms
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "oms",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-pangu
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-splice
   namespace: uavcloud-devoperation
@@ -212,28 +128,42 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-hljtt
+  name: tenant-prefix-threedsimulation
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hljtt",
+      ApplicationShortName: "threedsimulation",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-open
+  name: tenant-prefix-ai-brain
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "open",
+      ApplicationShortName: "ai-brain",
+      AppClientId: "APP_rafnuCAmBESIVYMH"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-visualization
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "visualization",
       AppClientId: "empty"
     }
 ---
@@ -253,6 +183,76 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-multiterminal
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "multiterminal",
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-securityh5
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "securityh5",
+      AppClientId: "APP_N3ImO0Ubfu9peRHD"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-share
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "share",
+      AppClientId: "APP_4lVSVI0ZGxTssir8"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-hljtt
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "hljtt",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-pangu
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-logistics
   namespace: uavcloud-devoperation
@@ -282,43 +282,15 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-supervision
+  name: tenant-prefix-qinghaitourism
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervision",
+      ApplicationShortName: "qinghaitourism",
-      AppClientId: "APP_qqSu82THfexI8PLM"
+      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-armypeople
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "armypeople",
-      AppClientId: "APP_UIegse6Lfou9pO1U"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-share
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "share",
-      AppClientId: "APP_4lVSVI0ZGxTssir8"
     }
 ---
 kind: ConfigMap
@@ -338,41 +310,69 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-threedsimulation
+  name: tenant-prefix-qingdao
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "threedsimulation",
+      ApplicationShortName: "qingdao",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-jiangsuwenlv
+  name: tenant-prefix-armypeople
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "jiangsuwenlv",
+      ApplicationShortName: "armypeople",
-      AppClientId: "empty"
+      AppClientId: "APP_UIegse6Lfou9pO1U"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-ai-brain
+  name: tenant-prefix-base
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "ai-brain",
+      ApplicationShortName: "base",
-      AppClientId: "APP_rafnuCAmBESIVYMH"
+      AppClientId: "APP_9LY41OaKSqk2btY0"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-media
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "media",
+      AppClientId: "APP_4AU8lbifESQO4FD6"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-oms
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "oms",
+      AppClientId: "empty"
     }

agent-deploy/uavcloud-devoperation/k8s-ingress.yaml

@@ -498,6 +498,14 @@ spec:
             backend:
               serviceName: cmii-uav-process
               servicePort: 8080
+    - host: cmii-uav-sense-adapter.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-sense-adapter
+              servicePort: 8080
     - host: cmii-uav-surveillance.uavcloud-devoperation.io
       http:
         paths:

agent-deploy/uavcloud-devoperation/k8s-srs.yaml

@@ -83,7 +83,7 @@ data:
             hls_m3u8_file    [app]/[stream].m3u8;
             hls_ts_file      [app]/[stream]/[2006][01][02]/[timestamp]-[duration].ts;
             hls_cleanup      on;
-            hls_entry_prefix http://192.168.35.178;
+            hls_entry_prefix http://lab.uavcmlc.com;
         }
     }
 ---
@@ -230,7 +230,7 @@ spec:
               protocol: UDP
           env:
             - name: CANDIDATE
-              value: 192.168.35.178
+              value: lab.uavcmlc.com
           resources:
             limits:
               cpu: 2000m
@@ -255,13 +255,13 @@ spec:
           image: harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA
           env:
             - name: OSS_ENDPOINT
-              value: https://minio-ig-devoperation.uavcmlc.com
+              value: 'http://:9000'
             - name: OSS_AK
               value: cmii
             - name: OSS_SK
               value: 'B#923fC7mk'
             - name: OSS_BUCKET
-              value: live-srs-hls
+              value: live-cluster-hls
             - name: SRS_OP
               value: 'http://helm-live-op-svc-v2:8080'
             - name: MYSQL_ENDPOINT
@@ -410,9 +410,10 @@ spec:
     - protocol: TCP
       port: 8080
       targetPort: 8080
+      nodePort: 30333
   selector:
     live-role: op-v2
-  type: ClusterIP
+  type: NodePort
   sessionAffinity: None
 ---
 kind: Service
@@ -481,15 +482,15 @@ data:
         type: srs
         endpoint:  'http://helm-live-srs-svc:1985'
       proto:
-        rtmp: 'rtmp://192.168.35.178:30937'
+        rtmp: 'rtmp://lab.uavcmlc.com:30937'
-        rtsp: 'rtsp://192.168.35.178:30554'
+        rtsp: 'rtsp://lab.uavcmlc.com:30554'
-        srt: 'srt://192.168.35.178:30560'
+        srt: 'srt://lab.uavcmlc.com:30560'
-        flv: 'http://192.168.35.178:30500'
+        flv: 'http://lab.uavcmlc.com:30500'
-        hls: 'http://192.168.35.178:30500'
+        hls: 'http://lab.uavcmlc.com:30500'
-        rtc: 'webrtc://192.168.35.178:30092'
+        rtc: 'webrtc://lab.uavcmlc.com:30092'
-        replay: 'https://192.168.35.178:30333'
+        replay: 'https://lab.uavcmlc.com:30333'
       minio:
-        endpoint: https://minio-ig-devoperation.uavcmlc.com
+        endpoint: http://:9000
         access-key: cmii
         secret-key: B#923fC7mk
-        bucket: live-srs-hls
+        bucket: live-cluster-hls

agent-deploy/uavcloud-devoperation/old/k8s-configmap.yaml

@@ -1,6 +1,20 @@
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-detection
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "detection",
+      AppClientId: "APP_FDHW2VLVDWPnnOCy"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-emergency
   namespace: uavcloud-devoperation
@@ -16,57 +30,29 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-qinghaitourism
+  name: tenant-prefix-security
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qinghaitourism",
+      ApplicationShortName: "security",
-      AppClientId: "empty"
+      AppClientId: "APP_JUSEMc7afyWXxvE7"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-supervisionh5
+  name: tenant-prefix-securityh5
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervisionh5",
+      ApplicationShortName: "securityh5",
-      AppClientId: "APP_qqSu82THfexI8PLM"
+      AppClientId: "APP_N3ImO0Ubfu9peRHD"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-cmsportal
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "cmsportal",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-armypeople
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "armypeople",
-      AppClientId: "APP_UIegse6Lfou9pO1U"
     }
 ---
 kind: ConfigMap
@@ -86,117 +72,19 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-splice
+  name: tenant-prefix-qinghaitourism
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "splice",
+      ApplicationShortName: "qinghaitourism",
-      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-traffic
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "traffic",
-      AppClientId: "APP_Jc8i2wOQ1t73QEJS"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-logistics
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "logistics",
-      AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-share
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "share",
-      AppClientId: "APP_4lVSVI0ZGxTssir8"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-open
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "open",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-pangu
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-oms
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "oms",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-security
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "security",
-      AppClientId: "APP_JUSEMc7afyWXxvE7"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-visualization
   namespace: uavcloud-devoperation
@@ -226,33 +114,103 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-detection
+  name: tenant-prefix-multiterminal
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "detection",
+      ApplicationShortName: "multiterminal",
-      AppClientId: "APP_FDHW2VLVDWPnnOCy"
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-threedsimulation
+  name: tenant-prefix-supervisionh5
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "threedsimulation",
+      ApplicationShortName: "supervisionh5",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-qingdao
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "qingdao",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-media
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "media",
+      AppClientId: "APP_4AU8lbifESQO4FD6"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-oms
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "oms",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-pangu
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-splice
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "splice",
+      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-hljtt
   namespace: uavcloud-devoperation
@@ -268,28 +226,42 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-supervision
+  name: tenant-prefix-open
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervision",
+      ApplicationShortName: "open",
-      AppClientId: "APP_qqSu82THfexI8PLM"
+      AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-multiterminal
+  name: tenant-prefix-cmsportal
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "multiterminal",
+      ApplicationShortName: "cmsportal",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-logistics
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "logistics",
       AppClientId: "APP_PvdfRRRBPL8xbIwl"
     }
 ---
@@ -310,15 +282,71 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-securityh5
+  name: tenant-prefix-supervision
   namespace: uavcloud-devoperation
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devoperation",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "securityh5",
+      ApplicationShortName: "supervision",
-      AppClientId: "APP_N3ImO0Ubfu9peRHD"
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-armypeople
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "armypeople",
+      AppClientId: "APP_UIegse6Lfou9pO1U"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-share
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "share",
+      AppClientId: "APP_4lVSVI0ZGxTssir8"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-traffic
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "traffic",
+      AppClientId: "APP_Jc8i2wOQ1t73QEJS"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-threedsimulation
+  namespace: uavcloud-devoperation
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devoperation",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "threedsimulation",
+      AppClientId: "empty"
     }
 ---
 kind: ConfigMap
@@ -337,20 +365,6 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-qingdao
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qingdao",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-ai-brain
   namespace: uavcloud-devoperation
@@ -362,17 +376,3 @@ data:
       ApplicationShortName: "ai-brain",
       AppClientId: "APP_rafnuCAmBESIVYMH"
     }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-media
-  namespace: uavcloud-devoperation
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devoperation",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "media",
-      AppClientId: "APP_4AU8lbifESQO4FD6"
-    }

agent-deploy/uavcloud-devoperation/old/k8s-ingress.yaml

@@ -0,0 +1,578 @@
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: frontend-applications-ingress
+  namespace: uavcloud-devoperation
+  labels:
+    type: frontend
+    octopus.control: all-ingress-config-wdd
+    app.kubernetes.io/managed-by: octopus-control
+    app.kubernetes.io/version: 5.6.0
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      rewrite ^(/supervision)$ $1/ redirect;
+      rewrite ^(/supervisionh5)$ $1/ redirect;
+      rewrite ^(/pangu)$ $1/ redirect;
+      rewrite ^(/ai-brain)$ $1/ redirect;
+      rewrite ^(/armypeople)$ $1/ redirect;
+      rewrite ^(/base)$ $1/ redirect;
+      rewrite ^(/cmsportal)$ $1/ redirect;
+      rewrite ^(/detection)$ $1/ redirect;
+      rewrite ^(/emergency)$ $1/ redirect;
+      rewrite ^(/hljtt)$ $1/ redirect;
+      rewrite ^(/jiangsuwenlv)$ $1/ redirect;
+      rewrite ^(/logistics)$ $1/ redirect;
+      rewrite ^(/media)$ $1/ redirect;
+      rewrite ^(/multiterminal)$ $1/ redirect;
+      rewrite ^(/mws)$ $1/ redirect;
+      rewrite ^(/oms)$ $1/ redirect;
+      rewrite ^(/open)$ $1/ redirect;
+      rewrite ^(/qingdao)$ $1/ redirect;
+      rewrite ^(/qinghaitourism)$ $1/ redirect;
+      rewrite ^(/security)$ $1/ redirect;
+      rewrite ^(/securityh5)$ $1/ redirect;
+      rewrite ^(/seniclive)$ $1/ redirect;
+      rewrite ^(/share)$ $1/ redirect;
+      rewrite ^(/splice)$ $1/ redirect;
+      rewrite ^(/threedsimulation)$ $1/ redirect;
+      rewrite ^(/traffic)$ $1/ redirect;
+      rewrite ^(/visualization)$ $1/ redirect;
+spec:
+  rules:
+    - host: fake-domain.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /devoperation/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform
+              servicePort: 9528
+          - path: /devoperation/supervision/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-suav-platform-supervision
+              servicePort: 9528
+          - path: /devoperation/supervisionh5/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-suav-platform-supervisionh5
+              servicePort: 9528
+          - path: /devoperation/pangu/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform
+              servicePort: 9528
+          - path: /devoperation/ai-brain/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-ai-brain
+              servicePort: 9528
+          - path: /devoperation/armypeople/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-armypeople
+              servicePort: 9528
+          - path: /devoperation/base/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-base
+              servicePort: 9528
+          - path: /devoperation/cmsportal/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-cms-portal
+              servicePort: 9528
+          - path: /devoperation/detection/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-detection
+              servicePort: 9528
+          - path: /devoperation/emergency/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-emergency-rescue
+              servicePort: 9528
+          - path: /devoperation/hljtt/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-hljtt
+              servicePort: 9528
+          - path: /devoperation/jiangsuwenlv/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-jiangsuwenlv
+              servicePort: 9528
+          - path: /devoperation/logistics/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-logistics
+              servicePort: 9528
+          - path: /devoperation/media/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-media
+              servicePort: 9528
+          - path: /devoperation/multiterminal/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-multiterminal
+              servicePort: 9528
+          - path: /devoperation/mws/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-mws
+              servicePort: 9528
+          - path: /devoperation/oms/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-oms
+              servicePort: 9528
+          - path: /devoperation/open/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-open
+              servicePort: 9528
+          - path: /devoperation/qingdao/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-qingdao
+              servicePort: 9528
+          - path: /devoperation/qinghaitourism/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-qinghaitourism
+              servicePort: 9528
+          - path: /devoperation/security/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-security
+              servicePort: 9528
+          - path: /devoperation/securityh5/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-securityh5
+              servicePort: 9528
+          - path: /devoperation/seniclive/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-seniclive
+              servicePort: 9528
+          - path: /devoperation/share/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-share
+              servicePort: 9528
+          - path: /devoperation/splice/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-splice
+              servicePort: 9528
+          - path: /devoperation/threedsimulation/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-threedsimulation
+              servicePort: 9528
+          - path: /devoperation/traffic/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-traffic
+              servicePort: 9528
+          - path: /devoperation/visualization/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-platform-visualization
+              servicePort: 9528
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: backend-applications-ingress
+  namespace: uavcloud-devoperation
+  labels:
+    type: backend
+    octopus.control: all-ingress-config-wdd
+    app.kubernetes.io/managed-by: octopus-control
+    app.kubernetes.io/version: 5.6.0
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+spec:
+  rules:
+    - host: cmii-admin-data.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-admin-data
+              servicePort: 8080
+    - host: cmii-admin-gateway.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-admin-gateway
+              servicePort: 8080
+    - host: cmii-admin-user.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-admin-user
+              servicePort: 8080
+    - host: cmii-app-release.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-app-release
+              servicePort: 8080
+    - host: cmii-open-gateway.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-open-gateway
+              servicePort: 8080
+    - host: cmii-suav-supervision.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-suav-supervision
+              servicePort: 8080
+    - host: cmii-uas-gateway.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uas-gateway
+              servicePort: 8080
+    - host: cmii-uas-lifecycle.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uas-lifecycle
+              servicePort: 8080
+    - host: cmii-uav-airspace.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-airspace
+              servicePort: 8080
+    - host: cmii-uav-alarm.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-alarm
+              servicePort: 8080
+    - host: cmii-uav-autowaypoint.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-autowaypoint
+              servicePort: 8080
+    - host: cmii-uav-brain.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-brain
+              servicePort: 8080
+    - host: cmii-uav-bridge.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-bridge
+              servicePort: 8080
+    - host: cmii-uav-cloud-live.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-cloud-live
+              servicePort: 8080
+    - host: cmii-uav-clusters.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-clusters
+              servicePort: 8080
+    - host: cmii-uav-cms.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-cms
+              servicePort: 8080
+    - host: cmii-uav-data-post-process.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-data-post-process
+              servicePort: 8080
+    - host: cmii-uav-depotautoreturn.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-depotautoreturn
+              servicePort: 8080
+    - host: cmii-uav-developer.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-developer
+              servicePort: 8080
+    - host: cmii-uav-device.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-device
+              servicePort: 8080
+    - host: cmii-uav-emergency.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-emergency
+              servicePort: 8080
+    - host: cmii-uav-gateway.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-gateway
+              servicePort: 8080
+    - host: cmii-uav-gis-server.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-gis-server
+              servicePort: 8080
+    - host: cmii-uav-grid-datasource.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-grid-datasource
+              servicePort: 8080
+    - host: cmii-uav-grid-engine.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-grid-engine
+              servicePort: 8080
+    - host: cmii-uav-grid-manage.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-grid-manage
+              servicePort: 8080
+    - host: cmii-uav-industrial-portfolio.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-industrial-portfolio
+              servicePort: 8080
+    - host: cmii-uav-integration.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-integration
+              servicePort: 8080
+    - host: cmii-uav-kpi-monitor.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-kpi-monitor
+              servicePort: 8080
+    - host: cmii-uav-logger.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-logger
+              servicePort: 8080
+    - host: cmii-uav-material-warehouse.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-material-warehouse
+              servicePort: 8080
+    - host: cmii-uav-mission.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-mission
+              servicePort: 8080
+    - host: cmii-uav-mqtthandler.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-mqtthandler
+              servicePort: 8080
+    - host: cmii-uav-multilink.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-multilink
+              servicePort: 8080
+    - host: cmii-uav-notice.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-notice
+              servicePort: 8080
+    - host: cmii-uav-oauth.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-oauth
+              servicePort: 8080
+    - host: cmii-uav-process.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-process
+              servicePort: 8080
+    - host: cmii-uav-surveillance.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-surveillance
+              servicePort: 8080
+    - host: cmii-uav-threedsimulation.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-threedsimulation
+              servicePort: 8080
+    - host: cmii-uav-tower.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-tower
+              servicePort: 8080
+    - host: cmii-uav-user.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-user
+              servicePort: 8080
+    - host: cmii-uav-waypoint.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-waypoint
+              servicePort: 8080
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: all-gateways-ingress
+  namespace: uavcloud-devoperation
+  labels:
+    type: api-gateway
+    octopus.control: all-ingress-config-1.1.0
+    app.kubernetes.io/managed-by: octopus-control
+    app.kubernetes.io/version: 5.6.0
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "Upgrade";
+spec:
+  rules:
+    - host: fake-domain.uavcloud-devoperation.io
+      http:
+        paths:
+          - path: /devoperation/oms/api/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-admin-gateway
+              servicePort: 8080
+          - path: /devoperation/open/api/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-open-gateway
+              servicePort: 8080
+          - path: /devoperation/api/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-gateway
+              servicePort: 8080

agent-deploy/uavcloud-devoperation/old/k8s-srs.yaml

@@ -83,7 +83,7 @@ data:
             hls_m3u8_file    [app]/[stream].m3u8;
             hls_ts_file      [app]/[stream]/[2006][01][02]/[timestamp]-[duration].ts;
             hls_cleanup      on;
-            hls_entry_prefix http://lab.uavcmlc.com;
+            hls_entry_prefix http://192.168.35.178;
         }
     }
 ---
@@ -230,7 +230,7 @@ spec:
               protocol: UDP
           env:
             - name: CANDIDATE
-              value: lab.uavcmlc.com
+              value: 192.168.35.178
           resources:
             limits:
               cpu: 2000m
@@ -255,13 +255,13 @@ spec:
           image: harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA
           env:
             - name: OSS_ENDPOINT
-              value: 'http://:9000'
+              value: https://minio-ig-devoperation.uavcmlc.com
             - name: OSS_AK
               value: cmii
             - name: OSS_SK
               value: 'B#923fC7mk'
             - name: OSS_BUCKET
-              value: live-cluster-hls
+              value: live-srs-hls
             - name: SRS_OP
               value: 'http://helm-live-op-svc-v2:8080'
             - name: MYSQL_ENDPOINT
@@ -410,10 +410,9 @@ spec:
     - protocol: TCP
       port: 8080
       targetPort: 8080
-      nodePort: 30333
   selector:
     live-role: op-v2
-  type: NodePort
+  type: ClusterIP
   sessionAffinity: None
 ---
 kind: Service
@@ -482,15 +481,15 @@ data:
         type: srs
         endpoint:  'http://helm-live-srs-svc:1985'
       proto:
-        rtmp: 'rtmp://lab.uavcmlc.com:30937'
+        rtmp: 'rtmp://192.168.35.178:30937'
-        rtsp: 'rtsp://lab.uavcmlc.com:30554'
+        rtsp: 'rtsp://192.168.35.178:30554'
-        srt: 'srt://lab.uavcmlc.com:30560'
+        srt: 'srt://192.168.35.178:30560'
-        flv: 'http://lab.uavcmlc.com:30500'
+        flv: 'http://192.168.35.178:30500'
-        hls: 'http://lab.uavcmlc.com:30500'
+        hls: 'http://192.168.35.178:30500'
-        rtc: 'webrtc://lab.uavcmlc.com:30092'
+        rtc: 'webrtc://192.168.35.178:30092'
-        replay: 'https://lab.uavcmlc.com:30333'
+        replay: 'https://192.168.35.178:30333'
       minio:
-        endpoint: http://:9000
+        endpoint: https://minio-ig-devoperation.uavcmlc.com
         access-key: cmii
         secret-key: B#923fC7mk
-        bucket: live-cluster-hls
+        bucket: live-srs-hls

agent-operator/CmiiDeployOperator_test.go

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

agent-operator/CmiiK8sOperator_test.go

@@ -253,7 +253,7 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	// 计算20:00的时间
 	now := time.Now()
 
-	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 30, 00, 0, now.Location())
+	targetTime := time.Date(now.Year(), now.Month(), now.Day(), 11, 37, 00, 0, now.Location())
 
 	duration := time.Duration(0)
 
@@ -277,10 +277,10 @@ func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
 	appNameTagMap := map[string]string{
 		//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
 		//"cmii-uav-data-post-process": "5.6.0-062401",
-		//"cmii-uav-industrial-portfolio": "5.6.0-061303",
+		"cmii-uav-industrial-portfolio": "5.6.0-070301",
 		//"cmii-uav-multilink": "5.5.0",
-		"cmii-uav-developer": "5.6.0-062701",
+		//"cmii-uav-developer": "5.6.0-062701",
-		"cmii-uav-airspace":  "5.6.0-062701",
+		//"cmii-uav-platform": "5.6.0-0626",
 	}
 
 	for appName, newTag := range appNameTagMap {

agent-operator/CmiiOperator.go

@@ -89,7 +89,7 @@ func (sync ImageSyncEntity) PullFromEntityAndSyncConditionally() (imageSyncResul
 			log.ErrorF("DirectHarborHost is null ! can't push to target harbor !")
 		}
 		// push to
-		errorPushImageNameList = image.TagFromListAndPushToCHarbor(realCmiiImageList, sync.DirectHarborHost)
+		errorPushImageNameList = image.TagFromListAndPushToCHarbor(allCmiiImageNameList, sync.DirectHarborHost)
 	}
 
 	// build result

agent-operator/CmiiOperator_test.go

@@ -49,7 +49,7 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
 	// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
 	sync := ImageSyncEntity{
 		CmiiNameTagList: []string{
-			"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
+			//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
 		},
 		FullNameImageList:         nil,
 		ProjectVersion:            "",

agent-operator/image/CmiiImageOperator.go

@@ -190,8 +190,9 @@ func UploadToOctopusKindHarbor(targetImageName string) (pushResult io.ReadCloser
 	}
 
 	pushResult, err := apiClient.ImagePush(context.TODO(), targetImageName, types.ImagePushOptions{
-		All:           false,
+		All: false,
-		RegistryAuth:  "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
+		//RegistryAuth:  "eyAidXNlcm5hbWUiOiAiYWRtaW4iLCAicGFzc3dvcmQiOiAiVjJyeVN0ckBuZ1BzcyIsICJlbWFpbCI6ICJpY2VAcXEuY29tIiB9Cg==",
+		RegistryAuth:  "eyAidXNlcm5hbWUiOiAiZGljdHp4IiwgInBhc3N3b3JkIjogIjlAcDNoekdWU0JscyVIWXUiLCAiZW1haWwiOiAiaWNlQHFxLmNvbSIgfQ==",
 		PrivilegeFunc: nil,
 		Platform:      "amd64",
 	})
@@ -255,7 +256,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
 			}
 		}
 
-		targetImageName := targetHarborHost + targetProject + "/" + imageName
+		targetImageName := targetHarborHost + "/" + targetProject + "/" + imageName
 		//fmt.Println(cmiiImageFullName)
 		//fmt.Println(targetImageName)
 
@@ -268,7 +269,7 @@ func TagFromListAndPushToCHarbor(referenceImageList []string, targetHarborHost s
 			}
 			scanner := bufio.NewScanner(pushResult)
 			for scanner.Scan() {
-
+				//fmt.Println(scanner.Text())
 			}
 			log.InfoF("[ImageTagFromListAndPushToCHarbor] - push of %s success!", targetImageName)
 		} else {

agent-operator/log/cmii-update-log.txt

@@ -85,3 +85,9 @@
 2024-06-26-17-54-00 uavcloud-demo  cmii-uav-material-warehouse             5.6.0                         5.6.0-062602
 2024-06-27-17-30-00 uavcloud-demo  cmii-uav-developer                      5.6.0                         5.6.0-062701
 2024-06-27-17-31-28 uavcloud-demo  cmii-uav-airspace                       5.6.0-062601                  5.6.0-062701
+2024-07-01-09-37-00 uavcloud-demo  cmii-uav-platform                       5.6.0-0626                    5.6.0-25263-0701
+2024-07-01-17-50-00 uavcloud-demo  cmii-uav-platform                       5.6.0-0626                    5.6.0-070101
+2024-07-01-17-54-39 uavcloud-demo  cmii-uav-platform                       5.6.0-070101                  5.6.0-0626
+2024-07-01-18-12-13 uavcloud-demo  cmii-uav-platform                       5.6.0-0626                    5.6.0-070101
+2024-07-01-18-19-57 uavcloud-demo  cmii-uav-platform                       5.6.0-070101                  5.6.0-0626
+2024-07-03-11-37-00 uavcloud-demo  cmii-uav-industrial-portfolio           5.6.0-sense-070103            5.6.0-070301