update

.idea/workspace.xml

@@ -5,10 +5,30 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6047a167-18d5-4f8e-a170-63c3fd101bda" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.editorconfig" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/agent-common/SplitProject/监管平台-Doris-k8s/doris-deployment.yaml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/agent-common/SplitProject/监管平台-Doris-k8s/doris-pvc.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/WddSuperAgent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WddSuperAgent.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.run/Cmii镜像同步-35.70.run.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.run/DCU全部CMII镜像.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/DCU全部CMII镜像.run.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.run/清理CMII镜像-35.70.run.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.run/清理CMII镜像-35.80.run.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/CmiiImageListConfig.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/CmiiImageListConfig.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/cmii-uavms-pyfusion.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/cmii-uavms-pyfusion.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-backend.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-backend.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-configmap.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-configmap.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-frontend.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-frontend.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-ingress.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/k8s-ingress.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-backend.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-backend.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-configmap.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-configmap.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-frontend.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-frontend.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-ingress.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/agent-common/real_project/uavcloud-devflight/old/k8s-ingress.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-deploy/d_app/CmiiImageConfig.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/d_app/CmiiImageConfig.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-deploy/d_app/FrontendConfigMap.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/d_app/FrontendConfigMap.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-deploy/d_app/TemplateIngressConfigMap.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-deploy/d_app/TemplateIngressConfigMap.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiDeployOperator_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiDeployOperator_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator_test.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiImageSyncOperator_test.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/agent-operator/CmiiK8sOperator.go" beforeDir="false" afterPath="$PROJECT_DIR$/agent-operator/CmiiK8sOperator.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,6 +41,13 @@
   </component>
   <component name="KubernetesApiPersistence">{}</component>
   <component name="KubernetesApiProvider">{
+  &quot;configuredContexts&quot;: [
+    {
+      &quot;name&quot;: &quot;cmii-dev-cluster&quot;,
+      &quot;kubeConfigUrl&quot;: &quot;file://C:/Users/wdd/.kube/config&quot;,
+      &quot;currentNamespace&quot;: &quot;uavcloud-devflight&quot;
+    }
+  ],
   &quot;isMigrated&quot;: true
 }</component>
   <component name="ProjectColorInfo">{
@@ -34,6 +61,15 @@
   </component>
   <component name="PropertiesComponent">{
   &quot;keyToString&quot;: {
+    &quot;Go Test.Cmii镜像同步-80.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.DCU全部CMII镜像.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator (1).executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.清理CMII镜像-35.70.executor&quot;: &quot;Run&quot;,
+    &quot;Go Test.清理CMII镜像-35.80.executor&quot;: &quot;Run&quot;,
     &quot;PowerShell.one-build-and-upload.ps1 (1).executor&quot;: &quot;Run&quot;,
     &quot;PowerShell.one-build-and-upload.ps1.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
@@ -47,22 +83,147 @@
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
-  <component name="RunManager" selected="PowerShell.one-build-and-upload.ps1 (1)">
+  <component name="RunManager" selected="Go Test.TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator">
-    <configuration name="one-build-and-upload.ps1 (1)" type="PowerShellRunType" factoryName="PowerShell" temporary="true" scriptUrl="$PROJECT_DIR$/agent-wdd/a_run/one-build-and-upload.ps1" executablePath="$PROJECT_DIR$/../../../../../Windows/System32/WindowsPowerShell/v1.0/powershell.exe">
+    <configuration name="TestCmiiEnvDeploy in wdd.io/agent-operator (1)" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
-      <envs />
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy\E$" />
       <method v="2" />
     </configuration>
-    <configuration name="one-build-and-upload.ps1" type="PowerShellRunType" factoryName="PowerShell" temporary="true" scriptUrl="$PROJECT_DIR$/agent-wdd/a_run/one-build-and-upload.ps1" executablePath="$PROJECT_DIR$/../../../../../Windows/System32/WindowsPowerShell/v1.0/powershell.exe">
+    <configuration name="TestCmiiEnvDeploy in wdd.io/agent-operator (1)" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
-      <envs />
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy\E$" />
       <method v="2" />
     </configuration>
+    <configuration name="TestCmiiEnvDeploy in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestCmiiEnvDeploy in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy_ZhuHaiBianFangShengJi\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestCmiiEnvDeploy_ZhuHaiBianFangShengJi\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestPullFromEntityAndSyncConditionally\E$" />
+      <method v="2" />
+    </configuration>
+    <configuration name="TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator" type="GoTestRunConfiguration" factoryName="Go Test" temporary="true" nameIsGenerated="true">
+      <module name="WddSuperAgent" />
+      <working_directory value="$PROJECT_DIR$/agent-operator" />
+      <kind value="PACKAGE" />
+      <package value="wdd.io/agent-operator" />
+      <directory value="$PROJECT_DIR$" />
+      <filePath value="$PROJECT_DIR$" />
+      <framework value="gotest" />
+      <pattern value="^\QTestPullFromEntityAndSyncConditionally\E$" />
+      <method v="2" />
+    </configuration>
+    <list>
+      <item itemvalue="Go Test.CmiiUpdater-35.70" />
+      <item itemvalue="Go Test.CMII镜像同步-11.8-ARM" />
+      <item itemvalue="Go Test.Cmii镜像同步-80" />
+      <item itemvalue="Go Test.DCU全部CMII镜像" />
+      <item itemvalue="Go Test.DEMO更新-3570" />
+      <item itemvalue="Go Test.DEMO重启-3570" />
+      <item itemvalue="Go Test.Middle镜像-35.70" />
+      <item itemvalue="Go Test.Middle镜像-ARM-11.8" />
+      <item itemvalue="Go Test.查询应用分支-3570" />
+      <item itemvalue="Go Test.清理CMII镜像-35.80" />
+      <item itemvalue="Go Test.重启DEMO-3570" />
+      <item itemvalue="Go Test.院内Harbor清理-35.70" />
+      <item itemvalue="Go Test.TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator" />
+      <item itemvalue="Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator (1)" />
+      <item itemvalue="Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator" />
+      <item itemvalue="Go Test.TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator" />
+      <item itemvalue="Go Test.TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="PowerShell.one-build-and-upload.ps1 (1)" />
+        <item itemvalue="Go Test.TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator" />
-        <item itemvalue="PowerShell.one-build-and-upload.ps1" />
+        <item itemvalue="Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator (1)" />
+        <item itemvalue="Go Test.TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator" />
+        <item itemvalue="Go Test.TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator" />
+        <item itemvalue="Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator" />
       </list>
     </recent_temporary>
   </component>
@@ -85,6 +246,31 @@
       <workItem from="1743088645374" duration="2622000" />
       <workItem from="1743124314153" duration="96000" />
       <workItem from="1743124481375" duration="159000" />
+      <workItem from="1743124723849" duration="31000" />
+      <workItem from="1743386798559" duration="4981000" />
+      <workItem from="1743470151334" duration="2530000" />
+      <workItem from="1743643583532" duration="19000" />
+      <workItem from="1743995670688" duration="3153000" />
+      <workItem from="1744082075356" duration="830000" />
+      <workItem from="1744091801180" duration="856000" />
+      <workItem from="1744272006320" duration="6000" />
+      <workItem from="1745219113709" duration="1806000" />
+      <workItem from="1745223283650" duration="13234000" />
+      <workItem from="1745561611138" duration="1904000" />
+      <workItem from="1745565275036" duration="397000" />
+      <workItem from="1745568418778" duration="636000" />
+      <workItem from="1745717939370" duration="16000" />
+      <workItem from="1745719038213" duration="1996000" />
+      <workItem from="1745802928379" duration="4216000" />
+      <workItem from="1745906570338" duration="1251000" />
+      <workItem from="1745914308478" duration="1447000" />
+      <workItem from="1745975385371" duration="963000" />
+      <workItem from="1745993558805" duration="889000" />
+      <workItem from="1746670195851" duration="4188000" />
+      <workItem from="1746757437023" duration="1525000" />
+      <workItem from="1746770913024" duration="1199000" />
+      <workItem from="1747012933414" duration="4245000" />
+      <workItem from="1747204374551" duration="9000" />
     </task>
     <servers />
   </component>

.run/Cmii镜像同步-35.70.run.xml

@@ -1,15 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="Cmii镜像同步-35.70" type="GoTestRunConfiguration" factoryName="Go Test">
-        <module name="ProjectOctopus"/>
-        <target name="wdd-dev-35.70"/>
-        <working_directory value="$PROJECT_DIR$/agent-operator"/>
-        <kind value="PACKAGE"/>
-        <package value="wdd.io/agent-operator"/>
-        <directory value="$PROJECT_DIR$"/>
-        <filePath value="$PROJECT_DIR$"/>
-        <option name="build_on_remote_target" value="true"/>
-        <framework value="gotest"/>
-        <pattern value="^\QTestPullFromEntityAndSyncConditionally\E$"/>
-        <method v="2"/>
-    </configuration>
-</component>

.run/DCU全部CMII镜像.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DCU全部CMII镜像" type="GoTestRunConfiguration" factoryName="Go Test">
-        <module name="ProjectOctopus"/>
+    <module name="WddSuperAgent" />
     <target name="wdd-dev-35.70" />
     <working_directory value="$PROJECT_DIR$/agent-operator" />
     <kind value="PACKAGE" />

.run/清理CMII镜像-35.80.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="清理CMII镜像-35.70" type="GoTestRunConfiguration" factoryName="Go Test">
+  <configuration default="false" name="清理CMII镜像-35.80" type="GoTestRunConfiguration" factoryName="Go Test">
     <module name="WddSuperAgent" />
-    <target name="wdd-dev-35.70" />
+    <target name="wdd-dev-35.80" />
     <working_directory value="$PROJECT_DIR$/agent-operator/image" />
     <root_directory value="$PROJECT_DIR$/agent-operator" />
     <kind value="PACKAGE" />

agent-common/SplitProject/监管平台-Doris-k8s/doris-deployment.yaml

@@ -0,0 +1,130 @@
+# doris-fe-app.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: doris-fe-app
+  namespace: zyly
+spec:
+  imagePullSecrets:
+    - name: harborsecret
+  replicas: 1
+  selector:
+    matchLabels:
+      app: doris-fe-app
+  template:
+    metadata:
+      labels:
+        app: doris-fe-app
+    spec:
+      containers:
+        - name: doris-fe-app
+          image: harbor.cdcyy.com.cn/cmii/doris.fe-amd64:2.1.6
+          env:
+            - name: FE_SERVERS
+              value: "doris-fe-service:9010"  # 使用Service名称进行服务发现
+            - name: FE_ID
+              value: "1"
+          ports:
+            - containerPort: 8030
+            - containerPort: 9030
+            - containerPort: 9010  # 添加内部通信端口
+          volumeMounts:
+            - name: fe-meta
+              mountPath: /opt/apache-doris/fe/doris-meta
+            - name: fe-log
+              mountPath: /opt/apache-doris/fe/log
+      volumes:
+        - name: fe-meta
+          persistentVolumeClaim:
+            claimName: doris-fe-meta-pvc
+        - name: fe-log
+          persistentVolumeClaim:
+            claimName: doris-fe-log-pvc
+
+---
+# doris-fe-service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: doris-fe-service
+  namespace: zyly
+spec:
+  selector:
+    app: doris-fe-app
+  ports:
+    - name: http
+      port: 8030
+      targetPort: 8030
+    - name: query
+      port: 9030
+      targetPort: 9030
+    - name: edit
+      port: 9010  # 暴露FE内部通信端口
+      targetPort: 9010
+
+---
+# doris-be-app.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: doris-be-app
+  namespace: zyly
+spec:
+  imagePullSecrets:
+    - name: harborsecret
+  replicas: 1
+  selector:
+    matchLabels:
+      app: doris-be-app
+  template:
+    metadata:
+      labels:
+        app: doris-be-app
+    spec:
+      initContainers:
+        - name: wait-for-fe
+          image: busybox:1.28
+          command: ['sh', '-c', 'until nc -z doris-fe-service 9010; do echo waiting for fe; sleep 2; done;']
+      containers:
+        - name: doris-be-app
+          image: harbor.cdcyy.com.cn/cmii/doris.be-amd64:2.1.6
+          env:
+            - name: FE_SERVERS
+              value: "doris-fe-service:9010"
+            - name: BE_ADDR
+              value: "doris-be-service:9050"  # 使用Service名称
+          ports:
+            - containerPort: 8040
+            - containerPort: 9050  # 添加BE通信端口
+          volumeMounts:
+            - name: doris-be-storage
+              mountPath: /opt/apache-doris/be/storage
+            - name: doris-be-log
+              mountPath: /opt/apache-doris/be/log
+      volumes:
+        - name: doris-be-storage
+          persistentVolumeClaim:
+            claimName: doris-be-storage-pvc
+        - name: doris-be-log
+          persistentVolumeClaim:
+            claimName: doris-be-log-pvc
+
+---
+# doris-be-service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  name: doris-be-service
+  namespace: zyly
+spec:
+  selector:
+    app: doris-be-app
+  ports:
+    - name: http
+      port: 8040
+      targetPort: 8040
+    - name: be-port
+      port: 9050  # 暴露BE通信端口
+      targetPort: 9050
+
+

agent-common/SplitProject/监管平台-Doris-k8s/doris-pvc.yaml

@@ -0,0 +1,60 @@
+---
+# pvc.yaml
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: doris-fe-meta-pvc
+  namespace: zyly
+spec:
+  storageClassName: hcms-efs-class
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: doris-fe-log-pvc
+  namespace: zyly
+spec:
+  storageClassName: hcms-efs-class
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: doris-be-storage-pvc
+  namespace: zyly
+spec:
+  storageClassName: hcms-efs-class
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 500Gi  # 根据实际存储需求调整
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: doris-be-log-pvc
+  namespace: zyly
+spec:
+  storageClassName: hcms-efs-class
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 10Gi

agent-common/real_project/CmiiImageListConfig.go

@@ -1,5 +1,29 @@
 package real_project
 
+// CmiiUas2ImageList 2025年5月8日
+var CmiiUas2ImageList = []string{
+	"harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:2.0.0-pro-20250421",
+	"harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:2.0.0-pro-20250416",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:pro-6.0.8",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:6.2.0-050701",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:master-2.0-pro-250428",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:master-2.0-pro-250428-uas",
+	"harbor.cdcyy.com.cn/cmii/cmii-uavms-pyfusion:6.3.3",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-iot-dispatcher:6.2.0",
+	"harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:6.2.0-250415",
+}
+
+var CmiiDorisImageList = []string{
+	"harbor.cdcyy.com.cn/cmii/doris.fe-amd64:2.1.6",
+	"harbor.cdcyy.com.cn/cmii/doris.be-amd64:2.1.6",
+}
+
+var CmiiSRSImageList = []string{
+	"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
+	"harbor.cdcyy.com.cn/cmii/srs:v5.0.195",
+	"harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA-skip-CHL",
+}
+
 var Cmii620ArmImageList = []string{
 	"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:6.2.0-szgz-arm",
 	"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:6.2.0-szgz-arm",

agent-common/real_project/cmii-uavms-pyfusion.yaml

@@ -3,14 +3,14 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: pyfusion-configmap
-  namespace: uavcloud-devflight
+  namespace: uavcloud-demo
 data:
   config.yaml: |-
     mqtt:
       broker: "helm-emqxs"
       port: 1883
       username: "cmlc"
-      password: "4YPk*DS%+5"
+      password: "odD8#Cr628"
 
     topics:
       mqtt_topic: "bridge/DP74b4ef9fb4aaf269/device_data/FU_PAM/+"
@@ -20,7 +20,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: cmii-uavms-pyfusion
-  namespace: uavcloud-devflight
+  namespace: uavcloud-demo
   labels:
     app.kubernetes.io/app-version: 6.2.0
     app.kubernetes.io/managed-by: octopus-control
@@ -52,7 +52,7 @@ spec:
                 path: config.yaml
       containers:
         - name: cmii-uavms-pyfusion
-          image: 'harbor.cdcyy.com.cn/cmii/cmii-uavms-pyfusion:6.2.0'
+          image: 'harbor.cdcyy.com.cn/cmii/cmii-uavms-pyfusion:6.3.1'
           ports:
             - name: pod-port
               containerPort: 8080
@@ -67,7 +67,7 @@ spec:
             - name: NACOS_SERVER_ADDRESS
               value: 'helm-nacos:8848'
             - name: K8S_NAMESPACE
-              value: uavcloud-devflight
+              value: uavcloud-demo
             - name: APPLICATION_NAME
               value: cmii-uavms-pyfusion
             - name: NACOS_DISCOVERY_PORT
@@ -88,7 +88,7 @@ spec:
           volumeMounts:
             - name: nfs-backend-log-volume
               mountPath: /cmii/logs
-              subPath: uavcloud-devflight/cmii-uavms-pyfusion
+              subPath: uavcloud-demo/cmii-uavms-pyfusion
             - name: pyfusion-conf
               mountPath: /app/config.yaml
               subPath: config.yaml
@@ -115,7 +115,7 @@ kind: Service
 apiVersion: v1
 metadata:
   name: cmii-uavms-pyfusion
-  namespace: uavcloud-devflight
+  namespace: uavcloud-demo
   labels:
     app.kubernetes.io/app-version: 6.2.0
     app.kubernetes.io/managed-by: octopus-control

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

@@ -2,56 +2,14 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-media
+  name: tenant-prefix-open
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "media",
+      ApplicationShortName: "open",
-      AppClientId: "APP_4AU8lbifESQO4FD6"
-    }
----
-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-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-uasms
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "uasms",
       AppClientId: "empty"
     }
 ---
@@ -72,89 +30,19 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-iot
+  name: tenant-prefix-supervision
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "iot",
+      ApplicationShortName: "supervision",
-      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-hyper
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hyper",
-      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-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-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-qinghaitourism
   namespace: uavcloud-devflight
@@ -170,154 +58,14 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-hljtt
+  name: tenant-prefix-uasms
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hljtt",
+      ApplicationShortName: "uasms",
-      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-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-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-securityh5
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "securityh5",
-      AppClientId: "APP_N3ImO0Ubfu9peRHD"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-threedsimulation
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "threedsimulation",
-      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-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-mws
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "mws",
-      AppClientId: "APP_uKniXPELlRERBBwK"
-    }
----
-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"
     }
 ---
@@ -337,20 +85,6 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
-metadata:
-  name: tenant-prefix-pilot2cloud
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "pilot2cloud",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
 metadata:
   name: tenant-prefix-awareness
   namespace: uavcloud-devflight
@@ -366,85 +100,29 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-supervision
+  name: tenant-prefix-pangu
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervision",
+      ApplicationShortName: "",
-      AppClientId: "APP_qqSu82THfexI8PLM"
-    }
----
-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-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-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-security
+  name: tenant-prefix-mws
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "security",
+      ApplicationShortName: "mws",
-      AppClientId: "APP_JUSEMc7afyWXxvE7"
+      AppClientId: "APP_uKniXPELlRERBBwK"
     }
 ---
 kind: ConfigMap
@@ -464,42 +142,14 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-splice
+  name: tenant-prefix-renyike
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "splice",
+      ApplicationShortName: "renyike",
-      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
-    }
----
-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-scanner
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "scanner",
       AppClientId: "empty"
     }
 ---
@@ -519,20 +169,6 @@ data:
 ---
 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-secenter
   namespace: uavcloud-devflight
@@ -548,19 +184,61 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-eventsh5
+  name: tenant-prefix-supervisionh5
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "eventsh5",
+      ApplicationShortName: "supervisionh5",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+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-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-mianyangbackend
   namespace: uavcloud-devflight
@@ -576,29 +254,29 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-flight-control
+  name: tenant-prefix-media
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "flight-control",
+      ApplicationShortName: "media",
-      AppClientId: "empty"
+      AppClientId: "APP_4AU8lbifESQO4FD6"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-pangu
+  name: tenant-prefix-securityh5
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "",
+      ApplicationShortName: "securityh5",
-      AppClientId: "empty"
+      AppClientId: "APP_N3ImO0Ubfu9peRHD"
     }
 ---
 kind: ConfigMap
@@ -631,6 +309,118 @@ data:
 ---
 kind: ConfigMap
 apiVersion: v1
+metadata:
+  name: tenant-prefix-scanner
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "scanner",
+      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-flight-control
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "flight-control",
+      AppClientId: "empty"
+    }
+---
+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-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-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-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-eventsh5
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "eventsh5",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
 metadata:
   name: tenant-prefix-dikongzhixingh5
   namespace: uavcloud-devflight
@@ -642,3 +432,213 @@ data:
       ApplicationShortName: "dikongzhixingh5",
       AppClientId: "empty"
     }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-iot
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "iot",
+      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-splice
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "splice",
+      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-threedsimulation
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "threedsimulation",
+      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-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-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-pilot2cloud
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "pilot2cloud",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-hyper
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "hyper",
+      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-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-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-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-uavmsmanager
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "uavmsmanager",
+      AppClientId: "empty"
+    }

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

@@ -65,11 +65,6 @@ spec:
     - host: fake-domain.uavcloud-devflight.io
       http:
         paths:
-          - path: /devflight/?(.*)
-            pathType: ImplementationSpecific
-            backend:
-              serviceName: cmii-uav-platform
-              servicePort: 9528
           - path: /devflight/supervision/?(.*)
             pathType: ImplementationSpecific
             backend:
@@ -700,6 +695,14 @@ spec:
             backend:
               serviceName: cmii-uav-sync
               servicePort: 8080
+    - host: cmii-uav-tcp-server.uavcloud-devflight.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-uav-tcp-server
+              servicePort: 8080
     - host: cmii-uav-threedsimulation.uavcloud-devflight.io
       http:
         paths:
@@ -799,3 +802,8 @@ spec:
             backend:
               serviceName: cmii-uas-gateway
               servicePort: 8080
+          - path: /devflight/converge/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-sky-converge
+              servicePort: 8080

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

@@ -2,14 +2,28 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-pilot2cloud
+  name: tenant-prefix-security
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "pilot2cloud",
+      ApplicationShortName: "security",
+      AppClientId: "APP_JUSEMc7afyWXxvE7"
+    }
+---
+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"
     }
 ---
@@ -29,356 +43,6 @@ data:
 ---
 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-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-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-threedsimulation
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "threedsimulation",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-uasms
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "uasms",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-hyper
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hyper",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-eventsh5
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "eventsh5",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-iot
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "iot",
-      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-media
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "media",
-      AppClientId: "APP_4AU8lbifESQO4FD6"
-    }
----
-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-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-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-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-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-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-securityh5
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "securityh5",
-      AppClientId: "APP_N3ImO0Ubfu9peRHD"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-seniclive
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "seniclive",
-      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-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-flight-control
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "flight-control",
-      AppClientId: "empty"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-mws
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "mws",
-      AppClientId: "APP_uKniXPELlRERBBwK"
-    }
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tenant-prefix-splice
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "splice",
-      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
-    }
----
-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-secenter
   namespace: uavcloud-devflight
@@ -394,14 +58,14 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-renyike
+  name: tenant-prefix-converge
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "renyike",
+      ApplicationShortName: "converge",
       AppClientId: "empty"
     }
 ---
@@ -436,15 +100,183 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-multiterminal
+  name: tenant-prefix-detection
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "multiterminal",
+      ApplicationShortName: "detection",
-      AppClientId: "APP_PvdfRRRBPL8xbIwl"
+      AppClientId: "APP_FDHW2VLVDWPnnOCy"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-media
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "media",
+      AppClientId: "APP_4AU8lbifESQO4FD6"
+    }
+---
+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-threedsimulation
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "threedsimulation",
+      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-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-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-uasms
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "uasms",
+      AppClientId: "empty"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-hyper
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "hyper",
+      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-mws
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "mws",
+      AppClientId: "APP_uKniXPELlRERBBwK"
+    }
+---
+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
@@ -464,14 +296,70 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-scanner
+  name: tenant-prefix-share
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "scanner",
+      ApplicationShortName: "share",
+      AppClientId: "APP_4lVSVI0ZGxTssir8"
+    }
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tenant-prefix-splice
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "splice",
+      AppClientId: "APP_zE0M3sTRXrCIJS8Y"
+    }
+---
+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-pilot2cloud
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "pilot2cloud",
       AppClientId: "empty"
     }
 ---
@@ -492,56 +380,112 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-smsecret
+  name: tenant-prefix-emergency
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "smsecret",
+      ApplicationShortName: "emergency",
+      AppClientId: "APP_aGsTAY1uMZrpKdfk"
+    }
+---
+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-supervision
+  name: tenant-prefix-flight-control
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "supervision",
+      ApplicationShortName: "flight-control",
-      AppClientId: "APP_qqSu82THfexI8PLM"
+      AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-armypeople
+  name: tenant-prefix-iot
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "armypeople",
+      ApplicationShortName: "iot",
-      AppClientId: "APP_UIegse6Lfou9pO1U"
+      AppClientId: "empty"
     }
 ---
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-qinghaitourism
+  name: tenant-prefix-scanner
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "qinghaitourism",
+      ApplicationShortName: "scanner",
+      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-securityh5
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "securityh5",
+      AppClientId: "APP_N3ImO0Ubfu9peRHD"
+    }
+---
+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"
     }
 ---
@@ -562,14 +506,140 @@ data:
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: tenant-prefix-uas
+  name: tenant-prefix-eventsh5
   namespace: uavcloud-devflight
 data:
   ingress-config.js: |-
     var __GlobalIngressConfig = {
       TenantEnvironment: "devflight",
       CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "uas",
+      ApplicationShortName: "eventsh5",
+      AppClientId: "empty"
+    }
+---
+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-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-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-supervision
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "supervision",
+      AppClientId: "APP_qqSu82THfexI8PLM"
+    }
+---
+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-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-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-seniclive
+  namespace: uavcloud-devflight
+data:
+  ingress-config.js: |-
+    var __GlobalIngressConfig = {
+      TenantEnvironment: "devflight",
+      CloudHOST: "lab.uavcmlc.com",
+      ApplicationShortName: "seniclive",
       AppClientId: "empty"
     }
 ---
@@ -586,59 +656,3 @@ data:
       ApplicationShortName: "smauth",
       AppClientId: "empty"
     }
----
-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-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-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-hljtt
-  namespace: uavcloud-devflight
-data:
-  ingress-config.js: |-
-    var __GlobalIngressConfig = {
-      TenantEnvironment: "devflight",
-      CloudHOST: "lab.uavcmlc.com",
-      ApplicationShortName: "hljtt",
-      AppClientId: "empty"
-    }

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

@@ -14,6 +14,7 @@ metadata:
     nginx.ingress.kubernetes.io/enable-cors: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
     nginx.ingress.kubernetes.io/configuration-snippet: |
+      rewrite ^(/converge)$ $1/ redirect;
       rewrite ^(/supervision)$ $1/ redirect;
       rewrite ^(/supervisionh5)$ $1/ redirect;
       rewrite ^(/pangu)$ $1/ redirect;
@@ -70,6 +71,11 @@ spec:
             backend:
               serviceName: cmii-uav-platform
               servicePort: 9528
+          - path: /devflight/converge/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-sky-converge
+              servicePort: 9528
           - path: /devflight/supervision/?(.*)
             pathType: ImplementationSpecific
             backend:

agent-deploy/d_app/CmiiImageConfig.go

@@ -56,6 +56,7 @@ var CmiiBackendAppMap = map[string]string{
 	"cmii-uav-iot-manager":          "5.7.0",
 	"cmii-uas-datahub":              "5.7.0",
 	"cmii-uav-watchdog":             "5.7.0",
+	"cmii-uav-tcp-server":           "5.7.0",
 }
 
 var CmiiFrontendAppMap = map[string]string{
@@ -121,6 +122,7 @@ var IgnoreCmiiBackendAppName = map[string]string{
 	"cmii-uavms-security-center": "0",
 	"cmii-uav-iot-manager":       "0",
 	"cmii-uas-datahub":           "0",
+	"cmii-uav-tcp-server":        "0",
 }
 
 var IgnoreCmiiFrontendAppName = map[string]string{

agent-deploy/d_app/TemplateIngressConfigMap.go

@@ -193,6 +193,11 @@ spec:
             backend:
               serviceName: cmii-uas-gateway
               servicePort: 8080
+          - path: /{{ $tenantEnv }}/converge/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-sky-converge
+              servicePort: 8080
           {{- else }}
           - path: /oms/api/?(.*)
             pathType: ImplementationSpecific
@@ -214,5 +219,10 @@ spec:
             backend:
               serviceName: cmii-uas-gateway
               servicePort: 8080
+          - path: /converge/?(.*)
+            pathType: ImplementationSpecific
+            backend:
+              serviceName: cmii-sky-converge
+              servicePort: 8080
          {{- end }}
 `

agent-operator/CmiiDeployOperator_test.go

@@ -37,6 +37,48 @@ func TestCmiiEnvDeploy(t *testing.T) {
 
 }
 
+func TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan(t *testing.T) {
+
+	// 湖南二级平台 监管
+	commonEnv := &z_dep.CommonEnvironmentConfig{
+		WebIP:                       "36.137.146.187",
+		WebPort:                     "8088",
+		HarborIPOrCustomImagePrefix: "hncm-fc766f84.ecis.changsha-2.cmecloud.cn/cmii",
+		HarborPort:                  "",
+		Namespace:                   "zyly",
+		TagVersion:                  "uas-2.0",
+		TenantEnv:                   "",
+		MinioPublicIP:               "",
+		MinioInnerIP:                "helm-minio",
+		NFSServerIP:                 "hcms-efs-class",
+		ApplyFilePrefix:             "",
+	}
+
+	CmiiEnvDeployOffline(commonEnv, true, real_project.CmiiUas2ImageList)
+
+}
+
+func TestCmiiEnvDeploy_ZhuHaiBianFangShengJi(t *testing.T) {
+
+	// 珠海边防升级 6.2.0-demo
+	commonEnv := &z_dep.CommonEnvironmentConfig{
+		WebIP:                       "36.141.69.163",
+		WebPort:                     "8888",
+		HarborIPOrCustomImagePrefix: "192.168.233.100",
+		HarborPort:                  "8033",
+		Namespace:                   "zhbf",
+		TagVersion:                  "6.2.0",
+		TenantEnv:                   "",
+		MinioPublicIP:               "192.168.233.100",
+		MinioInnerIP:                "192.168.233.100",
+		NFSServerIP:                 "192.168.233.100",
+		ApplyFilePrefix:             "",
+	}
+
+	CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii620ImageList)
+
+}
+
 func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
 
 	// chongqing sanhua

agent-operator/CmiiImageSyncOperator.go

@@ -138,7 +138,12 @@ func (syncCondition *ImageSyncEntity) PullFromEntityAndSyncConditionally() (imag
 		syncCondition.DownloadCondition.FullNameImageList = concatAndUniformCmiiImage(syncCondition.DownloadCondition.FullNameImageList, syncCondition.DownloadCondition.CmiiNameTagList)
 
 		// gzip file folder path
-		syncCondition.CompressCondition.GzipLocalFolder = filepath.Join(image.OfflineImageGzipFolderPrefix, "tmp")
+		localGzipFolderName := "tmp"
+		if syncCondition.DownloadCondition.ProjectName != "" {
+			localGzipFolderName = syncCondition.DownloadCondition.ProjectName
+		}
+
+		syncCondition.CompressCondition.GzipLocalFolder = filepath.Join(image.OfflineImageGzipFolderPrefix, localGzipFolderName)
 
 		// DCU
 		A_DownloadCompressUpload(syncCondition, imageSyncResult)

agent-operator/CmiiImageSyncOperator_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"testing"
 	image2 "wdd.io/agent-common/image"
+	"wdd.io/agent-common/real_project"
 	"wdd.io/agent-common/utils"
 )
 
@@ -47,16 +48,21 @@ func TestLoadSplitDepGzipImageToTargetHarbor(t *testing.T) {
 
 func TestPullFromEntityAndSyncConditionally(t *testing.T) {
 
+	// 全部镜像列表
+	fullImageList := []string{}
+
+	fullImageList = append(fullImageList, real_project.CmiiUas2ImageList...)
+	fullImageList = append(fullImageList, real_project.CmiiSRSImageList...)
+	fullImageList = append(fullImageList, real_project.CmiiDorisImageList...)
+
 	// 下载镜像的核心函数
 	sync := ImageSyncEntity{
 		DownloadCondition: &DownloadEntity{
 			ShouldDownloadImage:  true,
-			ProjectName:         "6.2.0_demo",
+			ProjectName:          "uavms-2.0",
-			ProjectVersion:      "6.2.0-demo",
+			ProjectVersion:       "",
-			CmiiNameTagList:     []string{
+			CmiiNameTagList:      []string{},
-				//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",
+			FullNameImageList:    fullImageList,
-			},
-			FullNameImageList:    []string{},
 			DownloadAuthUserName: "",
 			DownloadAuthPassword: "",
 		},

agent-operator/CmiiK8sOperator.go

@@ -203,6 +203,11 @@ func (op *CmiiK8sOperator) changeOperatorEnv(cmiiEnv string) {
 
 	if strings.Contains(cmiiEnv, "demo") {
 		op.CurrentNamespace = config.Demo
+
+		// 2025年4月7日 特殊情况
+		log.Info("2025年4月7日 特殊情况 demo现在在DEV环境！")
+		op.CurrentClient = op.DevClient
+		return
 	}
 
 	if strings.Contains(cmiiEnv, "uavms") {