大量更新

agent-common/real_project/cmii-uav-watchdog-agent-test.yaml

@@ -0,0 +1,146 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cmii-uav-watchdog-agent
+  namespace: uavcloud-devflight
+  labels:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog-agent
+    octopus/control: backend-app-1.0.0
+    app.kubernetes.io/managed-by: octopus
+    app.kubernetes.io/app-version: 6.2.0
+spec:
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 1
+  selector:
+    matchLabels:
+      cmii.type: backend
+      cmii.app: cmii-uav-watchdog-agent
+  template:
+    metadata:
+      labels:
+        cmii.type: backend
+        cmii.app: cmii-uav-watchdog-agent
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: uavcloud.env
+                    operator: In
+                    values:
+                      - devflight
+      imagePullSecrets:
+        - name: harborsecret
+      containers:
+        - name: cmii-uav-watchdog-agent
+          image: harbor.cdcyy.com.cn/cmii/cmii-uav-watchdog-agent-java:2025-03-26-16-26-29
+          imagePullPolicy: Always
+          env:
+            - name: K8S_NAMESPACE
+              value: uavcloud-devflight
+            - name: APPLICATION_NAME
+              value: cmii-uav-watchdog-agent
+            - name: CUST_JAVA_OPTS
+              value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true"
+            - name: NACOS_REGISTRY
+              value: "helm-nacos:8848"
+            - name: NACOS_DISCOVERY_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: NACOS_DISCOVERY_PORT
+              value: "8080"
+            - name: BIZ_CONFIG_GROUP
+              value: 6.2.0
+            - name: SYS_CONFIG_GROUP
+              value: 6.2.0
+            - name: IMAGE_VERSION
+              value: 6.2.0
+            - name: NACOS_USERNAME
+              value: "developer"
+            - name: NACOS_PASSWORD
+              value: "Deve@9128201"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: NODE_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: LIMIT_CPU
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog-agent
+                  resource: limits.cpu
+            - name: LIMIT_MEMORY
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog-agent
+                  resource: limits.memory
+            - name: REQUEST_CPU
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog-agent
+                  resource: requests.cpu
+            - name: REQUEST_MEMORY
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog-agent
+                  resource: requests.memory
+          ports:
+            - name: pod-port
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            limits:
+              memory: 2Gi
+              cpu: "2"
+            requests:
+              memory: 200Mi
+              cpu: 200m
+          volumeMounts:
+            - name: nfs-backend-log-volume
+              mountPath: /cmii/logs
+              readOnly: false
+              subPath: uavcloud-devflight/cmii-uav-watchdog-agent
+      volumes:
+        - name: nfs-backend-log-volume
+          persistentVolumeClaim:
+            claimName: nfs-backend-log-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: cmii-uav-watchdog-agent
+  namespace: uavcloud-devflight
+  labels:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog-agent
+    octopus/control: backend-app-1.0.0
+    app.kubernetes.io/managed-by: octopus
+    app.kubernetes.io/app-version: 6.2.0
+spec:
+  type: ClusterIP
+  selector:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog-agent
+  ports:
+    - name: backend-tcp
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
+---

agent-common/real_project/cmii-uav-watchdog-test.yaml

@@ -0,0 +1,171 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cmii-uav-watchdog
+  namespace: uavcloud-devflight
+  labels:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog
+    octopus/control: backend-app-1.0.0
+    app.kubernetes.io/managed-by: octopus
+    app.kubernetes.io/app-version: 6.2.0
+spec:
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 1
+  selector:
+    matchLabels:
+      cmii.type: backend
+      cmii.app: cmii-uav-watchdog
+  template:
+    metadata:
+      labels:
+        cmii.type: backend
+        cmii.app: cmii-uav-watchdog
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: uavcloud.env
+                    operator: In
+                    values:
+                      - devflight
+      imagePullSecrets:
+        - name: harborsecret
+      containers:
+        - name: cmii-uav-watchdog
+          image: harbor.cdcyy.com.cn/cmii/cmii-uav-watchdog:2025-03-26-16-26-29
+          imagePullPolicy: Always
+          env:
+            - name: K8S_NAMESPACE
+              value: uavcloud-devflight
+            - name: APPLICATION_NAME
+              value: cmii-uav-watchdog
+            - name: CUST_JAVA_OPTS
+              value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true"
+            - name: NACOS_REGISTRY
+              value: "helm-nacos:8848"
+            - name: NACOS_DISCOVERY_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: NACOS_DISCOVERY_PORT
+              value: "8080"
+            - name: BIZ_CONFIG_GROUP
+              value: 6.2.0
+            - name: SYS_CONFIG_GROUP
+              value: 6.2.0
+            - name: IMAGE_VERSION
+              value: 6.2.0
+            - name: NACOS_USERNAME
+              value: "developer"
+            - name: NACOS_PASSWORD
+              value: "Deve@9128201"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: NODE_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.hostIP
+            - name: LIMIT_CPU
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog
+                  resource: limits.cpu
+            - name: LIMIT_MEMORY
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog
+                  resource: limits.memory
+            - name: REQUEST_CPU
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog
+                  resource: requests.cpu
+            - name: REQUEST_MEMORY
+              valueFrom:
+                resourceFieldRef:
+                  containerName: cmii-uav-watchdog
+                  resource: requests.memory
+          ports:
+            - name: pod-port
+              containerPort: 8080
+              protocol: TCP
+          resources:
+            limits:
+              memory: 2Gi
+              cpu: "2"
+            requests:
+              memory: 200Mi
+              cpu: 200m
+          volumeMounts:
+            - name: nfs-backend-log-volume
+              mountPath: /cmii/cmii-uav-watchdog/
+              readOnly: false
+              subPath: uavcloud-devflight/cmii-uav-watchdog
+            - name: cmii-uav-watchdog-conf
+              mountPath: /cmii/cmii-uav-watchdog/config.yaml
+              subPath: config.yaml
+      volumes:
+        - name: nfs-backend-log-volume
+          persistentVolumeClaim:
+            claimName: nfs-backend-log-pvc
+        - name: cmii-uav-watchdog-conf
+          configMap:
+            name: cmii-uav-watchdog-configmap
+            items:
+              - key: config.yaml
+                path: config.yaml
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: cmii-uav-watchdog
+  namespace: uavcloud-devflight
+  labels:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog
+    octopus/control: backend-app-1.0.0
+    app.kubernetes.io/managed-by: octopus
+    app.kubernetes.io/app-version: 6.2.0
+spec:
+  type: ClusterIP
+  selector:
+    cmii.type: backend
+    cmii.app: cmii-uav-watchdog
+  ports:
+    - name: backend-tcp
+      port: 8080
+      protocol: TCP
+      targetPort: 8080
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: cmii-uav-watchdog-configmap
+  namespace: uavcloud-devflight
+data:
+  config.yaml: |-
+    mqtt:
+      broker: "helm-emqxs"
+      port: 1883
+      username: "cmlc"
+      password: "4YPk*DS%+5"
+
+    topics:
+      mqtt_topic: "bridge/DP74b4ef9fb4aaf269/device_data/FU_PAM/+"
+      sensor_topic: "fromcheck/DP74b4ef9fb4aaf269/device_data/FU_PAM/+"

agent-common/real_project/uavcloud-devflight/k8s-configmap.yaml

@@ -2,56 +2,56 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-ai-brain
+  name: tenant-prefix-supervisionh5
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "ai-brain",
+      ApplicationShortName: "supervisionh5",
-      AppClientId: "APP_rafnuCAmBESIVYMH"
+      AppClientId: "APP_qqSu82THfexI8PLM"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-cmsportal
+  name: tenant-prefix-pangu
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "cmsportal",
+      ApplicationShortName: "",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-hljtt
+  name: tenant-prefix-flight-control
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hljtt",
+      ApplicationShortName: "flight-control",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-uas
+  name: tenant-prefix-jiangsuwenlv
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "uas",
+      ApplicationShortName: "jiangsuwenlv",
       AppClientId: "empty"
     }
 ---
@@ -72,29 +72,71 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-pangu
+  name: tenant-prefix-scanner
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "",
+      ApplicationShortName: "scanner",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-armypeople
+  name: tenant-prefix-base
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "armypeople",
+      ApplicationShortName: "base",
-      AppClientId: "APP_UIegse6Lfou9pO1U"
+      AppClientId: "APP_9LY41OaKSqk2btY0"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-multiterminal
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "multiterminal",
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-oms
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "oms",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-open
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "open",
+      AppClientId: "empty"
     }
 ---
 kind: ConfigMap
@@ -114,103 +156,75 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-threedsimulation
+  name: tenant-prefix-share
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "threedsimulation",
+      ApplicationShortName: "share",
+      AppClientId: "APP_4lVSVI0ZGxTssir8"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-smsecret
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "smsecret",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-qingdao
+  name: tenant-prefix-mianyangbackend
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qingdao",
+      ApplicationShortName: "mianyangbackend",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-scanner
+  name: tenant-prefix-supervision
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "scanner",
+      ApplicationShortName: "supervision",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-blockchain
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "blockchain",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-dikongzhixingh5
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "dikongzhixingh5",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-uavmsmanager
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "uavmsmanager",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-supervisionh5
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervisionh5",
       AppClientId: "APP_qqSu82THfexI8PLM"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-logistics
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "logistics",
+      AppClientId: "APP_PvdfRRRBPL8xbIwl"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-mws
   namespace: uavcloud-devflight
@@ -240,75 +254,19 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-traffic
+  name: tenant-prefix-threedsimulation
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "traffic",
+      ApplicationShortName: "threedsimulation",
-      AppClientId: "APP_Jc8i2wOQ1t73QEJS"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-classification
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "classification",
       AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-awareness
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "awareness",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-oms
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "oms",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-security
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "security",
-      AppClientId: "APP_JUSEMc7afyWXxvE7"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-uasms
   namespace: uavcloud-devflight
@@ -324,210 +282,14 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-dispatchh5
+  name: tenant-prefix-classification
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "dispatchh5",
+      ApplicationShortName: "classification",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-smsecret
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "smsecret",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-secenter
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "secenter",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-mianyangbackend
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "mianyangbackend",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-emergency
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "emergency",
-      AppClientId: "APP_aGsTAY1uMZrpKdfk"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-multiterminal
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "multiterminal",
-      AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-share
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "share",
-      AppClientId: "APP_4lVSVI0ZGxTssir8"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-base
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "base",
-      AppClientId: "APP_9LY41OaKSqk2btY0"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-detection
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "detection",
-      AppClientId: "APP_FDHW2VLVDWPnnOCy"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-logistics
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "logistics",
-      AppClientId: "APP_PvdfRRRBPL8xbIwl"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-open
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "open",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-jiangsuwenlv
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "jiangsuwenlv",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-qinghaitourism
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qinghaitourism",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-visualization
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "visualization",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-smauth
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "smauth",
       AppClientId: "empty"
     }
 ---
@@ -548,43 +310,29 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-renyike
+  name: tenant-prefix-detection
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "renyike",
+      ApplicationShortName: "detection",
-      AppClientId: "empty"
+      AppClientId: "APP_FDHW2VLVDWPnnOCy"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-flight-control
+  name: tenant-prefix-emergency
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "flight-control",
+      ApplicationShortName: "emergency",
-      AppClientId: "empty"
+      AppClientId: "APP_aGsTAY1uMZrpKdfk"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-supervision
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervision",
-      AppClientId: "APP_qqSu82THfexI8PLM"
     }
 ---
 kind: ConfigMap
@@ -617,6 +365,202 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-qingdao
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "qingdao",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-blockchain
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "blockchain",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-ai-brain
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "ai-brain",
+      AppClientId: "APP_rafnuCAmBESIVYMH"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-cmsportal
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "cmsportal",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-security
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "security",
+      AppClientId: "APP_JUSEMc7afyWXxvE7"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-traffic
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "traffic",
+      AppClientId: "APP_Jc8i2wOQ1t73QEJS"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-dikongzhixingh5
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "dikongzhixingh5",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-renyike
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "renyike",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-armypeople
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "armypeople",
+      AppClientId: "APP_UIegse6Lfou9pO1U"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-qinghaitourism
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "qinghaitourism",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-hljtt
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "hljtt",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-visualization
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "visualization",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-uas
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "uas",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-dispatchh5
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "dispatchh5",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-hyper
   namespace: uavcloud-devflight
@@ -628,3 +572,59 @@ data:
       ApplicationShortName: "hyper",
       AppClientId: "empty"
     }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-smauth
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "smauth",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-secenter
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "secenter",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-uavmsmanager
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "uavmsmanager",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-awareness
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "awareness",
+      AppClientId: "empty"
+    }

agent-common/real_project/uavcloud-devflight/k8s-ingress.yaml

@@ -8,7 +8,7 @@ metadata:
     type: frontend
     octopus.control: all-ingress-config-wdd
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -304,7 +304,7 @@ metadata:
     type: backend
     octopus.control: all-ingress-config-wdd
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -718,6 +718,14 @@ spec:
             backend:
               serviceName: cmii-uav-user
               servicePort: 8080
+    - host: cmii-uav-watchdog.uavcloud-devflight.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-watchdog
+              servicePort: 8080
     - host: cmii-uav-waypoint.uavcloud-devflight.io
       http:
         paths:
@@ -752,7 +760,7 @@ metadata:
     type: api-gateway
     octopus.control: all-ingress-config-1.1.0
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -780,3 +788,8 @@ spec:
             backend:
               serviceName: cmii-uav-gateway
               servicePort: 8080
+           - path: /devflight/uas/api/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uas-gateway
+              servicePort: 8080

agent-common/real_project/uavcloud-devflight/k8s-srs.yaml

@@ -458,7 +458,7 @@ data:
         info:
           name: cmii-live-operator
           description: cmii-live-operator
-          version: 6.0.0
+          version: 6.2.0
           scanPackage: com.cmii.live.op
       cloud:
         nacos:
@@ -468,11 +468,11 @@ data:
             server-addr: helm-nacos:8848
             extension-configs:
               - data-id: cmii-live-operator.yml
-                group: 6.0.0
+                group: 6.2.0
                 refresh: true
             shared-configs:
               - data-id: cmii-backend-system.yml
-                group: 6.0.0
+                group: 6.2.0
                 refresh: true
           discovery:
             enabled: false

agent-common/real_project/uavcloud-devflight/old/k8s-ingress.yaml

@@ -8,7 +8,7 @@ metadata:
     type: frontend
     octopus.control: all-ingress-config-wdd
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -304,7 +304,7 @@ metadata:
     type: backend
     octopus.control: all-ingress-config-wdd
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -366,6 +366,14 @@ spec:
             backend:
               serviceName: cmii-suav-supervision
               servicePort: 8080
+    - host: cmii-uas-datahub.uavcloud-devflight.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uas-datahub
+              servicePort: 8080
     - host: cmii-uas-gateway.uavcloud-devflight.io
       http:
         paths:
@@ -710,6 +718,14 @@ spec:
             backend:
               serviceName: cmii-uav-user
               servicePort: 8080
+    - host: cmii-uav-watchdog.uavcloud-devflight.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-watchdog
+              servicePort: 8080
     - host: cmii-uav-waypoint.uavcloud-devflight.io
       http:
         paths:
@@ -744,7 +760,7 @@ metadata:
     type: api-gateway
     octopus.control: all-ingress-config-1.1.0
     app.kubernetes.io/managed-by: octopus-control
-    app.kubernetes.io/version: 6.0.0
+    app.kubernetes.io/version: 6.2.0
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -772,3 +788,8 @@ spec:
             backend:
               serviceName: cmii-uav-gateway
               servicePort: 8080
+           - path: /devflight/uas/api/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uas-gateway
+              servicePort: 8080

agent-common/real_project/uavcloud-devflight/old/k8s-srs.yaml

@@ -458,7 +458,7 @@ data:
         info:
           name: cmii-live-operator
           description: cmii-live-operator
-          version: 6.0.0
+          version: 6.2.0
           scanPackage: com.cmii.live.op
       cloud:
         nacos:
@@ -468,11 +468,11 @@ data:
             server-addr: helm-nacos:8848
             extension-configs:
               - data-id: cmii-live-operator.yml
-                group: 6.0.0
+                group: 6.2.0
                 refresh: true
             shared-configs:
               - data-id: cmii-backend-system.yml
-                group: 6.0.0
+                group: 6.2.0
                 refresh: true
           discovery:
             enabled: false

agent-deploy/d_app/TemplateCmiiBackend.go

@@ -105,12 +105,12 @@ spec:
               valueFrom:
                 resourceFieldRef:
                   containerName: {{ .AppName }}
-                  resource: request.cpu
+                  resource: requests.cpu
             - name: REQUEST_MEMORY
               valueFrom:
                 resourceFieldRef:
                   containerName: {{ .AppName }}
-                  resource: request.memory
+                  resource: requests.memory
           ports:
             - name: pod-port
               containerPort: 8080

agent-operator/CmiiDeployOperator.go

@@ -24,7 +24,7 @@ func init() {
 	case "linux":
 		DeployFilePrefix = "/root/wddproject/ProjectOctopus/agent-common/real_project/"
 	case "windows":
-		DeployFilePrefix = "C:\\Users\\wdd\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
+		DeployFilePrefix = "C:\\Users\\wdd\\Documents\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
 		//DeployFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
 
 	}

agent-operator/CmiiDeployOperator_test.go

@@ -25,7 +25,7 @@ func TestCmiiEnvDeploy(t *testing.T) {
 		HarborIPOrCustomImagePrefix: image2.CmiiHarborPrefix,
 		HarborPort:                  "",
 		Namespace:                   deployNamespace,
-		TagVersion:                  "6.0.0",
+		TagVersion:                  "6.2.0",
 		TenantEnv:                   "devflight",
 		MinioPublicIP:               "",
 		MinioInnerIP:                "127.0.0.1",