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

[agent][deploy] - a

Browse Source
This commit is contained in:
zeaslity
2024-09-23 16:32:48 +08:00
parent 0d1ed24814
commit 5abae32231
44 changed files with 25982 additions and 12976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.run/ServerApplication.run.xml Normal file
View File

@@ -0,0 +1,12 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ServerApplication" type="SpringBootApplicationConfigurationType"
factoryName="Spring Boot">
<module name="server"/>
<projectPathOnTarget name="projectPathOnTarget" value="/data/wdd/ProjectOctopus"/>
<target name="@@@LOCAL@@@"/>
<option name="SPRING_BOOT_MAIN_CLASS" value="io.wdd.ServerApplication"/>
<method v="2">
<option name="Make" enabled="true"/>
</method>
</configuration>
</component>

68
agent-common/image/ImageNameConvert.go
View File

@@ -77,8 +77,6 @@ func ImageFullNameToImageNameAndTag(imageFullName string) (imageName, imageTag s
// ImageFullNameToGzipFileName 必须输出长度为4的内容 =出现得次数为3
func ImageFullNameToGzipFileName(imageFullName string) (gzipFileName string) {
// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0 ==> cmlc=cmii=cmii-uav-platform=5.4.0.tar.gz
// rancher/fleet:v0.3.4
// ossr/srs:v5.0.1 ==> docker=cmii=srs=v5.0.1.tar.gz
@@ -86,58 +84,36 @@ func ImageFullNameToGzipFileName(imageFullName string) (gzipFileName string) {
// bitnami/minio:2022.5.4
// simonrupf/chronyd:0.4.3
// 10.1.1.1:8033/cmii/ok:1.2 不支持 不允许存在
split := strings.Split(imageFullName, ":")
//log.DebugF(" %s to %s", imageRepoTag, split)
if len(split) == 1 {
s := strings.Split(imageFullName, ":")
if len(s) == 1 {
// nginx
return "docker=library=" + imageFullName + "=latest.tar.gz"
return "docker=cmii=" + imageFullName + "=latest.tar.gz"
} else if len(s) > 2 {
// 10.1.1.1:8033/cmii/ok:1.2 不支持 不允许存在
return "unsupport=" + imageFullName
}
middle := s[len(s)-2]
split := strings.Split(middle, "/")
if len(split) == 1 {
// nginx:latest
return "docker=cmii=" + s[0] + "=" + s[1] + ".tar.gz"
}
first := strings.Split(split[0], "/")
//log.DebugF(" split[0] %s to %s", split[0], first)
if len(first) == 3 {
if strings.HasPrefix(imageFullName, "harbor.cdcyy.com.cn") {
// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0 ==> cmlc=cmii=cmii-uav-platform=5.4.0.tar.gz
// harbor.cdcyy.cn/cmii/cmii-uav-platform:5.4.0
// docker.io/ossr/srs:v5.0.1
// docker.107421.xyz/rancher/calico-cni:v3.17.2
if strings.HasPrefix(split[0], CmiiHarborPrefix) {
gzipFileName += "cmlc=cmii="
} else if strings.Contains(split[0], "rancher") {
gzipFileName += "docker=rancher="
} else {
gzipFileName += "docker=cmii="
}
gzipFileName += first[2]
gzipFileName += "="
} else if len(first) == 4 {
// harbor.cdcyy.cn/cmii/ossr/srs:v5.0.1
// harbor.cdcyy.com.cn/cmii/cmlc-ai/cmlc-ai-operator:v5.2.0-t4-no-dino
if !strings.HasPrefix(split[0], CmiiHarborPrefix) {
return imageFullName
}
gzipFileName += "cmlc=cmii="
gzipFileName += first[3]
gzipFileName += "="
} else if len(first) == 2 {
// bitnami/redis
// ossrs/srs
gzipFileName += "docker="
gzipFileName += first[0]
gzipFileName += "="
gzipFileName += first[1]
gzipFileName += "="
} else if len(first) == 1 {
// nginx:latest
return "docker=library=" + split[0] + "=" + split[1] + ".tar.gz"
return "cmlc=cmii=" + split[len(split)-1] + "=" + s[1] + ".tar.gz"
} else if strings.Contains(imageFullName, "rancher") {
return "docker=rancher=" + split[len(split)-1] + "=" + s[1] + ".tar.gz"
} else {
// ossrs/srs:v4.0.136
return "docker=cmii=" + split[len(split)-1] + "=" + s[1] + ".tar.gz"
}
gzipFileName += split[1]
gzipFileName += ".tar.gz"
return gzipFileName
return "unsupport=" + imageFullName
}
// ImageNameToTargetImageFullName 将ImageName转换为目标TargetHosts的全名称，ImageName的格式为 短名称或者长名称 均可

22
agent-common/image/ImageNameConvert_test.go
View File

@@ -12,17 +12,17 @@ import (
)
var imageFullNameList = []string{
//"bitnami/redis:6.2.6-debian-10-r0",
//"simonrupf/chronyd:0.4.3",
//"harbor.cdcyy.com.cn/cmii/cmii-rtsp-operator:v4.1.0",
//"harbor.cdcyy.com.cn/cmii/ossrs/srs:v4.0.136",
//"ossrs/srs:v4.0.136",
//"mongo:5.0",
//"bitnami/minio:2023.5.4",
//"busybox:latest",
//"busybox",
//"rancher/rancher:v2.7.0",
//"10.1.1.1:8033/cmii/ok:1.2",
"bitnami/redis:6.2.6-debian-10-r0",
"simonrupf/chronyd:0.4.3",
"harbor.cdcyy.com.cn/cmii/cmii-rtsp-operator:v4.1.0",
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v4.0.136",
"ossrs/srs:v4.0.136",
"mongo:5.0",
"bitnami/minio:2023.5.4",
"busybox:latest",
"busybox",
"rancher/rancher:v2.7.0",
"10.1.1.1:8033/cmii/ok:1.2",
"docker.107421.xyz/rancher/shell:v0.1.6",
}

78
agent-common/real_project/CmiiImageListConfig.go
View File

@@ -77,3 +77,81 @@ var Cmii570ImageList = []string{
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195",
"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
}
var Cmii580ImageList = []string{
"harbor.cdcyy.com.cn/cmii/cmii-uav-threedsimulation:5.7.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-depotautoreturn:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-process:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-sense-adapter:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-open-gateway:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-tower:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-user:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-user:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-gateway:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-oauth:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-iam-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-airspace:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-surveillance:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-datasource:5.2.0-24810",
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.7.0-31369-yunnan-082702",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mqtthandler:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gateway:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-autowaypoint:4.2.0-beta",
"harbor.cdcyy.com.cn/cmii/cmii-uav-brain:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-gis-server:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-manage:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-kpi-monitor:5.5.0",
"harbor.cdcyy.com.cn/cmii/cmii-admin-data:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-device:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-grid-engine:5.1.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-mission:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cms:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-app-release:4.2.0-validation",
"harbor.cdcyy.com.cn/cmii/cmii-uas-lifecycle:5.7.0-30403",
"harbor.cdcyy.com.cn/cmii/cmii-uav-data-post-process:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-material-warehouse:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-multilink:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-cloud-live:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-clusters:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-waypoint:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-notice:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-supervision:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-alarm:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-developer:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uas-gateway:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-emergency:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-logger:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervisionh5:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-share:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-seniclive:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-multiterminal:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-emergency-rescue:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-dispatchh5:5.6.0-0708",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-oms:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uas:5.7.0-29322",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-cms-portal:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-open:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-securityh5:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-visualization:5.2.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-media:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-security:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-ai-brain:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qingdao:5.7.0-29766-0815",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-hljtt:5.7.0-hjltt",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-uasms:5.7.0-29322",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-logistics:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-detection:5.6.0",
"harbor.cdcyy.com.cn/cmii/cmii-suav-platform-supervision:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-base:5.4.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-mws:5.8.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-splice:5.7.0",
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform-armypeople:5.8.0",
"harbor.cdcyy.com.cn/cmii/ossrs/srs:v5.0.195",
"harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA",
"harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0",
}

10
agent-common/real_project/cmii-iot-dispatcher.yaml
View File

@@ -2,7 +2,7 @@ kind: Deployment
apiVersion: apps/v1
metadata:
name: cmii-uav-iot-dispatcher
namespace: jsntejpt
namespace: ynejpt
labels:
app.kubernetes.io/app-version: 5.7.0
app.kubernetes.io/managed-by: octopus-control
@@ -28,7 +28,7 @@ spec:
claimName: nfs-backend-log-pvc
containers:
- name: cmii-uav-iot-dispatcher
image: '10.40.51.5:8033/cmii/cmii-uav-iot-dispatcher:5.7.0'
image: '192.168.118.14:8033/cmii/cmii-uav-iot-dispatcher:5.7.0'
ports:
- name: pod-port
containerPort: 8080
@@ -53,7 +53,7 @@ spec:
- name: SVC_NAME
value: cmlc-uav-iot-dispatcher-svc
- name: K8S_NAMESPACE
value: xmyd
value: ynejpt
- name: APPLICATION_NAME
value: cmii-uav-iot-dispatcher
- name: CUST_JAVA_OPTS
@@ -79,7 +79,7 @@ spec:
memory: 3Gi
requests:
cpu: 200m
memory: 500Gi
memory: 500Mi
volumeMounts:
- name: nfs-backend-log-volume
mountPath: /cmii/logs
@@ -107,7 +107,7 @@ kind: Service
apiVersion: v1
metadata:
name: cmii-uav-iot-dispatcher
namespace: jsntejpt
namespace: ynejpt
labels:
app.kubernetes.io/app-version: 5.7.0
app.kubernetes.io/managed-by: octopus-control

11535
agent-common/real_project/uavcloud-dev/k8s-backend.yaml
View File

File diff suppressed because it is too large Load Diff

486
agent-common/real_project/uavcloud-dev/k8s-configmap.yaml
View File

@@ -2,56 +2,112 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-open
name: tenant-prefix-mws
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "open",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervisionh5
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-seniclive
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-visualization
name: tenant-prefix-dispatchh5
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "visualization",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "dispatchh5",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-security
name: tenant-prefix-ai-brain
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-hljtt
name: tenant-prefix-emergency
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "hljtt",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "emergency",
AppClientId: "APP_aGsTAY1uMZrpKdfk"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-share
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-uas
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "uas",
AppClientId: "empty"
}
---
@@ -63,8 +119,8 @@ metadata:
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "armypeople",
AppClientId: "APP_UIegse6Lfou9pO1U"
}
@@ -72,29 +128,15 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-oms
name: tenant-prefix-security
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "oms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-share
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
}
---
kind: ConfigMap
@@ -105,8 +147,8 @@ metadata:
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "splice",
AppClientId: "APP_zE0M3sTRXrCIJS8Y"
}
@@ -114,182 +156,42 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-traffic
name: tenant-prefix-qingdao
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervision
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "supervision",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervisionh5
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-ai-brain
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-cmsportal
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "cmsportal",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "qingdao",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-emergency
name: tenant-prefix-visualization
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "emergency",
AppClientId: "APP_aGsTAY1uMZrpKdfk"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-media
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-multiterminal
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-pangu
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "visualization",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-seniclive
name: tenant-prefix-oms
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qinghaitourism
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "qinghaitourism",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-mws
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-jiangsuwenlv
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "jiangsuwenlv",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "oms",
AppClientId: "empty"
}
---
@@ -301,8 +203,8 @@ metadata:
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "base",
AppClientId: "APP_9LY41OaKSqk2btY0"
}
@@ -315,8 +217,8 @@ metadata:
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "logistics",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
@@ -324,27 +226,125 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qingdao
name: tenant-prefix-uasms
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "qingdao",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "uasms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-pilot2cloud
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "pilot2cloud",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-pangu
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-traffic
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-threedsimulation
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "threedsimulation",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-jiangsuwenlv
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "jiangsuwenlv",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-hljtt
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "hljtt",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-multiterminal
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-detection
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "detection",
AppClientId: "APP_FDHW2VLVDWPnnOCy"
}
@@ -357,8 +357,8 @@ metadata:
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "securityh5",
AppClientId: "APP_N3ImO0Ubfu9peRHD"
}
@@ -366,13 +366,83 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-threedsimulation
name: tenant-prefix-cmsportal
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "dev",
CloudHOST: "lab.uavcmlc.com",
ApplicationShortName: "threedsimulation",
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "cmsportal",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-media
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-open
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "open",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qinghaitourism
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "qinghaitourism",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-hyper
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "hyper",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervision
namespace: uavcloud-dev
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "uavcloud-dev",
CloudHOST: "integration.uavcmlc.com",
ApplicationShortName: "supervision",
AppClientId: "APP_qqSu82THfexI8PLM"
}

3940
agent-common/real_project/uavcloud-dev/k8s-frontend.yaml
View File

File diff suppressed because it is too large Load Diff

206
agent-common/real_project/uavcloud-dev/k8s-ingress.yaml
View File

@@ -8,7 +8,7 @@ metadata:
type: frontend
octopus.control: all-ingress-config-wdd
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 6.0.0
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -22,8 +22,10 @@ metadata:
rewrite ^(/base)$ $1/ redirect;
rewrite ^(/cmsportal)$ $1/ redirect;
rewrite ^(/detection)$ $1/ redirect;
rewrite ^(/dispatchh5)$ $1/ redirect;
rewrite ^(/emergency)$ $1/ redirect;
rewrite ^(/hljtt)$ $1/ redirect;
rewrite ^(/hyper)$ $1/ redirect;
rewrite ^(/jiangsuwenlv)$ $1/ redirect;
rewrite ^(/logistics)$ $1/ redirect;
rewrite ^(/media)$ $1/ redirect;
@@ -31,6 +33,7 @@ metadata:
rewrite ^(/mws)$ $1/ redirect;
rewrite ^(/oms)$ $1/ redirect;
rewrite ^(/open)$ $1/ redirect;
rewrite ^(/pilot2cloud)$ $1/ redirect;
rewrite ^(/qingdao)$ $1/ redirect;
rewrite ^(/qinghaitourism)$ $1/ redirect;
rewrite ^(/security)$ $1/ redirect;
@@ -40,148 +43,175 @@ metadata:
rewrite ^(/splice)$ $1/ redirect;
rewrite ^(/threedsimulation)$ $1/ redirect;
rewrite ^(/traffic)$ $1/ redirect;
rewrite ^(/uas)$ $1/ redirect;
rewrite ^(/uasms)$ $1/ redirect;
rewrite ^(/visualization)$ $1/ redirect;
spec:
rules:
- host: fake-domain.uavcloud-dev.io
http:
paths:
- path: /dev/?(.*)
- path: /uavcloud-dev/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform
servicePort: 9528
- path: /dev/supervision/?(.*)
- path: /uavcloud-dev/supervision/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-suav-platform-supervision
servicePort: 9528
- path: /dev/supervisionh5/?(.*)
- path: /uavcloud-dev/supervisionh5/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-suav-platform-supervisionh5
servicePort: 9528
- path: /dev/pangu/?(.*)
- path: /uavcloud-dev/pangu/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform
servicePort: 9528
- path: /dev/ai-brain/?(.*)
- path: /uavcloud-dev/ai-brain/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-ai-brain
servicePort: 9528
- path: /dev/armypeople/?(.*)
- path: /uavcloud-dev/armypeople/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-armypeople
servicePort: 9528
- path: /dev/base/?(.*)
- path: /uavcloud-dev/base/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-base
servicePort: 9528
- path: /dev/cmsportal/?(.*)
- path: /uavcloud-dev/cmsportal/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-cms-portal
servicePort: 9528
- path: /dev/detection/?(.*)
- path: /uavcloud-dev/detection/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-detection
servicePort: 9528
- path: /dev/emergency/?(.*)
- path: /uavcloud-dev/dispatchh5/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-dispatchh5
servicePort: 9528
- path: /uavcloud-dev/emergency/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-emergency-rescue
servicePort: 9528
- path: /dev/hljtt/?(.*)
- path: /uavcloud-dev/hljtt/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-hljtt
servicePort: 9528
- path: /dev/jiangsuwenlv/?(.*)
- path: /uavcloud-dev/hyper/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-hyperspectral
servicePort: 9528
- path: /uavcloud-dev/jiangsuwenlv/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-jiangsuwenlv
servicePort: 9528
- path: /dev/logistics/?(.*)
- path: /uavcloud-dev/logistics/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-logistics
servicePort: 9528
- path: /dev/media/?(.*)
- path: /uavcloud-dev/media/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-media
servicePort: 9528
- path: /dev/multiterminal/?(.*)
- path: /uavcloud-dev/multiterminal/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-multiterminal
servicePort: 9528
- path: /dev/mws/?(.*)
- path: /uavcloud-dev/mws/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-mws
servicePort: 9528
- path: /dev/oms/?(.*)
- path: /uavcloud-dev/oms/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-oms
servicePort: 9528
- path: /dev/open/?(.*)
- path: /uavcloud-dev/open/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-open
servicePort: 9528
- path: /dev/qingdao/?(.*)
- path: /uavcloud-dev/pilot2cloud/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-pilot2-to-cloud
servicePort: 9528
- path: /uavcloud-dev/qingdao/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-qingdao
servicePort: 9528
- path: /dev/qinghaitourism/?(.*)
- path: /uavcloud-dev/qinghaitourism/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-qinghaitourism
servicePort: 9528
- path: /dev/security/?(.*)
- path: /uavcloud-dev/security/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-security
servicePort: 9528
- path: /dev/securityh5/?(.*)
- path: /uavcloud-dev/securityh5/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-securityh5
servicePort: 9528
- path: /dev/seniclive/?(.*)
- path: /uavcloud-dev/seniclive/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-seniclive
servicePort: 9528
- path: /dev/share/?(.*)
- path: /uavcloud-dev/share/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-share
servicePort: 9528
- path: /dev/splice/?(.*)
- path: /uavcloud-dev/splice/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-splice
servicePort: 9528
- path: /dev/threedsimulation/?(.*)
- path: /uavcloud-dev/threedsimulation/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-threedsimulation
servicePort: 9528
- path: /dev/traffic/?(.*)
- path: /uavcloud-dev/traffic/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-traffic
servicePort: 9528
- path: /dev/visualization/?(.*)
- path: /uavcloud-dev/uas/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-uas
servicePort: 9528
- path: /uavcloud-dev/uasms/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-uasms
servicePort: 9528
- path: /uavcloud-dev/visualization/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-platform-visualization
@@ -196,13 +226,13 @@ metadata:
type: backend
octopus.control: all-ingress-config-wdd
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 6.0.0
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
spec:
rules:
- host: cmii-admin-data.uavcloud-dev.io
- host: cmii-admin-data.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -210,7 +240,7 @@ spec:
backend:
serviceName: cmii-admin-data
servicePort: 8080
- host: cmii-admin-gateway.uavcloud-dev.io
- host: cmii-admin-gateway.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -218,7 +248,7 @@ spec:
backend:
serviceName: cmii-admin-gateway
servicePort: 8080
- host: cmii-admin-user.uavcloud-dev.io
- host: cmii-admin-user.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -226,7 +256,7 @@ spec:
backend:
serviceName: cmii-admin-user
servicePort: 8080
- host: cmii-app-release.uavcloud-dev.io
- host: cmii-app-release.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -234,7 +264,7 @@ spec:
backend:
serviceName: cmii-app-release
servicePort: 8080
- host: cmii-open-gateway.uavcloud-dev.io
- host: cmii-open-gateway.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -242,7 +272,7 @@ spec:
backend:
serviceName: cmii-open-gateway
servicePort: 8080
- host: cmii-suav-supervision.uavcloud-dev.io
- host: cmii-suav-supervision.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -250,7 +280,7 @@ spec:
backend:
serviceName: cmii-suav-supervision
servicePort: 8080
- host: cmii-uas-gateway.uavcloud-dev.io
- host: cmii-uas-gateway.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -258,7 +288,7 @@ spec:
backend:
serviceName: cmii-uas-gateway
servicePort: 8080
- host: cmii-uas-lifecycle.uavcloud-dev.io
- host: cmii-uas-lifecycle.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -266,7 +296,7 @@ spec:
backend:
serviceName: cmii-uas-lifecycle
servicePort: 8080
- host: cmii-uav-airspace.uavcloud-dev.io
- host: cmii-uav-airspace.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -274,7 +304,7 @@ spec:
backend:
serviceName: cmii-uav-airspace
servicePort: 8080
- host: cmii-uav-alarm.uavcloud-dev.io
- host: cmii-uav-alarm.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -282,7 +312,7 @@ spec:
backend:
serviceName: cmii-uav-alarm
servicePort: 8080
- host: cmii-uav-autowaypoint.uavcloud-dev.io
- host: cmii-uav-autowaypoint.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -290,7 +320,7 @@ spec:
backend:
serviceName: cmii-uav-autowaypoint
servicePort: 8080
- host: cmii-uav-brain.uavcloud-dev.io
- host: cmii-uav-brain.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -298,7 +328,7 @@ spec:
backend:
serviceName: cmii-uav-brain
servicePort: 8080
- host: cmii-uav-bridge.uavcloud-dev.io
- host: cmii-uav-bridge.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -306,7 +336,7 @@ spec:
backend:
serviceName: cmii-uav-bridge
servicePort: 8080
- host: cmii-uav-cloud-live.uavcloud-dev.io
- host: cmii-uav-cloud-live.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -314,7 +344,7 @@ spec:
backend:
serviceName: cmii-uav-cloud-live
servicePort: 8080
- host: cmii-uav-clusters.uavcloud-dev.io
- host: cmii-uav-clusters.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -322,7 +352,7 @@ spec:
backend:
serviceName: cmii-uav-clusters
servicePort: 8080
- host: cmii-uav-cms.uavcloud-dev.io
- host: cmii-uav-cms.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -330,7 +360,7 @@ spec:
backend:
serviceName: cmii-uav-cms
servicePort: 8080
- host: cmii-uav-data-post-process.uavcloud-dev.io
- host: cmii-uav-data-post-process.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -338,7 +368,7 @@ spec:
backend:
serviceName: cmii-uav-data-post-process
servicePort: 8080
- host: cmii-uav-depotautoreturn.uavcloud-dev.io
- host: cmii-uav-depotautoreturn.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -346,7 +376,7 @@ spec:
backend:
serviceName: cmii-uav-depotautoreturn
servicePort: 8080
- host: cmii-uav-developer.uavcloud-dev.io
- host: cmii-uav-developer.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -354,7 +384,7 @@ spec:
backend:
serviceName: cmii-uav-developer
servicePort: 8080
- host: cmii-uav-device.uavcloud-dev.io
- host: cmii-uav-device.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -362,7 +392,7 @@ spec:
backend:
serviceName: cmii-uav-device
servicePort: 8080
- host: cmii-uav-emergency.uavcloud-dev.io
- host: cmii-uav-emergency.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -370,7 +400,7 @@ spec:
backend:
serviceName: cmii-uav-emergency
servicePort: 8080
- host: cmii-uav-gateway.uavcloud-dev.io
- host: cmii-uav-gateway.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -378,7 +408,7 @@ spec:
backend:
serviceName: cmii-uav-gateway
servicePort: 8080
- host: cmii-uav-gis-server.uavcloud-dev.io
- host: cmii-uav-gis-server.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -386,7 +416,7 @@ spec:
backend:
serviceName: cmii-uav-gis-server
servicePort: 8080
- host: cmii-uav-grid-datasource.uavcloud-dev.io
- host: cmii-uav-grid-datasource.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -394,7 +424,7 @@ spec:
backend:
serviceName: cmii-uav-grid-datasource
servicePort: 8080
- host: cmii-uav-grid-engine.uavcloud-dev.io
- host: cmii-uav-grid-engine.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -402,7 +432,7 @@ spec:
backend:
serviceName: cmii-uav-grid-engine
servicePort: 8080
- host: cmii-uav-grid-manage.uavcloud-dev.io
- host: cmii-uav-grid-manage.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -410,7 +440,7 @@ spec:
backend:
serviceName: cmii-uav-grid-manage
servicePort: 8080
- host: cmii-uav-industrial-portfolio.uavcloud-dev.io
- host: cmii-uav-industrial-portfolio.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -418,7 +448,7 @@ spec:
backend:
serviceName: cmii-uav-industrial-portfolio
servicePort: 8080
- host: cmii-uav-integration.uavcloud-dev.io
- host: cmii-uav-integration.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -426,7 +456,15 @@ spec:
backend:
serviceName: cmii-uav-integration
servicePort: 8080
- host: cmii-uav-kpi-monitor.uavcloud-dev.io
- host: cmii-uav-iot-dispatcher.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-iot-dispatcher
servicePort: 8080
- host: cmii-uav-kpi-monitor.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -434,7 +472,7 @@ spec:
backend:
serviceName: cmii-uav-kpi-monitor
servicePort: 8080
- host: cmii-uav-logger.uavcloud-dev.io
- host: cmii-uav-logger.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -442,7 +480,7 @@ spec:
backend:
serviceName: cmii-uav-logger
servicePort: 8080
- host: cmii-uav-material-warehouse.uavcloud-dev.io
- host: cmii-uav-material-warehouse.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -450,7 +488,7 @@ spec:
backend:
serviceName: cmii-uav-material-warehouse
servicePort: 8080
- host: cmii-uav-mission.uavcloud-dev.io
- host: cmii-uav-mission.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -458,7 +496,7 @@ spec:
backend:
serviceName: cmii-uav-mission
servicePort: 8080
- host: cmii-uav-mqtthandler.uavcloud-dev.io
- host: cmii-uav-mqtthandler.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -466,7 +504,7 @@ spec:
backend:
serviceName: cmii-uav-mqtthandler
servicePort: 8080
- host: cmii-uav-multilink.uavcloud-dev.io
- host: cmii-uav-multilink.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -474,7 +512,7 @@ spec:
backend:
serviceName: cmii-uav-multilink
servicePort: 8080
- host: cmii-uav-notice.uavcloud-dev.io
- host: cmii-uav-notice.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -482,7 +520,7 @@ spec:
backend:
serviceName: cmii-uav-notice
servicePort: 8080
- host: cmii-uav-oauth.uavcloud-dev.io
- host: cmii-uav-oauth.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -490,7 +528,7 @@ spec:
backend:
serviceName: cmii-uav-oauth
servicePort: 8080
- host: cmii-uav-process.uavcloud-dev.io
- host: cmii-uav-process.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -498,7 +536,15 @@ spec:
backend:
serviceName: cmii-uav-process
servicePort: 8080
- host: cmii-uav-surveillance.uavcloud-dev.io
- host: cmii-uav-sense-adapter.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-sense-adapter
servicePort: 8080
- host: cmii-uav-surveillance.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -506,7 +552,15 @@ spec:
backend:
serviceName: cmii-uav-surveillance
servicePort: 8080
- host: cmii-uav-threedsimulation.uavcloud-dev.io
- host: cmii-uav-sync.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-sync
servicePort: 8080
- host: cmii-uav-threedsimulation.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -514,7 +568,7 @@ spec:
backend:
serviceName: cmii-uav-threedsimulation
servicePort: 8080
- host: cmii-uav-tower.uavcloud-dev.io
- host: cmii-uav-tower.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -522,7 +576,7 @@ spec:
backend:
serviceName: cmii-uav-tower
servicePort: 8080
- host: cmii-uav-user.uavcloud-dev.io
- host: cmii-uav-user.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -530,7 +584,7 @@ spec:
backend:
serviceName: cmii-uav-user
servicePort: 8080
- host: cmii-uav-waypoint.uavcloud-dev.io
- host: cmii-uav-waypoint.uavcloud-uavcloud-dev.io
http:
paths:
- path: /
@@ -548,7 +602,7 @@ metadata:
type: api-gateway
octopus.control: all-ingress-config-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 6.0.0
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
@@ -561,17 +615,17 @@ spec:
- host: fake-domain.uavcloud-dev.io
http:
paths:
- path: /dev/oms/api/?(.*)
- path: /uavcloud-dev/oms/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-admin-gateway
servicePort: 8080
- path: /dev/open/api/?(.*)
- path: /uavcloud-dev/open/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-open-gateway
servicePort: 8080
- path: /dev/api/?(.*)
- path: /uavcloud-dev/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-gateway

35
agent-common/real_project/uavcloud-dev/k8s-srs.yaml
View File

@@ -83,7 +83,7 @@ data:
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]/[2006][01][02]/[timestamp]-[duration].ts;
hls_cleanup on;
hls_entry_prefix http://192.168.35.178;
hls_entry_prefix http://integration.uavcmlc.com;
}
}
---
@@ -230,7 +230,7 @@ spec:
protocol: UDP
env:
- name: CANDIDATE
value: 192.168.35.178
value: integration.uavcmlc.com
resources:
limits:
cpu: 2000m
@@ -255,13 +255,13 @@ spec:
image: harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA
env:
- name: OSS_ENDPOINT
value: https://minio-ig-dev.uavcmlc.com
value: 'http://minio.ig-dev.uavcmlc.com:9000'
- name: OSS_AK
value: cmii
- name: OSS_SK
value: 'B#923fC7mk'
- name: OSS_BUCKET
value: live-srs-hls
value: live-cluster-hls
- name: SRS_OP
value: 'http://helm-live-op-svc-v2:8080'
- name: MYSQL_ENDPOINT
@@ -410,9 +410,10 @@ spec:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30333
selector:
live-role: op-v2
type: ClusterIP
type: NodePort
sessionAffinity: None
---
kind: Service
@@ -457,7 +458,7 @@ data:
info:
name: cmii-live-operator
description: cmii-live-operator
version: 5.6.0
version: 6.0.0
scanPackage: com.cmii.live.op
cloud:
nacos:
@@ -467,11 +468,11 @@ data:
server-addr: helm-nacos:8848
extension-configs:
- data-id: cmii-live-operator.yml
group: 5.6.0
group: 6.0.0
refresh: true
shared-configs:
- data-id: cmii-backend-system.yml
group: 5.6.0
group: 6.0.0
refresh: true
discovery:
enabled: false
@@ -481,15 +482,15 @@ data:
type: srs
endpoint: 'http://helm-live-srs-svc:1985'
proto:
rtmp: 'rtmp://192.168.35.178:30935'
rtsp: 'rtsp://192.168.35.178:30554'
srt: 'srt://192.168.35.178:30556'
flv: 'http://192.168.35.178:30500'
hls: 'http://192.168.35.178:30500'
rtc: 'webrtc://192.168.35.178:30090'
replay: 'https://192.168.35.178:30333'
rtmp: 'rtmp://integration.uavcmlc.com:30935'
rtsp: 'rtsp://integration.uavcmlc.com:30554'
srt: 'srt://integration.uavcmlc.com:30556'
flv: 'http://integration.uavcmlc.com:30500'
hls: 'http://integration.uavcmlc.com:30500'
rtc: 'webrtc://integration.uavcmlc.com:30090'
replay: 'https://integration.uavcmlc.com:30333'
minio:
endpoint: https://minio-ig-dev.uavcmlc.com
endpoint: http://minio.ig-dev.uavcmlc.com:9000
access-key: cmii
secret-key: B#923fC7mk
bucket: live-srs-hls
bucket: live-cluster-hls

7674
agent-common/real_project/uavcloud-dev/old/k8s-backend.yaml
View File

File diff suppressed because it is too large Load Diff

2666
agent-common/real_project/uavcloud-dev/old/k8s-frontend.yaml
View File

File diff suppressed because it is too large Load Diff

390
agent-common/real_project/uavcloud-dev/old/k8s-ingress.yaml
View File

@@ -186,3 +186,393 @@ spec:
backend:
serviceName: cmii-uav-platform-visualization
servicePort: 9528
---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: backend-applications-ingress
namespace: uavcloud-dev
labels:
type: backend
octopus.control: all-ingress-config-wdd
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
spec:
rules:
- host: cmii-admin-data.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-admin-data
servicePort: 8080
- host: cmii-admin-gateway.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-admin-gateway
servicePort: 8080
- host: cmii-admin-user.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-admin-user
servicePort: 8080
- host: cmii-app-release.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-app-release
servicePort: 8080
- host: cmii-open-gateway.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-open-gateway
servicePort: 8080
- host: cmii-suav-supervision.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-suav-supervision
servicePort: 8080
- host: cmii-uas-gateway.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uas-gateway
servicePort: 8080
- host: cmii-uas-lifecycle.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uas-lifecycle
servicePort: 8080
- host: cmii-uav-airspace.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-airspace
servicePort: 8080
- host: cmii-uav-alarm.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-alarm
servicePort: 8080
- host: cmii-uav-autowaypoint.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-autowaypoint
servicePort: 8080
- host: cmii-uav-brain.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-brain
servicePort: 8080
- host: cmii-uav-bridge.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-bridge
servicePort: 8080
- host: cmii-uav-cloud-live.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-cloud-live
servicePort: 8080
- host: cmii-uav-clusters.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-clusters
servicePort: 8080
- host: cmii-uav-cms.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-cms
servicePort: 8080
- host: cmii-uav-data-post-process.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-data-post-process
servicePort: 8080
- host: cmii-uav-depotautoreturn.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-depotautoreturn
servicePort: 8080
- host: cmii-uav-developer.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-developer
servicePort: 8080
- host: cmii-uav-device.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-device
servicePort: 8080
- host: cmii-uav-emergency.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-emergency
servicePort: 8080
- host: cmii-uav-gateway.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-gateway
servicePort: 8080
- host: cmii-uav-gis-server.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-gis-server
servicePort: 8080
- host: cmii-uav-grid-datasource.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-grid-datasource
servicePort: 8080
- host: cmii-uav-grid-engine.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-grid-engine
servicePort: 8080
- host: cmii-uav-grid-manage.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-grid-manage
servicePort: 8080
- host: cmii-uav-industrial-portfolio.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-industrial-portfolio
servicePort: 8080
- host: cmii-uav-integration.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-integration
servicePort: 8080
- host: cmii-uav-kpi-monitor.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-kpi-monitor
servicePort: 8080
- host: cmii-uav-logger.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-logger
servicePort: 8080
- host: cmii-uav-material-warehouse.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-material-warehouse
servicePort: 8080
- host: cmii-uav-mission.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-mission
servicePort: 8080
- host: cmii-uav-mqtthandler.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-mqtthandler
servicePort: 8080
- host: cmii-uav-multilink.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-multilink
servicePort: 8080
- host: cmii-uav-notice.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-notice
servicePort: 8080
- host: cmii-uav-oauth.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-oauth
servicePort: 8080
- host: cmii-uav-process.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-process
servicePort: 8080
- host: cmii-uav-surveillance.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-surveillance
servicePort: 8080
- host: cmii-uav-threedsimulation.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-threedsimulation
servicePort: 8080
- host: cmii-uav-tower.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-tower
servicePort: 8080
- host: cmii-uav-user.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-user
servicePort: 8080
- host: cmii-uav-waypoint.uavcloud-dev.io
http:
paths:
- path: /
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-waypoint
servicePort: 8080
---
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: all-gateways-ingress
namespace: uavcloud-dev
labels:
type: api-gateway
octopus.control: all-ingress-config-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/rewrite-target: /$1
nginx.ingress.kubernetes.io/configuration-snippet: |
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
spec:
rules:
- host: fake-domain.uavcloud-dev.io
http:
paths:
- path: /dev/oms/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-admin-gateway
servicePort: 8080
- path: /dev/open/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-open-gateway
servicePort: 8080
- path: /dev/api/?(.*)
pathType: ImplementationSpecific
backend:
serviceName: cmii-uav-gateway
servicePort: 8080

495
agent-common/real_project/uavcloud-dev/old/k8s-srs.yaml Normal file
View File

@@ -0,0 +1,495 @@
---
kind: ConfigMap
apiVersion: v1
metadata:
name: helm-live-srs-cm
namespace: uavcloud-dev
labels:
cmii.app: live-srs
cmii.type: live
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
data:
srs.rtc.conf: |-
listen 30935;
max_connections 4096;
srs_log_tank console;
srs_log_level info;
srs_log_file /home/srs.log;
daemon off;
http_api {
enabled on;
listen 1985;
crossdomain on;
}
stats {
network 0;
}
http_server {
enabled on;
listen 8080;
dir /home/hls;
}
srt_server {
enabled on;
listen 30556;
maxbw 1000000000;
connect_timeout 4000;
peerlatency 600;
recvlatency 600;
}
rtc_server {
enabled on;
listen 30090;
candidate $CANDIDATE;
}
vhost __defaultVhost__ {
http_hooks {
enabled on;
on_publish http://helm-live-op-svc-v2:8080/hooks/on_push;
}
http_remux {
enabled on;
}
rtc {
enabled on;
rtmp_to_rtc on;
rtc_to_rtmp on;
keep_bframe off;
}
tcp_nodelay on;
min_latency on;
play {
gop_cache off;
mw_latency 100;
mw_msgs 10;
}
publish {
firstpkt_timeout 8000;
normal_timeout 4000;
mr on;
}
dvr {
enabled off;
dvr_path /home/dvr/[app]/[stream]/[2006][01]/[timestamp].mp4;
dvr_plan session;
}
hls {
enabled on;
hls_path /home/hls;
hls_fragment 10;
hls_window 60;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]/[2006][01][02]/[timestamp]-[duration].ts;
hls_cleanup on;
hls_entry_prefix http://192.168.35.178;
}
}
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srs-svc-exporter
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: rtmp
protocol: TCP
port: 30935
targetPort: 30935
nodePort: 30935
- name: rtc
protocol: UDP
port: 30090
targetPort: 30090
nodePort: 30090
- name: rtc-tcp
protocol: TCP
port: 30090
targetPort: 30090
nodePort: 30090
- name: srt
protocol: UDP
port: 30556
targetPort: 30556
nodePort: 30556
- name: api
protocol: TCP
port: 1985
targetPort: 1985
nodePort: 30557
selector:
srs-role: rtc
type: NodePort
sessionAffinity: None
externalTrafficPolicy: Cluster
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srs-svc
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
- name: api
protocol: TCP
port: 1985
targetPort: 1985
selector:
srs-role: rtc
type: ClusterIP
sessionAffinity: None
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srsrtc-svc
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: rtmp
protocol: TCP
port: 30935
targetPort: 30935
selector:
srs-role: rtc
type: ClusterIP
sessionAffinity: None
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
name: helm-live-srs-rtc
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-srs
cmii.type: live
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
srs-role: rtc
spec:
replicas: 1
selector:
matchLabels:
srs-role: rtc
template:
metadata:
labels:
srs-role: rtc
spec:
volumes:
- name: srs-conf-file
configMap:
name: helm-live-srs-cm
items:
- key: srs.rtc.conf
path: docker.conf
defaultMode: 420
- name: srs-vol
emptyDir:
sizeLimit: 8Gi
containers:
- name: srs-rtc
image: harbor.cdcyy.com.cn/cmii/srs:v5.0.195
ports:
- name: srs-rtmp
containerPort: 30935
protocol: TCP
- name: srs-api
containerPort: 1985
protocol: TCP
- name: srs-flv
containerPort: 8080
protocol: TCP
- name: srs-webrtc
containerPort: 30090
protocol: UDP
- name: srs-webrtc-tcp
containerPort: 30090
protocol: TCP
- name: srs-srt
containerPort: 30556
protocol: UDP
env:
- name: CANDIDATE
value: 192.168.35.178
resources:
limits:
cpu: 2000m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-conf-file
mountPath: /usr/local/srs/conf/docker.conf
subPath: docker.conf
- name: srs-vol
mountPath: /home/dvr
subPath: uavcloud-dev/helm-live/dvr
- name: srs-vol
mountPath: /home/hls
subPath: uavcloud-dev/helm-live/hls
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
- name: oss-adaptor
image: harbor.cdcyy.com.cn/cmii/cmii-srs-oss-adaptor:2023-SA
env:
- name: OSS_ENDPOINT
value: https://minio-ig-dev.uavcmlc.com
- name: OSS_AK
value: cmii
- name: OSS_SK
value: 'B#923fC7mk'
- name: OSS_BUCKET
value: live-srs-hls
- name: SRS_OP
value: 'http://helm-live-op-svc-v2:8080'
- name: MYSQL_ENDPOINT
value: 'helm-mysql:3306'
- name: MYSQL_USERNAME
value: k8s_admin
- name: MYSQL_PASSWORD
value: VFJncwy58^Zm
- name: MYSQL_DATABASE
value: cmii_live_srs_op
- name: MYSQL_TABLE
value: live_segment
- name: LOG_LEVEL
value: info
- name: OSS_META
value: 'yes'
resources:
limits:
cpu: 2000m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-vol
mountPath: /cmii/share/hls
subPath: uavcloud-dev/helm-live/hls
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: { }
imagePullSecrets:
- name: harborsecret
affinity: { }
schedulerName: default-scheduler
serviceName: helm-live-srsrtc-svc
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate
rollingUpdate:
partition: 0
revisionHistoryLimit: 10
---
# live-srs部分
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: helm-live-op-v2
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live
helm.sh/chart: cmlc-live-live-op-2.0.0
live-role: op-v2
spec:
replicas: 1
selector:
matchLabels:
live-role: op-v2
template:
metadata:
labels:
live-role: op-v2
spec:
volumes:
- name: srs-conf-file
configMap:
name: helm-live-op-cm-v2
items:
- key: live.op.conf
path: bootstrap.yaml
defaultMode: 420
containers:
- name: helm-live-op-v2
image: harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0
ports:
- name: operator
containerPort: 8080
protocol: TCP
resources:
limits:
cpu: 4800m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-conf-file
mountPath: /cmii/bootstrap.yaml
subPath: bootstrap.yaml
livenessProbe:
httpGet:
path: /cmii/health
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
periodSeconds: 20
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
path: /cmii/health
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
periodSeconds: 20
successThreshold: 1
failureThreshold: 3
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: { }
imagePullSecrets:
- name: harborsecret
affinity: { }
schedulerName: default-scheduler
strategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 25%
maxSurge: 25%
revisionHistoryLimit: 10
progressDeadlineSeconds: 600
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-op-svc-v2
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
live-role: op-v2
type: ClusterIP
sessionAffinity: None
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-op-svc
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
live-role: op
type: ClusterIP
sessionAffinity: None
---
kind: ConfigMap
apiVersion: v1
metadata:
name: helm-live-op-cm-v2
namespace: uavcloud-dev
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live
data:
live.op.conf: |-
server:
port: 8080
spring:
main:
allow-bean-definition-overriding: true
allow-circular-references: true
application:
name: cmii-live-operator
platform:
info:
name: cmii-live-operator
description: cmii-live-operator
version: 5.6.0
scanPackage: com.cmii.live.op
cloud:
nacos:
config:
username: developer
password: N@cos14Good
server-addr: helm-nacos:8848
extension-configs:
- data-id: cmii-live-operator.yml
group: 5.6.0
refresh: true
shared-configs:
- data-id: cmii-backend-system.yml
group: 5.6.0
refresh: true
discovery:
enabled: false
live:
engine:
type: srs
endpoint: 'http://helm-live-srs-svc:1985'
proto:
rtmp: 'rtmp://192.168.35.178:30935'
rtsp: 'rtsp://192.168.35.178:30554'
srt: 'srt://192.168.35.178:30556'
flv: 'http://192.168.35.178:30500'
hls: 'http://192.168.35.178:30500'
rtc: 'webrtc://192.168.35.178:30090'
replay: 'https://192.168.35.178:30333'
minio:
endpoint: https://minio-ig-dev.uavcmlc.com
access-key: cmii
secret-key: B#923fC7mk
bucket: live-srs-hls

5977
agent-common/real_project/ynejpt/k8s-backend.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

448
agent-common/real_project/ynejpt/k8s-configmap.yaml Normal file
View File

@@ -0,0 +1,448 @@
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-traffic
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-jiangsuwenlv
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "jiangsuwenlv",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-visualization
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "visualization",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-hljtt
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "hljtt",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-pilot2cloud
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "pilot2cloud",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-armypeople
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "armypeople",
AppClientId: "APP_UIegse6Lfou9pO1U"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-base
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "base",
AppClientId: "APP_9LY41OaKSqk2btY0"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-threedsimulation
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "threedsimulation",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qingdao
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "qingdao",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-pangu
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-detection
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "detection",
AppClientId: "APP_FDHW2VLVDWPnnOCy"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-oms
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "oms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-open
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "open",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-seniclive
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-splice
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "splice",
AppClientId: "APP_zE0M3sTRXrCIJS8Y"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-hyper
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "hyper",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervision
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "supervision",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-emergency
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "emergency",
AppClientId: "APP_aGsTAY1uMZrpKdfk"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-logistics
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "logistics",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-multiterminal
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-security
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-dispatchh5
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "dispatchh5",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervisionh5
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-ai-brain
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-cmsportal
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "cmsportal",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-media
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-mws
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-share
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-securityh5
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "securityh5",
AppClientId: "APP_N3ImO0Ubfu9peRHD"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qinghaitourism
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "qinghaitourism",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-uasms
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "uasms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-uas
namespace: ynejpt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "36.147.6.78:8088",
ApplicationShortName: "uas",
AppClientId: "empty"
}

309
agent-common/real_project/ynejpt/k8s-dashboard.yaml Normal file
View File

@@ -0,0 +1,309 @@
---
apiVersion: v1
kind: Namespace
metadata:
name: kube-system
---
apiVersion: v1
kind: ServiceAccount
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard
namespace: kube-system
---
kind: Service
apiVersion: v1
metadata:
labels:
k8s-app: kubernetes-dashboard
kubernetes.io/cluster-service: "true"
name: kubernetes-dashboard
namespace: kube-system
spec:
ports:
- port: 443
targetPort: 8443
nodePort: 39999
selector:
k8s-app: kubernetes-dashboard
type: NodePort
---
apiVersion: v1
kind: Secret
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard-certs
namespace: kube-system
type: Opaque
---
apiVersion: v1
kind: Secret
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard-csrf
namespace: kube-system
type: Opaque
data:
csrf: ""
---
apiVersion: v1
kind: Secret
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard-key-holder
namespace: kube-system
type: Opaque
---
kind: ConfigMap
apiVersion: v1
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard-settings
namespace: kube-system
---
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard
namespace: kube-system
rules:
# Allow Dashboard to get, update and delete Dashboard exclusive secrets.
- apiGroups: [ "" ]
resources: [ "secrets" ]
resourceNames: [ "kubernetes-dashboard-key-holder", "kubernetes-dashboard-certs", "kubernetes-dashboard-csrf" ]
verbs: [ "get", "update", "delete" ]
# Allow Dashboard to get and update 'kubernetes-dashboard-settings' config map.
- apiGroups: [ "" ]
resources: [ "configmaps" ]
resourceNames: [ "kubernetes-dashboard-settings" ]
verbs: [ "get", "update" ]
# Allow Dashboard to get metrics.
- apiGroups: [ "" ]
resources: [ "services" ]
resourceNames: [ "heapster", "dashboard-metrics-scraper" ]
verbs: [ "proxy" ]
- apiGroups: [ "" ]
resources: [ "services/proxy" ]
resourceNames: [ "heapster", "http:heapster:", "https:heapster:", "dashboard-metrics-scraper", "http:dashboard-metrics-scraper" ]
verbs: [ "get" ]
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard
rules:
# Allow Metrics Scraper to get metrics from the Metrics server
- apiGroups: [ "metrics.k8s.io" ]
resources: [ "pods", "nodes" ]
verbs: [ "get", "list", "watch" ]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: kubernetes-dashboard
subjects:
- kind: ServiceAccount
name: kubernetes-dashboard
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: kubernetes-dashboard
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: kubernetes-dashboard
subjects:
- kind: ServiceAccount
name: kubernetes-dashboard
namespace: kube-system
---
kind: Deployment
apiVersion: apps/v1
metadata:
labels:
k8s-app: kubernetes-dashboard
name: kubernetes-dashboard
namespace: kube-system
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
k8s-app: kubernetes-dashboard
template:
metadata:
labels:
k8s-app: kubernetes-dashboard
spec:
imagePullSecrets:
- name: harborsecret
containers:
- name: kubernetes-dashboard
image: 192.168.118.14:8033/cmii/dashboard:v2.0.1
ports:
- containerPort: 8443
protocol: TCP
args:
- --auto-generate-certificates
- --namespace=kube-system
# Uncomment the following line to manually specify Kubernetes API server Host
# If not specified, Dashboard will attempt to auto discover the API server and connect
# to it. Uncomment only if the default does not work.
# - --apiserver-host=http://my-address:port
volumeMounts:
- name: kubernetes-dashboard-certs
mountPath: /certs
# Create on-disk volume to store exec logs
- mountPath: /tmp
name: tmp-volume
livenessProbe:
httpGet:
scheme: HTTPS
path: /
port: 8443
initialDelaySeconds: 30
timeoutSeconds: 30
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsUser: 1001
runAsGroup: 2001
volumes:
- name: kubernetes-dashboard-certs
secret:
secretName: kubernetes-dashboard-certs
- name: tmp-volume
emptyDir: { }
serviceAccountName: kubernetes-dashboard
# Comment the following tolerations if Dashboard must not be deployed on master
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
---
kind: Service
apiVersion: v1
metadata:
labels:
k8s-app: dashboard-metrics-scraper
name: dashboard-metrics-scraper
namespace: kube-system
spec:
ports:
- port: 8000
targetPort: 8000
selector:
k8s-app: dashboard-metrics-scraper
---
kind: Deployment
apiVersion: apps/v1
metadata:
labels:
k8s-app: dashboard-metrics-scraper
name: dashboard-metrics-scraper
namespace: kube-system
spec:
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
k8s-app: dashboard-metrics-scraper
template:
metadata:
labels:
k8s-app: dashboard-metrics-scraper
annotations:
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
spec:
containers:
- name: dashboard-metrics-scraper
image: 192.168.118.14:8033/cmii/metrics-scraper:v1.0.4
ports:
- containerPort: 8000
protocol: TCP
livenessProbe:
httpGet:
scheme: HTTP
path: /
port: 8000
initialDelaySeconds: 30
timeoutSeconds: 30
volumeMounts:
- mountPath: /tmp
name: tmp-volume
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsUser: 1001
runAsGroup: 2001
serviceAccountName: kubernetes-dashboard
# Comment the following tolerations if Dashboard must not be deployed on master
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
volumes:
- name: tmp-volume
emptyDir: { }
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: admin-user
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: admin-user
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
name: admin-user
namespace: kube-system

61
agent-common/real_project/uavcloud-dev/k8s-emqx.yaml → agent-common/real_project/ynejpt/k8s-emqx.yaml
View File

@@ -3,20 +3,20 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
---
apiVersion: v1
kind: ConfigMap
metadata:
name: helm-emqxs-env
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware
cmii.app: helm-emqxs
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
data:
EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc.cluster.local:443"
EMQX_NAME: "helm-emqxs"
@@ -24,7 +24,7 @@ data:
EMQX_CLUSTER__K8S__APP_NAME: "helm-emqxs"
EMQX_CLUSTER__K8S__SERVICE_NAME: "helm-emqxs-headless"
EMQX_CLUSTER__K8S__ADDRESS_TYPE: "dns"
EMQX_CLUSTER__K8S__namespace: "uavcloud-dev"
EMQX_CLUSTER__K8S__namespace: "ynejpt"
EMQX_CLUSTER__K8S__SUFFIX: "svc.cluster.local"
EMQX_ALLOW_ANONYMOUS: "false"
EMQX_ACL_NOMATCH: "deny"
@@ -33,19 +33,27 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-emqxs-cm
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware
cmii.app: helm-emqxs
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
data:
emqx_auth_username.conf: |-
auth.user.1.username = cmlc
auth.user.1.password = 4YPk*DS%+5
auth.user.password_hash = sha256
emqx_auth_mnesia.conf: |-
auth.mnesia.password_hash = sha256
# clientid 认证数据
# auth.client.1.clientid = admin
# auth.client.1.password = 4YPk*DS%+5
## username 认证数据
auth.user.1.username = admin
auth.user.1.password = odD8#Ve7.B
auth.user.2.username = cmlc
auth.user.2.password = odD8#Ve7.B
acl.conf: |-
{allow, {user, "admin"}, pubsub, ["admin/#"]}.
@@ -55,7 +63,8 @@ data:
{allow, all}.
loaded_plugins: |-
{emqx_auth_username,true}.
{emqx_auth_mnesia,true}.
{emqx_auth_mnesia,true}.
{emqx_management, true}.
{emqx_recon, true}.
{emqx_retainer, false}.
@@ -68,14 +77,14 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware
cmii.app: helm-emqxs
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
replicas: 1
serviceName: helm-emqxs-headless
@@ -94,7 +103,7 @@ spec:
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
affinity: { }
imagePullSecrets:
@@ -102,7 +111,7 @@ spec:
serviceAccountName: helm-emqxs
containers:
- name: helm-emqxs
image: harbor.cdcyy.com.cn/cmii/emqx:5.5.1
image: 192.168.118.14:8033/cmii/emqx:4.4.19
imagePullPolicy: Always
ports:
- name: mqtt
@@ -128,8 +137,8 @@ spec:
mountPath: "/opt/emqx/data/mnesia"
readOnly: false
- name: helm-emqxs-cm
mountPath: "/opt/emqx/etc/plugins/emqx_auth_username.conf"
subPath: emqx_auth_username.conf
mountPath: "/opt/emqx/etc/plugins/emqx_auth_mnesia.conf"
subPath: emqx_auth_mnesia.conf
readOnly: false
# - name: helm-emqxs-cm
# mountPath: "/opt/emqx/etc/acl.conf"
@@ -147,8 +156,8 @@ spec:
configMap:
name: helm-emqxs-cm
items:
- key: emqx_auth_username.conf
path: emqx_auth_username.conf
- key: emqx_auth_mnesia.conf
path: emqx_auth_mnesia.conf
- key: acl.conf
path: acl.conf
- key: loaded_plugins
@@ -158,7 +167,7 @@ kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
rules:
- apiGroups:
- ""
@@ -173,11 +182,11 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
subjects:
- kind: ServiceAccount
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
roleRef:
kind: Role
name: helm-emqxs
@@ -187,14 +196,14 @@ apiVersion: v1
kind: Service
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware
cmii.app: helm-emqxs
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
type: NodePort
selector:
@@ -219,14 +228,14 @@ apiVersion: v1
kind: Service
metadata:
name: helm-emqxs-headless
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware
cmii.app: helm-emqxs
cmii.emqx.architecture: cluster
helm.sh/chart: emqx-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
type: ClusterIP
clusterIP: None

2606
agent-common/real_project/ynejpt/k8s-frontend.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

624
agent-common/real_project/ynejpt/k8s-ingress.yaml Normal file
View File

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

17
agent-common/real_project/uavcloud-dev/k8s-mongo.yaml → agent-common/real_project/ynejpt/k8s-mongo.yaml
View File

@@ -3,15 +3,15 @@ apiVersion: v1
kind: Service
metadata:
name: helm-mongo
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.app: helm-mongo
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
type: ClusterIP
type: NodePort
selector:
cmii.app: helm-mongo
cmii.type: middleware
@@ -19,18 +19,19 @@ spec:
- port: 27017
name: server-27017
targetPort: 27017
nodePort: 37017
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-mongo
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.app: helm-mongo
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
serviceName: helm-mongo
replicas: 1
@@ -45,7 +46,7 @@ spec:
cmii.type: middleware
helm.sh/chart: mongo-1.1.0
app.kubernetes.io/managed-by: octopus-control
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
annotations:
pod.alpha.kubernetes.io/initialized: "true"
spec:
@@ -54,7 +55,7 @@ spec:
affinity: { }
containers:
- name: helm-mongo
image: harbor.cdcyy.com.cn/cmii/mongo:5.0
image: 192.168.118.14:8033/cmii/mongo:5.0
resources: { }
ports:
- containerPort: 27017
@@ -64,7 +65,7 @@ spec:
- name: MONGO_INITDB_ROOT_USERNAME
value: cmlc
- name: MONGO_INITDB_ROOT_PASSWORD
value: 7(#dD3zcz8
value: REdPza8#oVlt
volumeMounts:
- name: mongo-data
mountPath: /data/db

52
agent-common/real_project/uavcloud-dev/k8s-mysql.yaml → agent-common/real_project/ynejpt/k8s-mysql.yaml
View File

@@ -3,11 +3,11 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: helm-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
annotations: { }
secrets:
@@ -17,26 +17,26 @@ apiVersion: v1
kind: Secret
metadata:
name: helm-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
type: Opaque
data:
mysql-root-password: "R3d1YmM2Q3hSTQ=="
mysql-root-password: "UXpmWFFoZDNiUQ=="
mysql-password: "S0F0cm5PckFKNw=="
---
apiVersion: v1
kind: ConfigMap
metadata:
name: helm-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: primary
data:
@@ -152,11 +152,11 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-mysql-init-scripts
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: primary
data:
@@ -169,7 +169,7 @@ data:
grant all
on *.* to zyly_qc@'%';
create
user k8s_admin@'%' identified by 'VFJncwy58^Zm';
user k8s_admin@'%' identified by 'fP#UaH6qQ3)8';
grant all
on *.* to k8s_admin@'%';
create
@@ -192,12 +192,12 @@ kind: Service
apiVersion: v1
metadata:
name: cmii-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/component: primary
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/name: mysql-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.app: mysql
cmii.type: middleware
octopus.control: mysql-db-wdd
@@ -210,7 +210,7 @@ spec:
selector:
app.kubernetes.io/component: primary
app.kubernetes.io/name: mysql-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.app: mysql
cmii.type: middleware
type: ClusterIP
@@ -219,11 +219,11 @@ apiVersion: v1
kind: Service
metadata:
name: helm-mysql-headless
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: mysql
@@ -239,7 +239,7 @@ spec:
targetPort: mysql
selector:
app.kubernetes.io/name: mysql-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.type: middleware
cmii.app: mysql
app.kubernetes.io/component: primary
@@ -248,11 +248,11 @@ apiVersion: v1
kind: Service
metadata:
name: helm-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: mysql
@@ -268,7 +268,7 @@ spec:
nodePort: 33306
selector:
app.kubernetes.io/name: mysql-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.type: middleware
cmii.app: mysql
app.kubernetes.io/component: primary
@@ -277,11 +277,11 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-mysql
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: mysql
@@ -291,7 +291,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: mysql-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.type: middleware
cmii.app: mysql
app.kubernetes.io/component: primary
@@ -305,7 +305,7 @@ spec:
labels:
app.kubernetes.io/name: mysql-db
octopus.control: mysql-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: mysql
@@ -321,7 +321,7 @@ spec:
fsGroup: 1001
initContainers:
- name: change-volume-permissions
image: harbor.cdcyy.com.cn/cmii/bitnami-shell:11-debian-11-r136
image: 192.168.118.14:8033/cmii/bitnami-shell:11-debian-11-r136
imagePullPolicy: "Always"
command:
- /bin/bash
@@ -335,7 +335,7 @@ spec:
mountPath: /bitnami/mysql
containers:
- name: mysql
image: harbor.cdcyy.com.cn/cmii/mysql:8.1.0-debian-11-r42
image: 192.168.118.14:8033/cmii/mysql:8.1.0-debian-11-r42
imagePullPolicy: "IfNotPresent"
securityContext:
runAsUser: 1001
@@ -420,4 +420,4 @@ spec:
name: helm-mysql-init-scripts
- name: mysql-data
hostPath:
path: /var/lib/docker/mysql-pv/uavcloud-dev/
path: /var/lib/docker/mysql-pv/ynejpt/

20
agent-common/real_project/uavcloud-dev/k8s-nacos.yaml → agent-common/real_project/ynejpt/k8s-nacos.yaml
View File

@@ -3,31 +3,31 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-nacos-cm
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.app: helm-nacos
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
data:
mysql.db.name: "cmii_nacos_config"
mysql.db.host: "helm-mysql"
mysql.port: "3306"
mysql.user: "k8s_admin"
mysql.password: "VFJncwy58^Zm"
mysql.password: "fP#UaH6qQ3)8"
---
apiVersion: v1
kind: Service
metadata:
name: helm-nacos
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.app: helm-nacos
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
type: NodePort
selector:
@@ -37,7 +37,7 @@ spec:
- port: 8848
name: server
targetPort: 8848
nodePort: 33848
nodePort: 38848
- port: 9848
name: server12
targetPort: 9848
@@ -49,13 +49,13 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-nacos
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.app: helm-nacos
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
serviceName: helm-nacos
replicas: 1
@@ -70,7 +70,7 @@ spec:
cmii.type: middleware
octopus.control: nacos-wdd
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
annotations:
pod.alpha.kubernetes.io/initialized: "true"
spec:
@@ -79,7 +79,7 @@ spec:
affinity: { }
containers:
- name: nacos-server
image: harbor.cdcyy.com.cn/cmii/nacos-server:v2.1.2
image: 192.168.118.14:8033/cmii/nacos-server:v2.1.2
ports:
- containerPort: 8848
name: dashboard

38
agent-common/real_project/ynejpt/k8s-nfs-test.yaml Normal file
View File

@@ -0,0 +1,38 @@
---
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: test-claim
annotations:
volume.beta.kubernetes.io/storage-class: "nfs-prod-distribute" #与nfs-StorageClass.yaml metadata.name保持一致
spec:
accessModes:
- ReadWriteOnce
storageClassName: nfs-prod-distribute
resources:
requests:
storage: 1Mi
---
kind: Pod
apiVersion: v1
metadata:
name: test-pod
spec:
imagePullSecrets:
- name: harborsecret
containers:
- name: test-pod
image: 192.168.118.14:8033/cmii/busybox:latest
command:
- "/bin/sh"
args:
- "-c"
- "touch /mnt/NFS-CREATE-SUCCESS && exit 0 || exit 1" #创建一个SUCCESS文件后退出
volumeMounts:
- name: nfs-pvc
mountPath: "/mnt"
restartPolicy: "Never"
volumes:
- name: nfs-pvc
persistentVolumeClaim:
claimName: test-claim #与PVC名称保持一致

114
agent-common/real_project/ynejpt/k8s-nfs.yaml Normal file
View File

@@ -0,0 +1,114 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: nfs-client-provisioner
# replace with namespace where provisioner is deployed
namespace: kube-system #根据实际环境设定namespace,下面类同
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: nfs-client-provisioner-runner
rules:
- apiGroups: [ "" ]
resources: [ "persistentvolumes" ]
verbs: [ "get", "list", "watch", "create", "delete" ]
- apiGroups: [ "" ]
resources: [ "persistentvolumeclaims" ]
verbs: [ "get", "list", "watch", "update" ]
- apiGroups: [ "storage.k8s.io" ]
resources: [ "storageclasses" ]
verbs: [ "get", "list", "watch" ]
- apiGroups: [ "" ]
resources: [ "events" ]
verbs: [ "create", "update", "patch" ]
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: run-nfs-client-provisioner
subjects:
- kind: ServiceAccount
name: nfs-client-provisioner
# replace with namespace where provisioner is deployed
namespace: kube-system
roleRef:
kind: ClusterRole
# name: nfs-client-provisioner-runner
name: cluster-admin
apiGroup: rbac.authorization.k8s.io
---
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: leader-locking-nfs-client-provisioner
# replace with namespace where provisioner is deployed
namespace: kube-system
rules:
- apiGroups: [ "" ]
resources: [ "endpoints" ]
verbs: [ "get", "list", "watch", "create", "update", "patch" ]
---
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: leader-locking-nfs-client-provisioner
subjects:
- kind: ServiceAccount
name: nfs-client-provisioner
# replace with namespace where provisioner is deployed
namespace: kube-system
roleRef:
kind: Role
name: leader-locking-nfs-client-provisioner
apiGroup: rbac.authorization.k8s.io
---
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: nfs-prod-distribute
provisioner: cmlc-nfs-storage #这里的名称要和provisioner配置文件中的环境变量PROVISIONER_NAME保持一致parameters: archiveOnDelete: "false"
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: nfs-client-provisioner
labels:
app: nfs-client-provisioner
# replace with namespace where provisioner is deployed
namespace: kube-system #与RBAC文件中的namespace保持一致
spec:
replicas: 1
selector:
matchLabels:
app: nfs-client-provisioner
strategy:
type: Recreate
template:
metadata:
labels:
app: nfs-client-provisioner
spec:
imagePullSecrets:
- name: harborsecret
serviceAccountName: nfs-client-provisioner
containers:
- name: nfs-client-provisioner
image: 192.168.118.14:8033/cmii/nfs-subdir-external-provisioner:v4.0.2
volumeMounts:
- name: nfs-client-root
mountPath: /persistentvolumes
env:
- name: PROVISIONER_NAME
value: cmlc-nfs-storage
- name: NFS_SERVER
value: 192.168.118.15
- name: NFS_PATH
value: /var/lib/docker/nfs_data
volumes:
- name: nfs-client-root
nfs:
server: 192.168.118.15
path: /var/lib/docker/nfs_data

16
agent-common/real_project/uavcloud-dev/k8s-pvc.yaml → agent-common/real_project/ynejpt/k8s-pvc.yaml
View File

@@ -3,12 +3,12 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: nfs-backend-log-pvc
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware-base
cmii.app: nfs-backend-log-pvc
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -22,12 +22,12 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: helm-emqxs
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware-base
cmii.app: helm-emqxs
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -41,12 +41,12 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: helm-mongo
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware-base
cmii.app: helm-mongo
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
storageClassName: nfs-prod-distribute
accessModes:
@@ -60,12 +60,12 @@ apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: helm-rabbitmq
namespace: uavcloud-dev
namespace: ynejpt
labels:
cmii.type: middleware-base
cmii.app: helm-rabbitmq
helm.sh/chart: all-persistence-volume-claims-1.1.0
app.kubernetes.io/version: 5.6.0
app.kubernetes.io/version: 5.7.0
spec:
storageClassName: nfs-prod-distribute
accessModes:

48
agent-common/real_project/uavcloud-dev/k8s-rabbitmq.yaml → agent-common/real_project/ynejpt/k8s-rabbitmq.yaml
View File

@@ -3,11 +3,11 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: helm-rabbitmq
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
automountServiceAccountToken: true
secrets:
@@ -17,33 +17,33 @@ apiVersion: v1
kind: Secret
metadata:
name: helm-rabbitmq
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
type: Opaque
data:
rabbitmq-password: "N3YmNyN3MWVmKVQt"
rabbitmq-password: "blljUk45MXIuX2hq"
rabbitmq-erlang-cookie: "emFBRmt1ZU1xMkJieXZvdHRYbWpoWk52UThuVXFzcTU="
---
apiVersion: v1
kind: ConfigMap
metadata:
name: helm-rabbitmq-config
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
data:
rabbitmq.conf: |-
## Username and password
##
default_user = admin
default_pass = 7v&7#w1ef)T-
default_pass = nYcRN91r._hj
## Clustering
##
cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s
@@ -63,11 +63,11 @@ kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: helm-rabbitmq-endpoint-reader
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
rules:
- apiGroups: [ "" ]
@@ -81,11 +81,11 @@ kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: helm-rabbitmq-endpoint-reader
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
subjects:
- kind: ServiceAccount
@@ -99,11 +99,11 @@ apiVersion: v1
kind: Service
metadata:
name: helm-rabbitmq-headless
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
spec:
clusterIP: None
@@ -122,18 +122,18 @@ spec:
targetPort: stats
selector:
app.kubernetes.io/name: helm-rabbitmq
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
publishNotReadyAddresses: true
---
apiVersion: v1
kind: Service
metadata:
name: helm-rabbitmq
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
spec:
type: NodePort
@@ -148,17 +148,17 @@ spec:
nodePort: 36675
selector:
app.kubernetes.io/name: helm-rabbitmq
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-rabbitmq
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
spec:
serviceName: helm-rabbitmq-headless
@@ -169,13 +169,13 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: helm-rabbitmq
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
template:
metadata:
labels:
app.kubernetes.io/name: helm-rabbitmq
helm.sh/chart: rabbitmq-8.26.1
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: rabbitmq
annotations:
checksum/config: d6c2caa9572f64a06d9f7daa34c664a186b4778cd1697ef8e59663152fc628f1
@@ -191,7 +191,7 @@ spec:
terminationGracePeriodSeconds: 120
initContainers:
- name: volume-permissions
image: harbor.cdcyy.com.cn/cmii/bitnami-shell:11-debian-11-r136
image: 192.168.118.14:8033/cmii/bitnami-shell:11-debian-11-r136
imagePullPolicy: "Always"
command:
- /bin/bash
@@ -210,7 +210,7 @@ spec:
mountPath: /bitnami/rabbitmq/mnesia
containers:
- name: rabbitmq
image: harbor.cdcyy.com.cn/cmii/rabbitmq:3.9.12-debian-10-r3
image: 192.168.118.14:8033/cmii/rabbitmq:3.9.12-debian-10-r3
imagePullPolicy: "Always"
env:
- name: BITNAMI_DEBUG

68
agent-common/real_project/uavcloud-dev/k8s-redis.yaml → agent-common/real_project/ynejpt/k8s-redis.yaml
View File

@@ -4,22 +4,22 @@ kind: ServiceAccount
automountServiceAccountToken: true
metadata:
name: helm-redis
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
---
apiVersion: v1
kind: Secret
metadata:
name: helm-redis
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
type: Opaque
data:
@@ -29,11 +29,11 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-redis-configuration
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
data:
redis.conf: |-
@@ -62,11 +62,11 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-redis-health
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
data:
ping_readiness_local.sh: |-
@@ -151,11 +151,11 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: helm-redis-scripts
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
data:
start-master.sh: |
@@ -230,11 +230,11 @@ apiVersion: v1
kind: Service
metadata:
name: helm-redis-headless
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
spec:
type: ClusterIP
@@ -245,18 +245,18 @@ spec:
targetPort: redis
selector:
app.kubernetes.io/name: redis-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
---
# Source: outside-deploy/charts/redis-db/templates/master/service.yaml
apiVersion: v1
kind: Service
metadata:
name: helm-redis-master
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: redis
@@ -271,7 +271,7 @@ spec:
nodePort: null
selector:
app.kubernetes.io/name: redis-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.type: middleware
cmii.app: redis
app.kubernetes.io/component: master
@@ -281,11 +281,11 @@ apiVersion: v1
kind: Service
metadata:
name: helm-redis-replicas
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: replica
spec:
@@ -297,7 +297,7 @@ spec:
nodePort: null
selector:
app.kubernetes.io/name: redis-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/component: replica
---
# Source: outside-deploy/charts/redis-db/templates/master/statefulset.yaml
@@ -305,11 +305,11 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-redis-master
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: redis
@@ -319,7 +319,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: redis-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
cmii.type: middleware
cmii.app: redis
app.kubernetes.io/component: master
@@ -332,7 +332,7 @@ spec:
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
cmii.type: middleware
cmii.app: redis
@@ -352,7 +352,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: redis
image: harbor.cdcyy.com.cn/cmii/redis:6.2.6-debian-10-r0
image: 192.168.118.14:8033/cmii/redis:6.2.6-debian-10-r0
imagePullPolicy: "Always"
securityContext:
runAsUser: 1001
@@ -408,8 +408,8 @@ spec:
cpu: "2"
memory: 8Gi
requests:
cpu: "100m"
memory: 1Gi
cpu: "2"
memory: 8Gi
volumeMounts:
- name: start-scripts
mountPath: /opt/bitnami/scripts/start-scripts
@@ -448,11 +448,11 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: helm-redis-replicas
namespace: uavcloud-dev
namespace: ynejpt
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: replica
spec:
@@ -460,7 +460,7 @@ spec:
selector:
matchLabels:
app.kubernetes.io/name: redis-db
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/component: replica
serviceName: helm-redis-headless
updateStrategy:
@@ -471,7 +471,7 @@ spec:
labels:
app.kubernetes.io/name: redis-db
octopus.control: redis-db-wdd
app.kubernetes.io/release: uavcloud-dev
app.kubernetes.io/release: ynejpt
app.kubernetes.io/managed-by: octopus
app.kubernetes.io/component: replica
annotations:
@@ -488,7 +488,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: redis
image: harbor.cdcyy.com.cn/cmii/redis:6.2.6-debian-10-r0
image: 192.168.118.14:8033/cmii/redis:6.2.6-debian-10-r0
imagePullPolicy: "Always"
securityContext:
runAsUser: 1001
@@ -503,7 +503,7 @@ spec:
- name: REDIS_REPLICATION_MODE
value: slave
- name: REDIS_MASTER_HOST
value: helm-redis-master-0.helm-redis-headless.uavcloud-dev.svc.cluster.local
value: helm-redis-master-0.helm-redis-headless.ynejpt.svc.cluster.local
- name: REDIS_MASTER_PORT_NUMBER
value: "6379"
- name: ALLOW_EMPTY_PASSWORD
@@ -552,8 +552,8 @@ spec:
cpu: "2"
memory: 8Gi
requests:
cpu: "100m"
memory: 1Gi
cpu: "2"
memory: 8Gi
volumeMounts:
- name: start-scripts
mountPath: /opt/bitnami/scripts/start-scripts

496
agent-common/real_project/ynejpt/k8s-srs.yaml Normal file
View File

@@ -0,0 +1,496 @@
---
kind: ConfigMap
apiVersion: v1
metadata:
name: helm-live-srs-cm
namespace: ynejpt
labels:
cmii.app: live-srs
cmii.type: live
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
data:
srs.rtc.conf: |-
listen 31935;
max_connections 4096;
srs_log_tank console;
srs_log_level info;
srs_log_file /home/srs.log;
daemon off;
http_api {
enabled on;
listen 1985;
crossdomain on;
}
stats {
network 0;
}
http_server {
enabled on;
listen 8080;
dir /home/hls;
}
srt_server {
enabled on;
listen 30556;
maxbw 1000000000;
connect_timeout 4000;
peerlatency 600;
recvlatency 600;
}
rtc_server {
enabled on;
listen 30090;
candidate $CANDIDATE;
}
vhost __defaultVhost__ {
http_hooks {
enabled on;
on_publish http://helm-live-op-svc-v2:8080/hooks/on_push;
}
http_remux {
enabled on;
}
rtc {
enabled on;
rtmp_to_rtc on;
rtc_to_rtmp on;
keep_bframe off;
}
tcp_nodelay on;
min_latency on;
play {
gop_cache off;
mw_latency 100;
mw_msgs 10;
}
publish {
firstpkt_timeout 8000;
normal_timeout 4000;
mr on;
}
dvr {
enabled off;
dvr_path /home/dvr/[app]/[stream]/[2006][01]/[timestamp].mp4;
dvr_plan session;
}
hls {
enabled on;
hls_path /home/hls;
hls_fragment 10;
hls_window 60;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]/[2006][01][02]/[timestamp]-[duration].ts;
hls_cleanup on;
hls_entry_prefix http://36.147.6.78:8088;
}
}
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srs-svc-exporter
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: rtmp
protocol: TCP
port: 30935
targetPort: 30935
nodePort: 31935
- name: rtc
protocol: UDP
port: 30090
targetPort: 30090
nodePort: 30090
- name: rtc-tcp
protocol: TCP
port: 30090
targetPort: 30090
nodePort: 30090
- name: srt
protocol: UDP
port: 30556
targetPort: 30556
nodePort: 30556
- name: api
protocol: TCP
port: 1985
targetPort: 1985
nodePort: 30080
selector:
srs-role: rtc
type: NodePort
sessionAffinity: None
externalTrafficPolicy: Cluster
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srs-svc
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
- name: api
protocol: TCP
port: 1985
targetPort: 1985
selector:
srs-role: rtc
type: ClusterIP
sessionAffinity: None
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-srsrtc-svc
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- name: rtmp
protocol: TCP
port: 30935
targetPort: 30935
selector:
srs-role: rtc
type: ClusterIP
sessionAffinity: None
---
kind: StatefulSet
apiVersion: apps/v1
metadata:
name: helm-live-srs-rtc
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-srs
cmii.type: live
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
srs-role: rtc
spec:
replicas: 1
selector:
matchLabels:
srs-role: rtc
template:
metadata:
labels:
srs-role: rtc
spec:
volumes:
- name: srs-conf-file
configMap:
name: helm-live-srs-cm
items:
- key: srs.rtc.conf
path: docker.conf
defaultMode: 420
- name: srs-vol
emptyDir:
sizeLimit: 8Gi
containers:
- name: srs-rtc
image: 192.168.118.14:8033/cmii/srs:v5.0.195
ports:
- name: srs-rtmp
containerPort: 30935
protocol: TCP
- name: srs-api
containerPort: 1985
protocol: TCP
- name: srs-flv
containerPort: 8080
protocol: TCP
- name: srs-webrtc
containerPort: 30090
protocol: UDP
- name: srs-webrtc-tcp
containerPort: 30090
protocol: TCP
- name: srs-srt
containerPort: 30556
protocol: UDP
env:
- name: CANDIDATE
value: 36.147.6.78
resources:
limits:
cpu: 2000m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-conf-file
mountPath: /usr/local/srs/conf/docker.conf
subPath: docker.conf
- name: srs-vol
mountPath: /home/dvr
subPath: ynejpt/helm-live/dvr
- name: srs-vol
mountPath: /home/hls
subPath: ynejpt/helm-live/hls
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
- name: oss-adaptor
image: 192.168.118.14:8033/cmii/cmii-srs-oss-adaptor:2023-SA
env:
- name: OSS_ENDPOINT
value: 'http://192.168.118.15:9000'
- name: OSS_AK
value: cmii
- name: OSS_SK
value: 'B#923fC7mk'
- name: OSS_BUCKET
value: live-cluster-hls
- name: SRS_OP
value: 'http://helm-live-op-svc-v2:8080'
- name: MYSQL_ENDPOINT
value: 'helm-mysql:3306'
- name: MYSQL_USERNAME
value: k8s_admin
- name: MYSQL_PASSWORD
value: fP#UaH6qQ3)8
- name: MYSQL_DATABASE
value: cmii_live_srs_op
- name: MYSQL_TABLE
value: live_segment
- name: LOG_LEVEL
value: info
- name: OSS_META
value: 'yes'
resources:
limits:
cpu: 2000m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-vol
mountPath: /cmii/share/hls
subPath: ynejpt/helm-live/hls
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: { }
imagePullSecrets:
- name: harborsecret
affinity: { }
schedulerName: default-scheduler
serviceName: helm-live-srsrtc-svc
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate
rollingUpdate:
partition: 0
revisionHistoryLimit: 10
---
# live-srs部分
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: helm-live-op-v2
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live
helm.sh/chart: cmlc-live-live-op-2.0.0
live-role: op-v2
spec:
replicas: 1
selector:
matchLabels:
live-role: op-v2
template:
metadata:
labels:
live-role: op-v2
spec:
volumes:
- name: srs-conf-file
configMap:
name: helm-live-op-cm-v2
items:
- key: live.op.conf
path: bootstrap.yaml
defaultMode: 420
containers:
- name: helm-live-op-v2
image: 192.168.118.14:8033/cmii/cmii-live-operator:5.2.0
ports:
- name: operator
containerPort: 8080
protocol: TCP
resources:
limits:
cpu: 4800m
memory: 4Gi
requests:
cpu: 100m
memory: 256Mi
volumeMounts:
- name: srs-conf-file
mountPath: /cmii/bootstrap.yaml
subPath: bootstrap.yaml
livenessProbe:
httpGet:
path: /cmii/health
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
periodSeconds: 20
successThreshold: 1
failureThreshold: 3
readinessProbe:
httpGet:
path: /cmii/health
port: 8080
scheme: HTTP
initialDelaySeconds: 60
timeoutSeconds: 5
periodSeconds: 20
successThreshold: 1
failureThreshold: 3
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
imagePullPolicy: Always
restartPolicy: Always
terminationGracePeriodSeconds: 30
dnsPolicy: ClusterFirst
securityContext: { }
imagePullSecrets:
- name: harborsecret
affinity: { }
schedulerName: default-scheduler
strategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 25%
maxSurge: 25%
revisionHistoryLimit: 10
progressDeadlineSeconds: 600
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-op-svc-v2
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
nodePort: 30333
selector:
live-role: op-v2
type: NodePort
sessionAffinity: None
---
kind: Service
apiVersion: v1
metadata:
name: helm-live-op-svc
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
- protocol: TCP
port: 8080
targetPort: 8080
selector:
live-role: op
type: ClusterIP
sessionAffinity: None
---
kind: ConfigMap
apiVersion: v1
metadata:
name: helm-live-op-cm-v2
namespace: ynejpt
labels:
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live
data:
live.op.conf: |-
server:
port: 8080
spring:
main:
allow-bean-definition-overriding: true
allow-circular-references: true
application:
name: cmii-live-operator
platform:
info:
name: cmii-live-operator
description: cmii-live-operator
version: 5.7.0
scanPackage: com.cmii.live.op
cloud:
nacos:
config:
username: developer
password: N@cos14Good
server-addr: helm-nacos:8848
extension-configs:
- data-id: cmii-live-operator.yml
group: 5.7.0
refresh: true
shared-configs:
- data-id: cmii-backend-system.yml
group: 5.7.0
refresh: true
discovery:
enabled: false
live:
engine:
type: srs
endpoint: 'http://helm-live-srs-svc:1985'
proto:
rtmp: 'rtmp://36.147.6.78:31935'
rtsp: 'rtsp://36.147.6.78:30554'
srt: 'srt://36.147.6.78:30556'
flv: 'http://36.147.6.78:30500'
hls: 'http://36.147.6.78:30500'
rtc: 'webrtc://36.147.6.78:30090'
replay: 'https://36.147.6.78:30333'
minio:
endpoint: http://192.168.118.15:9000
access-key: cmii
secret-key: B#923fC7mk
bucket: live-cluster-hls

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

@@ -114,9 +114,9 @@ spec:
containers:
- name: helm-emqxs
{{- if .HarborPort }}
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:4.4.9
image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:4.4.19
{{- else }}
image: {{ .HarborIPOrCustomImagePrefix }}emqx:4.4.9
image: {{ .HarborIPOrCustomImagePrefix }}emqx:4.4.19
{{- end }}
imagePullPolicy: Always
ports:

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

@@ -414,8 +414,8 @@ spec:
cpu: "2"
memory: 8Gi
requests:
cpu: "100m"
memory: 1Gi
cpu: "2"
memory: 8Gi
volumeMounts:
- name: start-scripts
mountPath: /opt/bitnami/scripts/start-scripts
@@ -562,8 +562,8 @@ spec:
cpu: "2"
memory: 8Gi
requests:
cpu: "100m"
memory: 1Gi
cpu: "2"
memory: 8Gi
volumeMounts:
- name: start-scripts
mountPath: /opt/bitnami/scripts/start-scripts

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

@@ -45,6 +45,7 @@ var CmiiBackendAppMap = map[string]string{
"cmii-uav-grid-manage": "5.4.0",
"cmii-uav-sense-adapter": "5.4.0",
"cmii-uav-sync": "5.4.0",
"cmii-uav-iot-dispatcher": "5.7.0",
}
var CmiiFrontendAppMap = map[string]string{

7
agent-go/a_executor/BaseFunction.go
View File

@@ -73,6 +73,9 @@ func (op *AgentOsOperator) Exec(baseFuncName string, funcArgs ...string) (bool,
case "installDocker":
resultOk, errorLog = op.installDockerExec(funcArgs)
break
case "installDockerByOffline":
resultOk, errorLog = op.installDockerOfflineExec(funcArgs)
break
case "removeDocker":
resultOk, errorLog = op.removeDockerExec()
break
@@ -1638,8 +1641,8 @@ func (op *AgentOsOperator) installNfsServerOnlineExec() (bool, []string) {
return false, append(resultLog, msg)
}
} else if op.IsOsTypeCentOS {
// ubuntu
} else {
// CentOS
installOk, installLog := BasicInstallSoftware(op.InstallCommandPrefix, true, "nfs-utils")
if !installOk {
return false, installLog

36
agent-operator/CmiiDeployOperator.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
"os"
"path/filepath"
"runtime"
"strings"
image2 "wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
@@ -12,23 +13,38 @@ import (
"wdd.io/agent-operator/image"
)
const DeployFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-common/real_project/"
var DeployFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-common/real_project/"
func CmiiEnvDeploy(deployCommonEnv *z_dep.CommonEnvironmentConfig, shouldDoCompleteDeploy bool, backupFromEnv string) {
func init() {
switch runtime.GOOS {
case "linux":
DeployFilePrefix = "/home/wdd/IdeaProjects/ProjectOctopus/agent-common/real_project/"
case "windows":
DeployFilePrefix = "C:\\Users\\wddsh\\Documents\\IdeaProjects\\ProjectOctopus\\agent-common\\real_project\\"
}
}
// CmiiEnvDeploy 根据特定的环境复制一份部署清单，复制Cmii App的部署 shouldDoCompleteDeploy决定是否生成其他的应用
func CmiiEnvDeploy(
deployCommonEnv *z_dep.CommonEnvironmentConfig,
shouldDoCompleteDeploy bool,
backupFromEnv string,
) {
folderPrefix := DeployFilePrefix + deployCommonEnv.Namespace + "/"
tenantEnv := deployCommonEnv.Namespace
// uavcloud-devflight ==> devflight
// uavcloud-dev ==> dev
if strings.Contains(tenantEnv, "-") {
split := strings.Split(tenantEnv, "-")
tenantEnv = split[len(split)-1]
} else {
// demo ==> ""
// cqlyj ==> ""
tenantEnv = ""
}
//if strings.Contains(tenantEnv, "-") {
// split := strings.Split(tenantEnv, "-")
// tenantEnv = split[len(split)-1]
//} else {
// // demo ==> ""
// // cqlyj ==> ""
// tenantEnv = ""
//}
// assign folder prefix
deployCommonEnv.ApplyFilePrefix = folderPrefix

72
agent-operator/CmiiDeployOperator_test.go
View File

@@ -48,15 +48,20 @@ func TestCmiiEnvDeploy_ChongQingSanHua(t *testing.T) {
func TestCmiiEnvDeploy_LiuXiTongGan(t *testing.T) {
// chongqing sanhua
// 刘喜通感
// 修改
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "10.250.0.200",
WebPort: "8888",
HarborIPOrCustomImagePrefix: "10.250.0.200",
HarborPort: "8033",
Namespace: "bjtg",
Namespace: "xmyd_6.0.0",
TagVersion: "5.6.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "",
NFSServerIP: "10.250.0.200",
ApplyFilePrefix: "",
}
CmiiEnvDeploy(commonEnv, true, demo)
@@ -81,6 +86,27 @@ func TestCmiiEnvDeploy_ZheJiangYiDongErJiPingTai(t *testing.T) {
}
func TestCmiiEnvDeploy_JiChengCeShiHuanJing(t *testing.T) {
// 2024上线测试-集成测试环境
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "integration.uavcmlc.com",
WebPort: "",
HarborIPOrCustomImagePrefix: image2.CmiiHarborPrefix,
HarborPort: "",
Namespace: "uavcloud-dev",
TagVersion: "6.0.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "minio.ig-dev.uavcmlc.com",
NFSServerIP: "10.40.51.5",
ApplyFilePrefix: "",
}
CmiiEnvDeploy(commonEnv, false, "")
}
func TestCmiiEnvDeploy_JiangSuNanTong(t *testing.T) {
// 江苏南通
@@ -120,6 +146,48 @@ func TestCmiiEnvDeploy_ChongQingErJiPingTai(t *testing.T) {
}
func TestCmiiEnvDeploy_YunNanErJiPingTai(t *testing.T) {
// 江苏南通
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "36.147.6.78",
WebPort: "8088",
HarborIPOrCustomImagePrefix: "192.168.118.14",
HarborPort: "8033",
Namespace: "ynejpt",
TagVersion: "5.7.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "192.168.118.15",
NFSServerIP: "192.168.118.15",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii570ImageList)
}
func TestCmiiEnvDeploy_JiLinYiDong(t *testing.T) {
// 吉林移动
commonEnv := &z_dep.CommonEnvironmentConfig{
WebIP: "36.135.17.162",
WebPort: "8888",
HarborIPOrCustomImagePrefix: "172.18.10.251",
HarborPort: "8033",
Namespace: "jlyd",
TagVersion: "5.8.0",
TenantEnv: "",
MinioPublicIP: "",
MinioInnerIP: "192.168.118.15",
NFSServerIP: "192.168.118.15",
ApplyFilePrefix: "",
}
CmiiEnvDeployOffline(commonEnv, true, real_project.Cmii580ImageList)
}
func TestCmiiNewAppDeploy(t *testing.T) {
deployNamespace := devOperation

136
agent-operator/CmiiK8sOperator_test.go
View File

@@ -150,53 +150,56 @@ func TestBackupAllCmiiDeploymentToList(t *testing.T) {
func TestUpdateCmiiImageTagFromNameTagMap(t *testing.T) {
backendMap := map[string]string{
"cmii-admin-data": "5.8.0",
"cmii-admin-gateway": "5.8.0",
"cmii-admin-user": "5.8.0",
"cmii-open-gateway": "5.8.0",
"cmii-suav-supervision": "5.8.0",
"cmii-uav-airspace": "5.8.0",
"cmii-uav-alarm": "5.8.0",
"cmii-uav-brain": "5.8.0",
"cmii-uav-cloud-live": "5.8.0",
"cmii-uav-cms": "5.8.0",
"cmii-uav-data-post-process": "5.8.0",
"cmii-uav-developer": "5.8.0",
"cmii-uav-device": "5.8.0",
"cmii-uav-emergency": "5.8.0",
"cmii-uav-gateway": "5.8.0",
"cmii-uav-gis-server": "5.8.0",
"cmii-uav-industrial-portfolio": "5.8.0",
"cmii-uav-integration": "5.8.0",
"cmii-uav-logger": "5.8.0",
"cmii-uav-material-warehouse": "5.8.0",
"cmii-uav-mission": "5.8.0",
"cmii-uav-mqtthandler": "5.8.0",
"cmii-uav-notice": "5.8.0",
"cmii-uav-oauth": "5.8.0",
"cmii-uav-process": "5.8.0",
"cmii-uav-surveillance": "5.8.0",
"cmii-uav-threedsimulation": "5.8.0",
"cmii-uav-tower": "5.8.0",
"cmii-uav-user": "5.8.0",
"cmii-uav-waypoint": "5.8.0",
"cmii-uav-sense-adapter": "5.8.0",
"cmii-uav-multilink": "5.8.0",
"cmii-admin-data": "6.0.0",
"cmii-admin-gateway": "6.0.0",
"cmii-admin-user": "6.0.0",
"cmii-open-gateway": "6.0.0",
"cmii-suav-supervision": "6.0.0",
"cmii-uav-airspace": "6.0.0",
"cmii-uav-alarm": "6.0.0",
"cmii-uav-brain": "6.0.0",
"cmii-uav-cloud-live": "6.0.0",
"cmii-uav-cms": "6.0.0",
"cmii-uav-data-post-process": "6.0.0",
"cmii-uav-developer": "6.0.0",
"cmii-uav-device": "6.0.0",
"cmii-uav-emergency": "6.0.0",
"cmii-uav-gateway": "6.0.0",
"cmii-uav-gis-server": "6.0.0",
"cmii-uav-industrial-portfolio": "6.0.0",
"cmii-uav-integration": "6.0.0",
"cmii-uav-logger": "6.0.0",
"cmii-uav-material-warehouse": "6.0.0",
"cmii-uav-mission": "6.0.0",
"cmii-uav-mqtthandler": "6.0.0",
"cmii-uav-notice": "6.0.0",
"cmii-uav-oauth": "6.0.0",
"cmii-uav-process": "6.0.0",
"cmii-uav-surveillance": "6.0.0",
"cmii-uav-threedsimulation": "6.0.0",
"cmii-uav-tower": "6.0.0",
"cmii-uav-user": "6.0.0",
"cmii-uav-waypoint": "6.0.0",
"cmii-uav-sense-adapter": "6.0.0",
"cmii-uas-lifecycle": "6.0.0",
"cmii-uas-gateway": "6.0.0",
}
frontendMap := map[string]string{
"cmii-suav-platform-supervision": "5.8.0",
"cmii-suav-platform-supervisionh5": "5.8.0",
"cmii-uav-platform": "5.8.0",
"cmii-uav-platform-media": "5.8.0",
"cmii-uav-platform-ai-brain": "5.8.0",
"cmii-uav-platform-cms-portal": "5.8.0",
"cmii-uav-platform-armypeople": "5.8.0",
"cmii-uav-platform-mws": "5.8.0",
"cmii-uav-platform-oms": "5.8.0",
"cmii-uav-platform-open": "5.8.0",
"cmii-uav-platform-securityh5": "5.8.0",
"cmii-uav-platform-share": "5.8.0",
"cmii-suav-platform-supervision": "6.0.0",
"cmii-suav-platform-supervisionh5": "6.0.0",
"cmii-uav-platform": "6.0.0",
"cmii-uav-platform-media": "6.0.0",
"cmii-uav-platform-ai-brain": "6.0.0",
"cmii-uav-platform-cms-portal": "6.0.0",
"cmii-uav-platform-armypeople": "6.0.0",
"cmii-uav-platform-mws": "6.0.0",
"cmii-uav-platform-oms": "6.0.0",
"cmii-uav-platform-open": "6.0.0",
"cmii-uav-platform-securityh5": "6.0.0",
"cmii-uav-platform-share": "6.0.0",
"cmii-uav-platform-uasms": "6.0.0",
"cmii-uav-platform-uas": "6.0.0",
//"cmii-uav-platform-base": "5.7.0",
//"cmii-uav-platform-detection": "5.7.0",
//"cmii-uav-platform-emergency-rescue": "5.7.0",
@@ -251,37 +254,30 @@ func TestRestartCmiiDeployment(t *testing.T) {
func TestUpdateCmiiDeploymentImageTag(t *testing.T) {
//计算20:00的时间
now := time.Now()
targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 35, 00, 0, now.Location())
duration := time.Duration(0)
if !now.After(targetTime) {
// 计算到20:00的剩余时间
duration = targetTime.Sub(now)
} else {
// 如果当前时间已经过了20:00，那么就跳到下一天
//targetTime = targetTime.Add(24 * time.Hour)
}
fmt.Println(duration)
// 等待到20:00
time.Sleep(duration)
//now := time.Now()
//
//targetTime := time.Date(now.Year(), now.Month(), now.Day(), 17, 55, 00, 0, now.Location())
//
//duration := time.Duration(0)
//
//if !now.After(targetTime) {
// // 计算到20:00的剩余时间
// duration = targetTime.Sub(now)
//} else {
// // 如果当前时间已经过了20:00，那么就跳到下一天
// //targetTime = targetTime.Add(24 * time.Hour)
//}
//
//fmt.Println(duration)
//
//// 等待到20:00
//time.Sleep(duration)
cmiiEnv := demo
//appName := "cmii-uav-platform"i
//newTag := "5.4.0-032601"
appNameTagMap := map[string]string{
//"cmii-uav-platform-dispatchh5": "5.6.0-062401",
//"cmii-uav-data-post-process": "5.6.0-062401",
//"cmii-uav-industrial-portfolio": "5.6.0-071801",
"cmii-uav-industrial-portfolio": "5.7.0-31369-yunnan-082104",
//"cmii-uav-brain": "5.5.0",
//"cmii-uav-platform": "5.6.0-071702",
//"cmii-uas-lifecycle": "5.6.0-30403-071802",
"cmii-uav-platform-pilot2-to-cloud": "6.0.0-092301",
}
for appName, newTag := range appNameTagMap {

5
agent-operator/ImageSyncOperator_test.go
View File

@@ -46,11 +46,12 @@ func TestLoadSplitDepGzipImageToTargetHarbor(t *testing.T) {
}
func TestPullFromEntityAndSyncConditionally(t *testing.T) {
// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
// 下载镜像的核心函数
sync := ImageSyncEntity{
DownloadCondition: &DownloadEntity{
ShouldDownloadImage: true,
ProjectName: "bjyd",
ProjectName: "xmyd_6.0.0",
ProjectVersion: "",
CmiiNameTagList: []string{
//"cmii-uav-mqtthandler:5.4.0-bjdyt-052102",

16
agent-operator/log/cmii-update-log.txt
View File

@@ -261,3 +261,19 @@
2024-08-22-17-33-16 uavcloud-demo cmii-uav-platform-oms 5.7.0 5.8.0
2024-08-22-17-33-18 uavcloud-demo cmii-uav-platform-securityh5 5.7.0 5.8.0
2024-08-22-17-33-19 uavcloud-demo cmii-suav-platform-supervision 5.7.0 5.8.0
2024-08-29-09-35-00 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082702 5.7.0-31369-yunnan-082901
2024-08-29-10-04-24 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082901 5.7.0-31369-yunnan-082903
2024-08-29-11-30-21 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082903 5.7.0-31369-yunnan-082904
2024-08-29-15-06-26 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082904 5.7.0-31369-yunnan-082905
2024-08-29-16-58-24 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082905 5.7.0-31369-yunnan-082906
2024-08-29-17-30-45 uavcloud-demo cmii-uas-lifecycle 5.8.0 5.7.0-082901
2024-08-30-11-03-12 uavcloud-demo cmii-uas-lifecycle 5.7.0-082902 5.7.0-snapshot
2024-08-30-14-57-00 uavcloud-demo cmii-uas-lifecycle 5.7.0-snapshot 5.7.0-083001
2024-09-02-17-02-21 uavcloud-demo cmii-uav-platform 5.8.0 5.8.0-0902
2024-09-02-18-30-00 uavcloud-demo cmii-uas-lifecycle 5.7.0-090202 5.7.0-090201
2024-09-03-09-21-43 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-082906 5.7.0-31369-yunnan-090301
2024-09-03-15-18-12 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-090301 5.7.0-31369-yunnan-090302
2024-09-03-17-22-08 uavcloud-demo cmii-uas-lifecycle 5.7.0-090201 5.7.0-090301
2024-09-03-17-23-44 uavcloud-demo cmii-uav-platform 5.8.0-0902 5.8.0-090301
2024-09-04-09-43-45 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-090302 5.7.0-31369-yunnan-090401
2024-09-05-13-52-57 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-090401 5.7.0-31369-yunnan-090501

5
server/src/main/java/io/wdd/func/auto/beans/BaseFunctionEnum.java
View File

@@ -46,6 +46,11 @@ public enum BaseFunctionEnum {
"安装Docker, 默认安装20.10.15版本"
),
INSTALL_DOCKER_OFFLINE(
"installDockerByOffline",
"安装Docker, 默认安装20.10.15版本"
),
INSTALL_DOCKER_COMPOSE(
"installDockerCompose",
"安装Docker Compose, 默认为2.18.0版本"

2
server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java
View File

@@ -71,6 +71,8 @@ public class AcceptAgentInitInfo {
16);
put("Jinrongjie",
17);
put("Jiaxing",
18);
}};

18
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -54,7 +54,9 @@ public class TestBaseFuncScheduler {
// Long projectServerId = 1788026824445317122L;// 新疆移动
// Long projectServerId = 1791639665955184642L;// 深圳公安
// Long projectServerId = 1795703135172485122L;// 北京通感
Long projectServerId = 1826162388894871554L; // 江苏南通二级平台 8-21
// Long projectServerId = 1826162388894871554L; // 江苏南通二级平台 8-21
// Long projectServerId = 1829348851302887425L; // 云南二级平台 08-30
Long projectServerId = 1838118730059444225L; //江西通感二级平台 9-23
// Long projectServerId = 1773619219367120898L; // 内网35-71项目
@@ -68,7 +70,9 @@ public class TestBaseFuncScheduler {
// String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动
// String masterNodeServerName = "Local-amd64-251"; // 新疆移动
// String masterNodeServerName = "Chengdu-amd64-200"; // 北京通感
String masterNodeServerName = "Jinrongjie-amd64-056"; // 江苏南通二级平台
// String masterNodeServerName = "Jinrongjie-amd64-056"; // 江苏南通二级平台
// String masterNodeServerName = "Shanghai-amd64-014"; // 云南二级平台
String masterNodeServerName = "Jiaxing-amd64-135"; // 江西通感二级平台 9-23
// String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安
ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId);
@@ -89,9 +93,9 @@ public class TestBaseFuncScheduler {
List<BaseFunctionEnum> masterNodeProcedure = List.of(
// BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.DISABLE_SELINUX,
// BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.DISABLE_SWAP,
BaseFunctionEnum.DISABLE_SELINUX,
BaseFunctionEnum.MODIFY_SYSCONFIG,
BaseFunctionEnum.SHUTDOWN_FIREWALL,
BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
@@ -128,7 +132,7 @@ public class TestBaseFuncScheduler {
throw new RuntimeException(e);
}
// baseFuncScheduler.runProcedure(projectDeployContext);
baseFuncScheduler.runProcedure(projectDeployContext);
// 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110
// harborFuncScheduler.runProcedure(projectDeployContext);
@@ -165,7 +169,7 @@ public class TestBaseFuncScheduler {
projectDeployContext.setMasterNodeBaseProcedure(masterNodeProcedure);
projectDeployContext.setAgentNodeBaseProcedure(agentNodeProcedure);
baseFuncScheduler.runProcedure(projectDeployContext);
// baseFuncScheduler.runProcedure(projectDeployContext);
}
}

5
server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java
View File

@@ -42,7 +42,7 @@ public class TestImageSyncScheduler {
));
ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
"harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.7.0-31369-yunnan-082301"
"harbor.cdcyy.com.cn/cmii/cmii-uav-integration:5.7.0-32580-0923"
));
Boolean downloadAndCompressOnly = false;
@@ -52,6 +52,7 @@ public class TestImageSyncScheduler {
// String projectNamespace = "jlyd"; // 吉林移动
// String projectNamespace = "jxyd"; // 吉林移动
String projectNamespace = "xmyd"; // 厦门移动
// String projectNamespace = "ynejpt"; // 云南二级平台
// String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod
@@ -101,7 +102,7 @@ public class TestImageSyncScheduler {
));
ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-042901"
"harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.8.0-jlyd-091301"
));
Boolean downloadAndCompressOnly = true;

2
setting-aliyun.xml
View File

@@ -50,7 +50,7 @@ under the License.
| The path to the local repository maven will use to store artifacts.
|
| Default: ${user.home}/.m2/repository -->
<!-- <localRepository>/home/jenkins/agent/.m2/repository</localRepository> -->
<!-- <localRepository>/data/maven/repository</localRepository>-->
<!-- interactiveMode