diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 81ad2a5..5a5f9a8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,31 +4,18 @@
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -44,8 +31,12 @@
"configuredContexts": [
{
"name": "cmii-dev-cluster",
- "kubeConfigUrl": "file://C:/Users/wdd/.kube/config",
- "currentNamespace": "uavcloud-devflight"
+ "kubeConfigUrl": "file://C:/Users/wddsh/Documents/IdeaProjects/ProjectOctopus/agent-operator/config/cmii-dev-cluster.yaml"
+ },
+ {
+ "name": "cmii-dev-cluster",
+ "kubeConfigUrl": "file://C:/Users/wddsh/.kube/config",
+ "currentNamespace": "kube-system"
}
],
"isMigrated": true
@@ -61,15 +52,6 @@
{
"keyToString": {
- "Go Test.Cmii镜像同步-80.executor": "Run",
- "Go Test.DCU全部CMII镜像.executor": "Run",
- "Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator (1).executor": "Run",
- "Go Test.TestCmiiEnvDeploy in wdd.io/agent-operator.executor": "Run",
- "Go Test.TestCmiiEnvDeploy_HuNanErJiPingTaiJianGuan in wdd.io/agent-operator.executor": "Run",
- "Go Test.TestCmiiEnvDeploy_ZhuHaiBianFangShengJi in wdd.io/agent-operator.executor": "Run",
- "Go Test.TestPullFromEntityAndSyncConditionally in wdd.io/agent-operator.executor": "Run",
- "Go Test.清理CMII镜像-35.70.executor": "Run",
- "Go Test.清理CMII镜像-35.80.executor": "Run",
"PowerShell.one-build-and-upload.ps1 (1).executor": "Run",
"PowerShell.one-build-and-upload.ps1.executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
@@ -78,152 +60,42 @@
"RunOnceActivity.go.migrated.go.modules.settings": "true",
"git-widget-placeholder": "main",
"go.import.settings.migrated": "true",
+ "last_opened_file_path": "C:/Users/wddsh/Documents/IdeaProjects/WddSuperAgent/agent-common/real_project",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "preferences.pluginManager",
"vue.rearranger.settings.migration": "true"
}
}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -245,38 +117,44 @@
1743088643405
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1743124655007
+
+
+
+ 1743124655007
+
+
+
+
+
+
true
diff --git a/agent-common/real_project/cmii-uas-gateway-agent-test.yaml b/agent-common/real_project/cmii-uas-gateway-agent-test.yaml
new file mode 100644
index 0000000..ac2f19d
--- /dev/null
+++ b/agent-common/real_project/cmii-uas-gateway-agent-test.yaml
@@ -0,0 +1,154 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-uas-gateway
+ namespace: uavcloud-feature
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ 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-uas-gateway
+ template:
+ metadata:
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ spec:
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: uavcloud.affinity
+ operator: In
+ values:
+ - common
+ imagePullSecrets:
+ - name: harborsecret
+ containers:
+ - name: cmii-uas-gateway
+ image: harbor.cdcyy.com.cn/cmii/cmii-uas-gateway-agent:test-2025-04-11-09-52-41
+ imagePullPolicy: Always
+ env:
+ - name: K8S_NAMESPACE
+ value: uavcloud-feature
+ - name: APPLICATION_NAME
+ value: cmii-uas-gateway
+ - 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: 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: IMAGE_NAME
+ value: harbor.cdcyy.com.cn/cmii/cmii-uas-gateway-agent:test-2025-04-11-09-52-41
+ - name: NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
+ - name: NODE_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.hostIP
+ - name: LIMIT_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: limits.cpu
+ - name: LIMIT_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: limits.memory
+ - name: REQUEST_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: requests.cpu
+ - name: REQUEST_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: requests.memory
+ - name: WATCHDOG_HEARTBEAT_URL
+ value: http://cmii-uav-watchdog:8080/api/heartbeat
+ - name: CMII_DEBUG_MODE
+ value: WDD_DEBUG
+ - name: WATCHDOG_AGENT_HEARTBEAT_INTERVAL
+ value: "60s"
+ - name: WATCHDOG_AGENT_FAIL_WAIT_INTERVAL
+ value: "30s"
+ 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-feature/cmii-uas-gateway
+ volumes:
+ - name: nfs-backend-log-volume
+ persistentVolumeClaim:
+ claimName: nfs-backend-log-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: cmii-uas-gateway
+ namespace: uavcloud-feature
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ 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-uas-gateway
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+---
\ No newline at end of file
diff --git a/agent-common/real_project/cmii-uas-lifecycle-agent-test.yaml b/agent-common/real_project/cmii-uas-lifecycle-agent-test.yaml
new file mode 100644
index 0000000..9602d5f
--- /dev/null
+++ b/agent-common/real_project/cmii-uas-lifecycle-agent-test.yaml
@@ -0,0 +1,150 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-uas-lifecycle
+ namespace: uavcloud-feature
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ 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-uas-lifecycle
+ template:
+ metadata:
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ spec:
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: uavcloud.affinity
+ operator: In
+ values:
+ - common
+ imagePullSecrets:
+ - name: harborsecret
+ containers:
+ - name: cmii-uas-lifecycle
+ image: harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle-agent:test-2025-04-09-14-14-05
+ imagePullPolicy: Always
+ env:
+ - name: K8S_NAMESPACE
+ value: uavcloud-feature
+ - name: APPLICATION_NAME
+ value: cmii-uas-lifecycle
+ - 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: 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: IMAGE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.containers[0].image
+ - name: NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
+ - name: NODE_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.hostIP
+ - name: LIMIT_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: limits.cpu
+ - name: LIMIT_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: limits.memory
+ - name: REQUEST_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: requests.cpu
+ - name: REQUEST_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: requests.memory
+ - name: WATCHDOG_HEARTBEAT_URL
+ value: http://cmii-uav-watchdog:8080/api/heartbeat
+ 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-feature/cmii-uas-lifecycle
+ volumes:
+ - name: nfs-backend-log-volume
+ persistentVolumeClaim:
+ claimName: nfs-backend-log-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: cmii-uas-lifecycle
+ namespace: uavcloud-feature
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ 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-uas-lifecycle
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+---
\ No newline at end of file
diff --git a/agent-common/real_project/cmii-uav-watchdog-agent-test.yaml b/agent-common/real_project/cmii-uav-watchdog-agent-test.yaml
index 8cfa615..5263997 100644
--- a/agent-common/real_project/cmii-uav-watchdog-agent-test.yaml
+++ b/agent-common/real_project/cmii-uav-watchdog-agent-test.yaml
@@ -38,7 +38,7 @@ spec:
- name: harborsecret
containers:
- name: cmii-uav-watchdog-agent
- image: harbor.cdcyy.com.cn/cmii/cmii-uav-watchdog-agent-java:2025-03-26-17-09-09
+ image: harbor.cdcyy.com.cn/cmii/cmii-uav-watchdog-agent-java:2025-04-10-11-11-34
imagePullPolicy: Always
env:
- name: K8S_NAMESPACE
@@ -76,11 +76,11 @@ spec:
- name: NODE_NAME
valueFrom:
fieldRef:
- fieldPath: spec.nodeName
+ fieldPath: spec.nodeName # 这是正确且支持的用法
- name: NODE_IP
valueFrom:
fieldRef:
- fieldPath: status.hostIP
+ fieldPath: status.hostIP # 这是正确且支持的用法
- name: LIMIT_CPU
valueFrom:
resourceFieldRef:
diff --git a/agent-common/real_project/cmii-uav-watchdog-test.yaml b/agent-common/real_project/cmii-uav-watchdog-test.yaml
index 6633331..1e9f028 100644
--- a/agent-common/real_project/cmii-uav-watchdog-test.yaml
+++ b/agent-common/real_project/cmii-uav-watchdog-test.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: cmii-uav-watchdog
- namespace: uavcloud-devflight
+ namespace: uavcloud-feature
labels:
cmii.type: backend
cmii.app: cmii-uav-watchdog
@@ -30,10 +30,10 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- - key: uavcloud.env
+ - key: uavcloud.affinity
operator: In
values:
- - devflight
+ - common
imagePullSecrets:
- name: harborsecret
containers:
@@ -42,7 +42,7 @@ spec:
imagePullPolicy: Always
env:
- name: K8S_NAMESPACE
- value: uavcloud-devflight
+ value: uavcloud-feature
- name: APPLICATION_NAME
value: cmii-uav-watchdog
- name: CUST_JAVA_OPTS
@@ -116,7 +116,7 @@ spec:
- name: nfs-backend-log-volume
mountPath: /cmii/cmii-uav-watchdog/
readOnly: false
- subPath: uavcloud-devflight/cmii-uav-watchdog
+ subPath: uavcloud-feature/cmii-uav-watchdog
- name: cmii-uav-watchdog-conf
mountPath: /cmii/cmii-uav-watchdog/config.yaml
subPath: config.yaml
@@ -135,7 +135,7 @@ apiVersion: v1
kind: Service
metadata:
name: cmii-uav-watchdog
- namespace: uavcloud-devflight
+ namespace: uavcloud-feature
labels:
cmii.type: backend
cmii.app: cmii-uav-watchdog
@@ -158,7 +158,7 @@ kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-watchdog-configmap
- namespace: uavcloud-devflight
+ namespace: uavcloud-feature
data:
config.yaml: |-
server:
@@ -172,7 +172,7 @@ data:
url: "https://watchdog-center.example.com" # 一级授权中心地址
project:
- project_namespace: "uavcloud-devflight" # 项目命名空间
+ project_namespace: "uavcloud-feature" # 项目命名空间
tier_two_auth:
tier_two_secret: "your_tier_two_secret_here" # 二级授权密钥
\ No newline at end of file
diff --git a/agent-common/real_project/cmii-updater.yaml b/agent-common/real_project/cmii-updater.yaml
new file mode 100644
index 0000000..6c9d91c
--- /dev/null
+++ b/agent-common/real_project/cmii-updater.yaml
@@ -0,0 +1,117 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-updater
+ namespace: kube-system
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-updater
+ 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-updater
+ template:
+ metadata:
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-updater
+ spec:
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: node-role.kubernetes.io/controlplane
+ operator: In
+ values:
+ - 'true'
+ imagePullSecrets:
+ - name: harborsecret
+ tolerations:
+ - key: "node.kubernetes.io/unschedulable"
+ operator: "Exists"
+ effect: "NoSchedule"
+ containers:
+ - name: cmii-updater
+ image: harbor.cdcyy.com.cn/cmii/cmii-updater:2025-04-21
+ imagePullPolicy: Always
+ env:
+ - name: K8S_NAMESPACE
+ value: kube-system
+ - name: APPLICATION_NAME
+ value: cmii-updater
+ - name: POD_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ - name: POD_NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: IMAGE_NAME
+ value: harbor.cdcyy.com.cn/cmii/cmii-updater-agent:test-2025-04-11-09-52-41
+ - name: NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
+ - name: NODE_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.hostIP
+ - name: LIMIT_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-updater
+ resource: limits.cpu
+ - name: LIMIT_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-updater
+ resource: limits.memory
+ - name: REQUEST_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-updater
+ resource: requests.cpu
+ - name: REQUEST_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-updater
+ resource: requests.memory
+ ports:
+ - name: pod-port
+ containerPort: 8080
+ protocol: TCP
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: cmii-updater
+ namespace: kube-system
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-updater
+ octopus/control: backend-app-1.0.0
+ app.kubernetes.io/managed-by: octopus
+ app.kubernetes.io/app-version: 6.2.0
+spec:
+ type: NodePort
+ selector:
+ cmii.type: backend
+ cmii.app: cmii-updater
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+ nodePort: 32333
+---
\ No newline at end of file
diff --git a/agent-common/real_project/pre_pro/cmii-uas-gateway-pre-pro.yaml b/agent-common/real_project/pre_pro/cmii-uas-gateway-pre-pro.yaml
new file mode 100644
index 0000000..0eee18f
--- /dev/null
+++ b/agent-common/real_project/pre_pro/cmii-uas-gateway-pre-pro.yaml
@@ -0,0 +1,159 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-uas-gateway
+ namespace: uavcloud-prepro
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ 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: 2
+ selector:
+ matchLabels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ template:
+ metadata:
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ spec:
+ affinity:
+ podAntiAffinity:
+ preferredDuringSchedulingIgnoredDuringExecution:
+ - weight: 100
+ podAffinityTerm:
+ labelSelector:
+ matchExpressions:
+ - key: cmii.app
+ operator: In
+ values:
+ - cmii-uas-gateway
+ topologyKey: kubernetes.io/hostname
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: uavcloud.env
+ operator: In
+ values:
+ - demo
+ imagePullSecrets:
+ - name: harborsecret
+ containers:
+ - name: cmii-uas-gateway
+ image: harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:2.0.0-pro-agent-2025-04-14-16-08-32
+ imagePullPolicy: Always
+ env:
+ - name: K8S_NAMESPACE
+ value: uavcloud-prepro
+ - name: APPLICATION_NAME
+ value: cmii-uas-gateway
+ - name: CUST_JAVA_OPTS
+ value: "-Xms1024m -Xmx2500m -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: 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: IMAGE_NAME
+ value: harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:2.0.0-pro-agent-2025-04-14-16-08-32
+ - name: NODE_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: spec.nodeName
+ - name: NODE_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.hostIP
+ - name: LIMIT_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: limits.cpu
+ - name: LIMIT_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: limits.memory
+ - name: REQUEST_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: requests.cpu
+ - name: REQUEST_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-gateway
+ resource: requests.memory
+ - name: WATCHDOG_HEARTBEAT_URL
+ value: http://cmii-uav-watchdog:8080/api/heartbeat
+ ports:
+ - name: pod-port
+ containerPort: 8080
+ protocol: TCP
+ resources:
+ limits:
+ memory: 3Gi
+ cpu: "4"
+ requests:
+ memory: 1Gi
+ cpu: "1"
+ volumeMounts:
+ - name: nfs-backend-log-volume
+ mountPath: /cmii/logs
+ readOnly: false
+ subPath: uavcloud-prepro/cmii-uas-gateway
+ volumes:
+ - name: nfs-backend-log-volume
+ persistentVolumeClaim:
+ claimName: nfs-backend-log-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: cmii-uas-gateway
+ namespace: uavcloud-prepro
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-gateway
+ 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-uas-gateway
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+---
\ No newline at end of file
diff --git a/agent-common/real_project/pre_pro/cmii-uas-lifecycle-pre-prod.yaml b/agent-common/real_project/pre_pro/cmii-uas-lifecycle-pre-prod.yaml
new file mode 100644
index 0000000..09af2fe
--- /dev/null
+++ b/agent-common/real_project/pre_pro/cmii-uas-lifecycle-pre-prod.yaml
@@ -0,0 +1,148 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-uas-lifecycle
+ namespace: uavcloud-prepro
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ 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-uas-lifecycle
+ template:
+ metadata:
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ spec:
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: uavcloud.env
+ operator: In
+ values:
+ - demo
+ imagePullSecrets:
+ - name: harborsecret
+ containers:
+ - name: cmii-uas-lifecycle
+ image: harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:2.0.0-pro-agent-2025-04-14-11-03-36
+ imagePullPolicy: Always
+ env:
+ - name: IMAGE_NAME
+ value: harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:2.0.0-pro-agent-2025-04-14-11-03-36
+ - name: K8S_NAMESPACE
+ value: uavcloud-prepro
+ - name: APPLICATION_NAME
+ value: cmii-uas-lifecycle
+ - name: CUST_JAVA_OPTS
+ value: "-Xms1024m -Xmx3500m -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: 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-uas-lifecycle
+ resource: limits.cpu
+ - name: LIMIT_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: limits.memory
+ - name: REQUEST_CPU
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: requests.cpu
+ - name: REQUEST_MEMORY
+ valueFrom:
+ resourceFieldRef:
+ containerName: cmii-uas-lifecycle
+ resource: requests.memory
+ - name: WATCHDOG_HEARTBEAT_URL
+ value: http://cmii-uav-watchdog:8080/api/heartbeat
+ ports:
+ - name: pod-port
+ containerPort: 8080
+ protocol: TCP
+ resources:
+ limits:
+ memory: 4Gi
+ cpu: "4"
+ requests:
+ memory: 1Gi
+ cpu: "1"
+ volumeMounts:
+ - name: nfs-backend-log-volume
+ mountPath: /cmii/logs
+ readOnly: false
+ subPath: uavcloud-prepro/cmii-uas-lifecycle
+ volumes:
+ - name: nfs-backend-log-volume
+ persistentVolumeClaim:
+ claimName: nfs-backend-log-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: cmii-uas-lifecycle
+ namespace: uavcloud-prepro
+ labels:
+ cmii.type: backend
+ cmii.app: cmii-uas-lifecycle
+ 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-uas-lifecycle
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+---
\ No newline at end of file
diff --git a/agent-common/real_project/pre_pro/cmii-uav-watchdog-preprod.yaml b/agent-common/real_project/pre_pro/cmii-uav-watchdog-preprod.yaml
new file mode 100644
index 0000000..999b41e
--- /dev/null
+++ b/agent-common/real_project/pre_pro/cmii-uav-watchdog-preprod.yaml
@@ -0,0 +1,178 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: cmii-uav-watchdog
+ namespace: uavcloud-prepro
+ 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:
+ - demo
+ imagePullSecrets:
+ - name: harborsecret
+ containers:
+ - name: cmii-uav-watchdog
+ image: harbor.cdcyy.com.cn/cmii/cmii-uav-watchdog:2025-04-10-15-24-03
+ imagePullPolicy: Always
+ env:
+ - name: K8S_NAMESPACE
+ value: uavcloud-prepro
+ - 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-prepro/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-prepro
+ 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: NodePort
+ selector:
+ cmii.type: backend
+ cmii.app: cmii-uav-watchdog
+ ports:
+ - name: backend-tcp
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+ nodePort: 34567
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: cmii-uav-watchdog-configmap
+ namespace: uavcloud-prepro
+data:
+ config.yaml: |-
+ server:
+ port: "8080" # 服务器端口
+
+ tier_one_auth:
+ tier_one_secret: "FNSVSHOJTMTWWS56QXXNTDEYLNWQTQLFWDJ3YRDODDEIGDSJRNUPETG6BOO6S4ITWFAEUOST2URXSF6VNADBTVTSK5NZUBDDAM5EFYI" # TOTP密钥
+ time_offset_allowed: 30 # 允许的时间偏移(秒)
+
+ watchdog_center:
+ url: "https://watchdog-center.example.com" # 一级授权中心地址
+
+ project:
+ project_namespace: "uavcloud-prepro" # 项目命名空间
+
+ tier_two_auth:
+ tier_two_secret: "your_tier_two_secret_here" # 二级授权密钥
\ No newline at end of file
diff --git a/agent-deploy/d_app/TemplateCmiiBackend.go b/agent-deploy/d_app/TemplateCmiiBackend.go
index 6760c77..2cb2885 100644
--- a/agent-deploy/d_app/TemplateCmiiBackend.go
+++ b/agent-deploy/d_app/TemplateCmiiBackend.go
@@ -69,12 +69,16 @@ spec:
value: {{ .TagVersion }}
- name: SYS_CONFIG_GROUP
value: {{ .TagVersion }}
- - name: IMAGE_VERSION
- value: {{ .TagVersion }}
- name: NACOS_USERNAME
value: "developer"
- name: NACOS_PASSWORD
value: "Deve@9128201"
+ - name: IMAGE_NAME
+ {{- if .HarborPort }}
+ value: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/{{ .AppName }}:{{ .ImageTag }}
+ {{- else }}
+ value: {{ .HarborIPOrCustomImagePrefix }}{{ .AppName }}:{{ .ImageTag }}
+ {{- end }}
- name: POD_NAME
valueFrom:
fieldRef:
diff --git a/agent-wdd/cmd/Base.go b/agent-wdd/cmd/Base.go
index 162a35d..350d305 100644
--- a/agent-wdd/cmd/Base.go
+++ b/agent-wdd/cmd/Base.go
@@ -17,7 +17,7 @@ import (
var (
ubuntuCommonTools = []string{
- "iputils-ping", "net-tools", "dnsutils", "lsof", "curl", "wget", "mtr-tiny", "vim", "htop", "lrzsz",
+ "apt-utils", "iputils-ping", "net-tools", "dnsutils", "lsof", "curl", "wget", "mtr-tiny", "vim", "htop", "lrzsz",
}
centosCommonTools = []string{
"deltarpm", "net-tools", "iputils", "bind-utils", "lsof", "curl", "wget", "vim", "mtr", "htop",