zeaslity/WddSuperAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

大量的更新工作

Browse Source
This commit is contained in:
zeaslity
2026-03-16 11:20:29 +08:00
parent 01d78dd7f6
commit 041d29e568
84 changed files with 21111 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agent-deploy/a_dashboard/TemplateK8SDashboard.go
View File

@@ -217,9 +217,9 @@ spec:
containers:
- name: dashboard-metrics-scraper
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.8
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/metrics-scraper:v1.0.9
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}metrics-scraper:v1.0.8
image: {{ .HarborIPOrCustomImagePrefix }}metrics-scraper:v1.0.9
{{- end }}
ports:
- containerPort: 8000

18
agent-deploy/c_middle/CmiiEmqxTemplate.go
View File

@@ -12,7 +12,7 @@ metadata:
cmii.type: middleware
cmii.app: helm-emqxs
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
type: Opaque
stringData:
# Dashboard管理员密码
@@ -370,7 +370,7 @@ metadata:
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
replicas: 1
serviceName: helm-emqxs-headless
@@ -391,7 +391,7 @@ spec:
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
affinity:
nodeAffinity:
@@ -432,9 +432,9 @@ spec:
- name: prepare-bootstrap
# 动态选择 tools 镜像
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/tools:1.0
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/os-shell:12-debian-12-r51
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}cmii/tools:1.0
image: {{ .HarborIPOrCustomImagePrefix }}cmii/os-shell:12-debian-12-r51
{{- end }}
imagePullPolicy: IfNotPresent
# =========================================================
@@ -548,9 +548,9 @@ spec:
- name: init-dashboard
# 动态选择 tools 镜像
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/tools:1.0
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/os-shell:12-debian-12-r51
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}cmii/tools:1.0
image: {{ .HarborIPOrCustomImagePrefix }}cmii/os-shell:12-debian-12-r51
{{- end }}
imagePullPolicy: IfNotPresent
@@ -618,7 +618,7 @@ metadata:
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
type: ClusterIP
clusterIP: None
@@ -657,7 +657,7 @@ metadata:
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
type: NodePort
selector:

6
agent-deploy/c_middle/CmiiMongoTemplate.go
View File

@@ -11,7 +11,7 @@ metadata:
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
type: NodePort
selector:
@@ -33,7 +33,7 @@ metadata:
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
serviceName: helm-mongo
replicas: 1
@@ -48,7 +48,7 @@ spec:
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
annotations:
pod.alpha.kubernetes.io/initialized: "true"
spec:

4
agent-deploy/c_middle/CmiiMySQLTemplate.go
View File

@@ -311,9 +311,9 @@ spec:
initContainers:
- name: change-volume-permissions
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/bitnami-shell:11-debian-11-r136
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/os-shell:12-debian-12-r51
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}bitnami-shell:11-debian-11-r136
image: {{ .HarborIPOrCustomImagePrefix }}os-shell:12-debian-12-r51
{{- end }}
imagePullPolicy: "Always"
command:

8
agent-deploy/c_middle/CmiiNacosTemplate.go
View File

@@ -11,7 +11,7 @@ metadata:
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
data:
mysql.db.name: "cmii_nacos_config"
mysql.db.host: "helm-mysql"
@@ -29,7 +29,7 @@ metadata:
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
type: NodePort
selector:
@@ -57,7 +57,7 @@ metadata:
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
serviceName: helm-nacos
replicas: 1
@@ -72,7 +72,7 @@ spec:
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
annotations:
pod.alpha.kubernetes.io/initialized: "true"
spec:

8
agent-deploy/c_middle/CmiiRabbitMQTemplate.go
View File

@@ -194,9 +194,9 @@ spec:
initContainers:
- name: volume-permissions
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/bitnami-shell:11-debian-11-r136
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/os-shell:12-debian-12-r51
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}bitnami-shell:11-debian-11-r136
image: {{ .HarborIPOrCustomImagePrefix }}os-shell:12-debian-12-r51
{{- end }}
imagePullPolicy: "Always"
command:
@@ -217,9 +217,9 @@ spec:
containers:
- name: rabbitmq
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/rabbitmq:3.9.12-debian-10-r3
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/rabbitmq:3.13.7-debian-12-r5
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}rabbitmq:3.9.12-debian-10-r3
image: {{ .HarborIPOrCustomImagePrefix }}rabbitmq:3.13.7-debian-12-r5
{{- end }}
imagePullPolicy: "Always"
env:

6
agent-deploy/c_middle/CmiiRedisTemplate.go
View File

@@ -462,7 +462,7 @@ metadata:
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: replica
spec:
replicas: 1
replicas: 0
selector:
matchLabels:
app.kubernetes.io/name: redis-db
@@ -495,9 +495,9 @@ spec:
containers:
- name: redis
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/redis:6.2.14-debian-11-r1
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/redis:6.2.14-debian-11-r19
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}redis:6.2.14-debian-11-r1
image: {{ .HarborIPOrCustomImagePrefix }}redis:6.2.14-debian-11-r19
{{- end }}
imagePullPolicy: "Always"
securityContext:

8
agent-deploy/c_middle/TemplateCmiiPVC.go
View File

@@ -10,7 +10,7 @@ metadata:
cmii.type: middleware-base
cmii.app: nfs-backend-log-pvc
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -29,7 +29,7 @@ metadata:
cmii.type: middleware-base
cmii.app: helm-emqxs
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -48,7 +48,7 @@ metadata:
cmii.type: middleware-base
cmii.app: helm-mongo
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -67,7 +67,7 @@ metadata:
cmii.type: middleware-base
cmii.app: helm-rabbitmq
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
storageClassName: nfs-prod-distribute
accessModes:

30
agent-deploy/d_app/CmiiImageConfig.go
View File

@@ -156,26 +156,38 @@ var CmiiGISAppMap = map[string]string{
"cmii-uav-grid-manage": "5.4.0",
}
var MiddlewareARM64 = []string{
"bitnamilegacy/redis:6.2.14-debian-11-r19",
"bitnamilegacy/mysql:8.1.0-debian-11-r42",
"bitnamilegacy/os-shell:12-debian-12-r51",
"bitnamilegacy/rabbitmq:3.13.7-debian-12-r5",
"ossrs/srs:v5.0.195",
"emqx/emqx:5.8.8",
"bitnamilegacy/influxdb:2.7.11-debian-12-r19",
"minio/minio:RELEASE.2023-06-02T23-17-26Z",
"kubernetesui/dashboard:v2.7.0",
"kubernetesui/metrics-scraper:v1.0.9",
"dyrnq/nfs-subdir-external-provisioner:v4.0.2",
}
var MiddlewareAmd64 = []string{
"harbor.cdcyy.com.cn/cmii/redis:6.2.14-debian-11-r1",
"harbor.cdcyy.com.cn/cmii/mysql:8.0.35-debian-11-r1",
"harbor.cdcyy.com.cn/cmii/mysql:8.1.0-debian-11-r42",
"harbor.cdcyy.com.cn/cmii/chronyd:0.4.3",
"harbor.cdcyy.com.cn/cmii/bitnami-shell:10-debian-10-r140",
"harbor.cdcyy.com.cn/cmii/bitnami-shell:11-debian-11-r136",
"harbor.cdcyy.com.cn/cmii/rabbitmq:3.9.12-debian-10-r3",
"harbor.cdcyy.com.cn/cmii/rabbitmq:3.11.26-debian-11-r2",
"bitnamilegacy/os-shell:12-debian-12-r51",
"harbor.cdcyy.com.cn/cmii/os-shell:12-debian-12-r51",
"bitnamilegacy/rabbitmq:3.13.7-debian-12-r5",
"harbor.cdcyy.com.cn/cmii/rabbitmq:3.13.7-debian-12-r5",
"docker.m.daocloud.io/ossrs/srs:v4.0.136",
"harbor.cdcyy.com.cn/cmii/srs:v5.0.195",
"docker.m.daocloud.io/ossrs/srs:v4.0-r3",
"docker.m.daocloud.io/emqx/emqx:4.4.19",
"harbor.cdcyy.com.cn/cmii/emqx:5.5.8",
"docker.m.daocloud.io/ossrs/srs:v.0-r3",
"harbor.cdcyy.com.cn/cmii/emqx:5.8.8",
"docker.m.daocloud.io/nacos/nacos-server:v2.1.2",
"docker.m.daocloud.io/nacos/nacos-server:v2.1.2-slim",
"docker.m.daocloud.io/library/mongo:5.0",
"docker.m.daocloud.io/library/rabbitmq:3.9-management",
"docker.m.daocloud.io/bitnami/minio:2022.5.4",
"harbor.cdcyy.com.cn/cmii/minio:2023.5.4",
"harbor.cdcyy.com.cn/cmii/influxdb:2.7.11-debian-12-r19",
"docker.m.daocloud.io/minio/minio:RELEASE.2023-06-02T23-17-26Z",
"docker.m.daocloud.io/kubernetesui/dashboard:v2.0.1",
"docker.m.daocloud.io/kubernetesui/dashboard:v2.7.0",

2
agent-deploy/d_app/FrontendConfigMap.go
View File

@@ -49,6 +49,7 @@ var FrontendShortNameMaps = map[string]string{
"cmii-uav-platform-awareness": "awareness",
"cmii-uav-platform-flight-control": "flight-control",
"cmii-uav-platform-iot-manager": "iot",
"cmii-uav-platform-lite": "lite",
}
var FrontendClientIdMaps = map[string]string{
@@ -100,4 +101,5 @@ var FrontendClientIdMaps = map[string]string{
"cmii-uav-platform-iot-manager": "empty",
"cmii-uav-platform-uasmskny": "empty",
"cmii-uav-platform-uaskny": "empty",
"cmii-uav-platform-lite": "empty",
}

6
agent-deploy/d_app/TemplateCmiiBackend.go
View File

@@ -11,7 +11,7 @@ metadata:
cmii.app: {{ .AppName }}
octopus/control: backend-app-1.0.0
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/app-version: {{ .TagVersion }}
app.kubernetes.io/app-version: "{{ .TagVersion }}"
spec:
replicas: {{ .Replicas }}
strategy:
@@ -189,7 +189,7 @@ metadata:
cmii.app: {{ .AppName }}
octopus/control: backend-app-1.0.0
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/app-version: {{ .TagVersion }}
app.kubernetes.io/app-version: "{{ .TagVersion }}"
spec:
{{- if .NodePort }}
type: NodePort
@@ -220,7 +220,7 @@ metadata:
cmii.app: {{ .AppName }}
octopus/control: backend-app-1.0.0
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/app-version: {{ .TagVersion }}
app.kubernetes.io/app-version: "{{ .TagVersion }}"
spec:
storageClassName: nfs-prod-distribute
accessModes:

4
agent-deploy/d_app/TemplateCmiiFrontend.go
View File

@@ -10,7 +10,7 @@ metadata:
cmii.type: frontend
cmii.app: {{ .AppName }}
octopus.control: frontend-app-wdd
app.kubernetes.io/app-version: {{ .TagVersion }}
app.kubernetes.io/app-version: "{{ .TagVersion }}"
spec:
replicas: {{ .Replicas }}
strategy:
@@ -84,7 +84,7 @@ metadata:
cmii.type: frontend
cmii.app: {{ .AppName }}
octopus.control: frontend-app-wdd
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
spec:
type: ClusterIP
selector:

6
agent-deploy/d_app/TemplateIngressConfigMap.go
View File

@@ -61,7 +61,7 @@ metadata:
type: frontend
octopus.control: all-ingress-config-wdd
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -115,7 +115,7 @@ metadata:
type: backend
octopus.control: all-ingress-config-wdd
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -158,7 +158,7 @@ metadata:
type: api-gateway
octopus.control: all-ingress-config-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: {{ .TagVersion }}
app.kubernetes.io/version: "{{ .TagVersion }}"
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"