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

[agent-deploy] - bug fix

Browse Source
This commit is contained in:
zeaslity
2024-04-26 15:57:28 +08:00
parent 7f4a4d877e
commit 421f53a8aa
22 changed files with 7369 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
agent-operator/CmiiOperator.go
View File

@@ -332,9 +332,9 @@ func buildAllCmiiImageNameListFromDemo(projectName string) []string {
// srsMapFile,
//)
realCmiiImageName = append(realCmiiImageName, image.ConvertCmiiImageMapToList(backendMap)...)
realCmiiImageName = append(realCmiiImageName, image.ConvertCmiiImageMapToList(frontendMap)...)
realCmiiImageName = append(realCmiiImageName, image.ConvertCmiiImageMapToList(srsMap)...)
realCmiiImageName = append(realCmiiImageName, image.CmiiImageMapToFullNameList(backendMap)...)
realCmiiImageName = append(realCmiiImageName, image.CmiiImageMapToFullNameList(frontendMap)...)
realCmiiImageName = append(realCmiiImageName, image.CmiiImageMapToFullNameList(srsMap)...)
utils.BeautifulPrintListWithTitle(realCmiiImageName, "Cmii Project Image => "+projectName)
@@ -376,8 +376,8 @@ func buildAllCmiiImageNameListFromVersion(cmiiVersion string) []string {
frontendMap[app] = cmiiVersion
}
realCmiiImageName = append(realCmiiImageName, image.ConvertCmiiImageMapToList(backendMap)...)
realCmiiImageName = append(realCmiiImageName, image.ConvertCmiiImageMapToList(frontendMap)...)
realCmiiImageName = append(realCmiiImageName, image.CmiiImageMapToFullNameList(backendMap)...)
realCmiiImageName = append(realCmiiImageName, image.CmiiImageMapToFullNameList(frontendMap)...)
for key, value := range CmiiSrsAppMap {
var app *CmiiDeploymentInterface

75
agent-operator/CmiiOperator_test.go
View File

@@ -38,81 +38,14 @@ func TestPullFromEntityAndSyncConditionally(t *testing.T) {
// 创建一个模拟的sync对象，用于测试函数的行为。这里需要根据你的实际需求来设置mock数据和预期结果。
sync := ImageSyncEntity{
CmiiNameTagList: []string{
"cmii-uav-tower:5.4.0-0319",
"cmii-uav-platform-logistics:5.4.0",
"cmii-uav-platform-qinghaitourism:4.1.0-21377-0508",
"cmii-uav-platform-securityh5:5.4.0",
"cmii-uav-platform:5.4.0-25263-041102",
"cmii-uav-platform-ai-brain:5.4.0",
"cmii-uav-emergency:5.3.0",
"cmii-uav-kpi-monitor:5.4.0",
"cmii-uav-platform-splice:5.4.0-040301",
"cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427",
"cmii-live-operator:5.2.0",
"cmii-uav-gateway:5.4.0",
"cmii-uav-platform-security:4.1.6",
"cmii-uav-integration:5.4.0-25916",
"cmii-uav-notice:5.4.0",
"cmii-uav-platform-open:5.4.0",
"cmii-srs-oss-adaptor:2023-SA",
"cmii-admin-gateway:5.4.0",
"cmii-uav-process:5.4.0-0410",
"cmii-suav-supervision:5.4.0-032501",
"cmii-uav-platform-cms-portal:5.4.0",
"cmii-uav-platform-multiterminal:5.4.0",
"cmii-admin-data:5.4.0-0403",
"cmii-uav-cloud-live:5.4.0",
"cmii-uav-grid-datasource:5.2.0-24810",
"cmii-uav-platform-qingdao:4.1.6-24238-qingdao",
"cmii-admin-user:5.4.0",
"cmii-uav-industrial-portfolio:5.4.0-28027-041102",
"cmii-uav-alarm:5.4.0-0409",
"cmii-uav-clusters:5.2.0",
"cmii-uav-platform-oms:5.4.0",
"cmii-uav-platform-hljtt:5.3.0-hjltt",
"cmii-uav-platform-mws:5.4.0",
"cmii-uav-autowaypoint:4.1.6-cm",
"cmii-uav-grid-manage:5.1.0",
"cmii-uav-platform-share:5.4.0",
"cmii-uav-cms:5.3.0",
"cmii-uav-oauth:5.4.0-032901",
"cmii-open-gateway:5.4.0",
"cmii-uav-data-post-process:5.4.0",
"cmii-uav-multilink:5.4.0-032701",
"cmii-uav-platform-media:5.4.0",
"cmii-uav-platform-visualization:5.2.0",
"cmii-uav-platform-emergency-rescue:5.2.0",
"cmii-app-release:4.2.0-validation",
"cmii-uav-device:5.4.0-28028-0409",
"cmii-uav-gis-server:5.4.0",
"cmii-uav-brain:5.4.0",
"cmii-uav-depotautoreturn:5.4.0",
"cmii-uav-threedsimulation:5.1.0",
"cmii-uav-grid-engine:5.1.0",
"cmii-uav-developer:5.4.0-040701",
"cmii-uav-waypoint:5.4.0-032901",
"cmii-uav-platform-base:5.4.0",
"cmii-uav-platform-threedsimulation:5.2.0-21392",
"cmii-uav-platform-detection:5.4.0",
"cmii-uav-logger:5.4.0-0319",
"cmii-uav-platform-seniclive:5.2.0",
"cmii-suav-platform-supervisionh5:5.4.0",
"cmii-uav-user:5.4.0",
"cmii-uav-surveillance:5.4.0-28028-0409",
"cmii-uav-mission:5.4.0-28028-041006",
"cmii-uav-mqtthandler:5.4.0-25916-041001",
"srs:v5.0.195",
"cmii-uav-material-warehouse:5.4.0-0407",
"cmii-uav-platform-armypeople:5.4.0-041201",
"cmii-suav-platform-supervision:5.4.0",
"cmii-uav-airspace:5.4.0-0402",
"cmii-uav-platform:5.5.0-offline",
},
FullNameImageList: nil,
ProjectVersion: "",
DirectHarborHost: "harbor.wdd.io",
CompressImageToGzip: false,
UploadToDemoMinio: false,
ShouldDirectPushToHarbor: true,
CompressImageToGzip: true,
UploadToDemoMinio: true,
ShouldDirectPushToHarbor: false,
}
// 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。

107
agent-operator/deploy/OctopusDeploy.go
View File

@@ -1,12 +1,12 @@
package deploy
import (
"os"
"wdd.io/agent-common/logger"
"wdd.io/agent-operator/deploy/a_dashboard"
"wdd.io/agent-operator/deploy/a_nfs"
"wdd.io/agent-operator/deploy/b_middle"
"wdd.io/agent-operator/deploy/c_app"
"wdd.io/agent-operator/deploy/z_dep"
"wdd.io/agent-operator/image"
"wdd.io/agent-operator/real_project/zjjt"
)
var log = logger.Log
@@ -27,39 +27,64 @@ func OctopusDeploy() {
NFSServerIP: "10.100.2.121",
}
a_dashboard.K8sDashboardDeploy(common)
a_nfs.NFSDeploy(common)
a_nfs.NFSTestDeploy(common)
// pvc
b_middle.PVCDeploy(common)
// middlewares
b_middle.MidMySQlDeploy(common)
b_middle.MidRedisDeploy(common)
b_middle.MidEmqxDeploy(common)
b_middle.MidMongoDeploy(common)
b_middle.MidRabbitMQDeploy(common)
b_middle.MidRabbitMQDeploy(common)
b_middle.MidNacosDeploy(common)
configMapDeploy(common)
c_app.IngressDeploy(common)
//a_dashboard.K8sDashboardDeploy(common)
//
backendDeploy(common)
frontendDeploy(common)
c_app.SrsDeploy(common)
//a_nfs.NFSDeploy(common)
//a_nfs.NFSTestDeploy(common)
//
//// pvc
//b_middle.PVCDeploy(common)
//
//// middlewares
//b_middle.MidMySQlDeploy(common)
//b_middle.MidRedisDeploy(common)
//b_middle.MidEmqxDeploy(common)
//b_middle.MidMongoDeploy(common)
//b_middle.MidRabbitMQDeploy(common)
//b_middle.MidRabbitMQDeploy(common)
//b_middle.MidNacosDeploy(common)
//
//configMapDeploy(common)
//c_app.IngressDeploy(common)
//
//frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
//
//backendDeploy(common, backendImageVersionMap)
//frontendDeploy(common, frontendImageVersionMap)
c_app.SRSDeploy(common)
}
func backendDeploy(common *z_dep.CommonEnvironmentConfig) {
backendMap := map[string]string{
"cmii-admin-data": "5.2.0",
"cmii-admin-gateway": "5.2.0",
"cmii-admin-user": "5.2.0",
func CmiiAppDeploy() {
// common environment
common := &z_dep.CommonEnvironmentConfig{
WebIP: "10.100.2.121",
WebPort: "8888",
HarborIP: "10.100.2.121",
HarborPort: "8033",
Namespace: "zjjt",
TagVersion: "5.5.0",
TenantEnv: "",
MinioPublicIP: "10.100.2.116",
MinioInnerIP: "10.100.2.116",
NFSServerIP: "10.100.2.121",
}
for appName, tag := range backendMap {
frontendImageVersionMap, backendImageVersionMap := image.FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
backendDeploy(common, backendImageVersionMap)
frontendDeploy(common, frontendImageVersionMap)
configMapDeploy(common)
//c_app.IngressDeploy(common)
}
func backendDeploy(common *z_dep.CommonEnvironmentConfig, backendImageVersionMap map[string]string) {
os.Remove(c_app.BackendApplyFilePath)
for appName, tag := range backendImageVersionMap {
c_app.DefaultCmiiBackendConfig.AppName = appName
c_app.DefaultCmiiBackendConfig.ImageTag = tag
c_app.DefaultCmiiBackendConfig.Replicas = "1"
@@ -67,20 +92,30 @@ func backendDeploy(common *z_dep.CommonEnvironmentConfig) {
}
}
func frontendDeploy(common *z_dep.CommonEnvironmentConfig) {
frontendMap := map[string]string{
"cmii-admin-web": "5.2.0",
}
func frontendDeploy(common *z_dep.CommonEnvironmentConfig, frontendImageVersionMap map[string]string) {
os.Remove(c_app.FrontendApplyFilePath)
for appName, tag := range frontendMap {
c_app.FrontendDefaultNginxDeploy(common)
for appName, tag := range frontendImageVersionMap {
c_app.DefaultCmiiFrontendConfig.AppName = appName
c_app.DefaultCmiiFrontendConfig.ImageTag = tag
c_app.DefaultCmiiFrontendConfig.Replicas = "1"
value, ok := c_app.FrontendShortNameMaps[appName]
if !ok {
log.ErrorF("FrontendShortNameMaps error ! not contains %s", appName)
continue
}
c_app.DefaultCmiiFrontendConfig.ShortName = value
c_app.DefaultCmiiFrontendConfig.FrontendDeploy(common)
}
}
func configMapDeploy(common *z_dep.CommonEnvironmentConfig) {
os.Remove(c_app.ConfigMapApplyFilePath)
for frontendName, shortName := range c_app.FrontendShortNameMaps {
c_app.DefaultCmiiFrontendConfig.AppName = frontendName

5
agent-operator/deploy/OctopusDeploy_test.go
View File

@@ -6,3 +6,8 @@ func TestOctopusDeploy(t *testing.T) {
OctopusDeploy()
}
func TestCmiiAppDeploy(t *testing.T) {
CmiiAppDeploy()
}

11
agent-operator/deploy/c_app/DeployCmiiApp.go
View File

@@ -2,6 +2,7 @@ package c_app
import (
"github.com/go-playground/validator/v10"
"os"
"wdd.io/agent-common/logger"
"wdd.io/agent-operator/deploy/z_dep"
)
@@ -23,7 +24,7 @@ type CmiiFrontendConfig struct {
AppName string `json:"app_name,omitempty" validate:"required"`
ImageTag string `json:"image_tag,omitempty" validate:"required"`
Replicas string `json:"replicas,omitempty" validate:"required" default:"1"`
ShortName string `json:"short_name,omitempty"`
ShortName string `json:"short_name,omitempty" validate:"required"`
ClientId string
}
@@ -132,7 +133,11 @@ func IngressDeploy(commonEnv *z_dep.CommonEnvironmentConfig) bool {
return true
}
func SrsDeploy(commonEnv *z_dep.CommonEnvironmentConfig) bool {
func SRSDeploy(commonEnv *z_dep.CommonEnvironmentConfig) bool {
os.Remove(SRSApplyFilePath)
return commonEnv.ParseCommonEnvToApplyFile(CmiiSrsTemplate, SRSApplyFilePath)
}
func FrontendDefaultNginxDeploy(commonEnv *z_dep.CommonEnvironmentConfig) bool {
return commonEnv.ParseCommonEnvToApplyFile(CmiiFrontendDefaultNginxConfTemplate, FrontendApplyFilePath)
}

4
agent-operator/deploy/c_app/FrontendConfigMap.go
View File

@@ -22,6 +22,9 @@ var FrontendShortNameMaps = map[string]string{
"cmii-uav-platform-share": "share",
"cmii-uav-platform-splice": "splice",
"cmii-uav-platform-traffic": "traffic",
"cmii-uav-platform-threedsimulation": "threedsimulation",
"cmii-uav-platform-jiangsuwenlv": "jiangsuwenlv",
"cmii-uav-platform-qinghaitourism": "qinghaitourism",
}
var FrontendClientIdMaps = map[string]string{
@@ -50,4 +53,5 @@ var FrontendClientIdMaps = map[string]string{
"cmii-uav-platform-threedsimulation": "empty",
"cmii-uav-platform-visualization": "empty",
"cmii-uav-platform-traffic": "APP_Jc8i2wOQ1t73QEJS",
"cmii-uav-platform-jiangsuwenlv": "empty",
}

12
agent-operator/deploy/c_app/TemplateCmiiBackend.go
View File

@@ -48,7 +48,7 @@ spec:
- name: APPLICATION_NAME
value: {{ .AppName }}
- name: CUST_JAVA_OPTS
value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true"
value: "-Xms200m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true"
- name: NACOS_REGISTRY
value: "helm-nacos:8848"
- name: NACOS_DISCOVERY_IP
@@ -72,11 +72,11 @@ spec:
containerPort: 8080
protocol: TCP
resources:
limits: .
limits:
memory: 2Gi
cpu: "2"
requests:
memory: 1Gi
memory: 200Mi
cpu: 200m
livenessProbe:
httpGet:
@@ -109,7 +109,7 @@ spec:
successThreshold: 1
failureThreshold: 5
volumeMounts:
- name: glusterfs-backend-log-volume
- name: nfs-backend-log-volume
mountPath: /cmii/logs
readOnly: false
subPath: {{ .Namespace }}/{{ .AppName }}
@@ -120,9 +120,9 @@ spec:
subPath: {{ .Namespace }}/{{ .AppName }}
{{- end }}
volumes:
- name: glusterfs-backend-log-volume
- name: nfs-backend-log-volume
persistentVolumeClaim:
claimName: glusterfs-backend-log-pvc
claimName: nfs-backend-log-pvc
{{- if .NeedPvcCache }}
- name: data-cache-volume
persistentVolumeClaim:

9
agent-operator/deploy/c_app/TemplateCmiiFrontend.go
View File

@@ -52,9 +52,6 @@ spec:
- name: nginx-conf
mountPath: /usr/local/nginx/conf/nginx.conf
subPath: nginx.conf
- name: default-nginx-conf
mountPath: /etc/nginx/conf.d/default.conf
subPath: default.conf
- name: tenant-prefix
subPath: ingress-config.js
mountPath: /home/cmii-platform/dist/ingress-config.js
@@ -65,12 +62,6 @@ spec:
items:
- key: nginx.conf
path: nginx.conf
- name: default-nginx-conf
configMap:
name: default-nginx-cm
items:
- key: default.conf
path: default.conf
- name: tenant-prefix
configMap:
name: tenant-prefix-{{ .ShortName }}

16
agent-operator/deploy/c_app/TemplateCmiiSRS.go
View File

@@ -7,9 +7,9 @@ metadata:
name: helm-live-srs-cm
namespace: {{ .Namespace }}
labels:
cmii.app: live-srs
cmii.app: live-srs
cmii.type: live
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
data:
@@ -95,7 +95,7 @@ metadata:
name: helm-live-srs-svc-exporter
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -137,7 +137,7 @@ metadata:
name: helm-live-srs-svc
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -181,7 +181,7 @@ metadata:
name: helm-live-srs-rtc
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-srs
cmii.type: live
@@ -407,7 +407,7 @@ metadata:
name: helm-live-op-svc-v2
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -426,7 +426,7 @@ metadata:
name: helm-live-op-svc
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -444,7 +444,7 @@ metadata:
name: helm-live-op-cm-v2
namespace: {{ .Namespace }}
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live

5
agent-operator/deploy/c_app/TemplateIngressConfigMap.go
View File

@@ -4,11 +4,11 @@ const CmiiFrontendConfigMapTemplate = `
kind: ConfigMap
apiVersion: v1
metadata:
name: {{ .AppName }}
name: tenant-prefix-{{ .ShortName }}
namespace: {{ .Namespace }}
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "{{ .TenantEnv }}",
CloudHOST: "{{ .WebIP }}:{{ .WebPort }}",
ApplicationShortName: "{{ .ShortName }}",
@@ -31,7 +31,6 @@ data:
events {
worker_connections 1024;
use_epoll on;
}
http {
include mime.types;

5074
agent-operator/deploy/z_file/k8s-backend.yaml
View File

File diff suppressed because it is too large Load Diff

470
agent-operator/deploy/z_file/k8s-configmap.yaml
View File

@@ -2,137 +2,39 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-traffic
name: tenant-prefix-threedsimulation
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-base
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "base",
AppClientId: "APP_9LY41OaKSqk2btY0"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-cms-portal
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "cmsportal",
ApplicationShortName: "threedsimulation",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-oms
name: tenant-prefix-jiangsuwenlv
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "oms",
ApplicationShortName: "jiangsuwenlv",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-splice
name: tenant-prefix-supervision
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "splice",
AppClientId: "APP_zE0M3sTRXrCIJS8Y"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-detection
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "detection",
AppClientId: "APP_FDHW2VLVDWPnnOCy"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-media
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-multiterminal
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-security
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-suav-platform-supervision
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "supervision",
@@ -142,95 +44,11 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-suav-platform-supervisionh5
name: tenant-prefix-armypeople
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "platform",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-ai-brain
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-securityh5
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "securityh5",
AppClientId: "APP_N3ImO0Ubfu9peRHD"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-seniclive
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-share
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-armypeople
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "armypeople",
@@ -240,39 +58,25 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-logistics
name: tenant-prefix-cmsportal
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "logistics",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
ApplicationShortName: "cmsportal",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-mws
name: tenant-prefix-emergency
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-emergency-rescue
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "emergency",
@@ -282,13 +86,251 @@ data:
kind: ConfigMap
apiVersion: v1
metadata:
name: cmii-uav-platform-open
name: tenant-prefix-logistics
namespace: zjjt
data:
ingress-config.js: |-
var GlobalIngressConfig = {
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "logistics",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-security
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "security",
AppClientId: "APP_JUSEMc7afyWXxvE7"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-qinghaitourism
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "qinghaitourism",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-base
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "base",
AppClientId: "APP_9LY41OaKSqk2btY0"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-multiterminal
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "multiterminal",
AppClientId: "APP_PvdfRRRBPL8xbIwl"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-supervisionh5
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "supervisionh5",
AppClientId: "APP_qqSu82THfexI8PLM"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-ai-brain
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "ai-brain",
AppClientId: "APP_rafnuCAmBESIVYMH"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-detection
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "detection",
AppClientId: "APP_FDHW2VLVDWPnnOCy"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-media
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "media",
AppClientId: "APP_4AU8lbifESQO4FD6"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-mws
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "mws",
AppClientId: "APP_uKniXPELlRERBBwK"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-seniclive
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "seniclive",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-traffic
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "traffic",
AppClientId: "APP_Jc8i2wOQ1t73QEJS"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-platform
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "platform",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-oms
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "oms",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-open
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "open",
AppClientId: "empty"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-securityh5
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "securityh5",
AppClientId: "APP_N3ImO0Ubfu9peRHD"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-share
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "share",
AppClientId: "APP_4lVSVI0ZGxTssir8"
}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: tenant-prefix-splice
namespace: zjjt
data:
ingress-config.js: |-
var __GlobalIngressConfig = {
TenantEnvironment: "",
CloudHOST: "10.100.2.121:8888",
ApplicationShortName: "splice",
AppClientId: "APP_zE0M3sTRXrCIJS8Y"
}

1845
agent-operator/deploy/z_file/k8s-frontend.yaml
View File

File diff suppressed because it is too large Load Diff

16
agent-operator/deploy/z_file/k8s-srs.yaml
View File

@@ -5,9 +5,9 @@ metadata:
name: helm-live-srs-cm
namespace: zjjt
labels:
cmii.app: live-srs
cmii.app: live-srs
cmii.type: live
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
helm.sh/chart: cmlc-live-srs-rtc-2.0.0
data:
@@ -93,7 +93,7 @@ metadata:
name: helm-live-srs-svc-exporter
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -135,7 +135,7 @@ metadata:
name: helm-live-srs-svc
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -179,7 +179,7 @@ metadata:
name: helm-live-srs-rtc
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-srs
cmii.type: live
@@ -405,7 +405,7 @@ metadata:
name: helm-live-op-svc-v2
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -424,7 +424,7 @@ metadata:
name: helm-live-op-svc
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
spec:
ports:
@@ -442,7 +442,7 @@ metadata:
name: helm-live-op-cm-v2
namespace: zjjt
labels:
octopus.control: wdd
octopus.control: wdd
app.kubernetes.io/managed-by: octopus
cmii.app: live-engine
cmii.type: live

24
agent-operator/image/CmiiImageSync.go
View File

@@ -278,7 +278,7 @@ func PullFromCmiiHarbor(imageName string) (pullResult io.ReadCloser) {
func PullFromCmiiHarborByMap(imageVersionMap map[string]string, silentMode bool) (fullImageNameList, errorPullImageList []string) {
fullImageNameList = ConvertCmiiImageMapToList(imageVersionMap)
fullImageNameList = CmiiImageMapToFullNameList(imageVersionMap)
return fullImageNameList, PullFromFullNameList(fullImageNameList)
}
@@ -474,7 +474,7 @@ func SaveToTarGZ(targetImageName, folderPathPrefix string) bool {
return true
}
func ConvertCmiiImageMapToList(cmiiImageVersionMap map[string]string) (fullImageNameList []string) {
func CmiiImageMapToFullNameList(cmiiImageVersionMap map[string]string) (fullImageNameList []string) {
for image, tag := range cmiiImageVersionMap {
s := image2.CmiiHarborPrefix + image + ":" + tag
@@ -484,14 +484,14 @@ func ConvertCmiiImageMapToList(cmiiImageVersionMap map[string]string) (fullImage
return fullImageNameList
}
func ConvertCmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[string]string) {
func CmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionMap map[string]string) {
allFileInFolder, err := utils.ListAllFileInFolder(gzipFileFolder)
if err != nil {
return nil
}
cmiiImageVersionMap = make(map[string]string, len(allFileInFolder))
cmiiImageVersionMap = make(map[string]string)
for _, gzipFileName := range allFileInFolder {
log.DebugF("gzip file name is %s", gzipFileName)
imageName, imageTag := image2.GzipFileNameToImageNameAndTag(gzipFileName)
@@ -501,6 +501,22 @@ func ConvertCmiiImageMapFromGzipFolder(gzipFileFolder string) (cmiiImageVersionM
return cmiiImageVersionMap
}
func FrontendBackendImageMapFromCmiiImageMap(cmiiImageVersionMap map[string]string) (frontendImageVersionMap, backendImageVersionMap map[string]string) {
frontendImageVersionMap = make(map[string]string)
backendImageVersionMap = make(map[string]string)
for imageName, imageTag := range cmiiImageVersionMap {
if strings.Contains(imageName, "platform") {
frontendImageVersionMap[imageName] = imageTag
} else {
backendImageVersionMap[imageName] = imageTag
}
}
return frontendImageVersionMap, backendImageVersionMap
}
func loginToDockerHub(HarborFullHost string) {
if HarborFullHost == "" {

10
agent-operator/image/CmiiImageSync_test.go
View File

@@ -8,6 +8,7 @@ import (
"wdd.io/agent-common/assert"
"wdd.io/agent-common/image"
"wdd.io/agent-common/utils"
"wdd.io/agent-operator/real_project/zjjt"
)
func TestGetRunningContainer(t *testing.T) {
@@ -198,7 +199,14 @@ func TestSaveSpecificImageToGzipFile(t *testing.T) {
func TestConvertCmiiImageMapFromGzipFolder(t *testing.T) {
versionMap := ConvertCmiiImageMapFromGzipFolder(OfflineImageGzipFolderPrefix)
versionMap := CmiiImageMapFromGzipFolder(OfflineImageGzipFolderPrefix)
utils.BeautifulPrint(versionMap)
}
func TestFrontendBackendImageMapFromCmiiImageMap(t *testing.T) {
frontendImageVersionMap, backendImageVersionMap := FrontendBackendImageMapFromCmiiImageMap(zjjt.CmiiImageMap)
utils.BeautifulPrint(frontendImageVersionMap)
utils.BeautifulPrint(backendImageVersionMap)
}

17
agent-operator/real_project/proxy_project/linux/start-proxy.sh
View File

@@ -1,17 +0,0 @@
#!/bin/bash
echo "1.download file"
wget http://42.192.52.227:9000/octopus/socks5_linux_amd64
wget http://42.192.52.227:9000/octopus/port_linux_amd64
mv port_linux_amd64 port && chmod +x port
mv socks5_linux_amd64 sock && chmod +x sock
echo "2.port open and socks "
(./port udp listen:0.0.0.0:53 conn:223.5.5.5:53 & ./port tcp listen:0.0.0.0:80 conn:42.192.52.227:80 & ./port tcp listen:0.0.0.0:9000 conn:242.192.52.227:9000 & ./port tcp listen:0.0.0.0:20672 conn:42.192.52.227:20672 & ./port tcp listen:0.0.0.0:20678 conn:42.192.52.227:20678 & ./sock 9997 ) & wait
netstat -ano|grep 53
netstat -ano|grep 9000
netstat -ano|grep 20672
netstat -ano|grep 20678

28
agent-operator/real_project/proxy_project/windows/1-proxy-setup.ps1
View File

@@ -1,28 +0,0 @@
Set-ExecutionPolicy RemoteSigned -Scope CurrentUser
$basePath = $PWD
Write-Host "Current Running Path is $basePath"
# This is a PowerShell script to run port_win64.exe with admin privileges and keep running in the background
Write-Host "Start the port forwarding !"
Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "udp listen:0.0.0.0:53 conn:223.5.5.5:53" -Verb RunAs -WindowStyle Hidden
Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:80 conn:42.192.52.227:80" -Verb RunAs -WindowStyle Hidden
Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:9000 conn:42.192.52.227:9000" -Verb RunAs -WindowStyle Hidden
Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:20672 conn:42.192.52.227:20672" -Verb RunAs -WindowStyle Hidden
Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:20678 conn:42.192.52.227:20678" -Verb RunAs -WindowStyle Hidden
Write-Host "Start the socks !"
Start-Process -FilePath "$basePath\socks5_win64.exe" -ArgumentList "9997" -Verb RunAs -WindowStyle Hidden
# Keep script running until terminal is closed
Write-Host ""
netstat -ano | findstr 53
Write-Host ""
netstat -ano | findstr 9000
Write-Host ""
netstat -ano | findstr 20672
Write-Host ""
netstat -ano | findstr 20678
Write-Host ""
$null = Read-Host "Press Enter to close this script"

64
agent-operator/real_project/zjjt/Config.go Normal file
View File

@@ -0,0 +1,64 @@
package zjjt
var CmiiImageMap = map[string]string{
"cmii-admin-data": "5.5.0",
"cmii-admin-gateway": "5.5.0",
"cmii-admin-user": "5.5.0",
"cmii-app-release": "4.2.0-validation",
"cmii-live-operator": "5.2.0",
"cmii-open-gateway": "5.5.0",
"cmii-srs-oss-adaptor": "2023-SA",
"cmii-suav-platform-supervision": "5.5.0",
"cmii-suav-platform-supervisionh5": "5.5.0",
"cmii-suav-supervision": "5.4.0-032501",
"cmii-uav-airspace": "5.5.0",
"cmii-uav-alarm": "5.5.0",
"cmii-uav-autowaypoint": "4.2.0-beta",
"cmii-uav-brain": "5.5.0",
"cmii-uav-cloud-live": "5.5.0",
"cmii-uav-cms": "5.5.0",
"cmii-uav-data-post-process": "5.5.0",
"cmii-uav-developer": "5.5.0",
"cmii-uav-device": "5.5.0",
"cmii-uav-emergency": "5.3.0",
"cmii-uav-gateway": "5.5.0",
"cmii-uav-gis-server": "5.5.0",
"cmii-uav-grid-datasource": "5.2.0-24810",
"cmii-uav-grid-engine": "5.1.0",
"cmii-uav-grid-manage": "5.1.0",
"cmii-uav-industrial-portfolio": "5.5.0-041801",
"cmii-uav-integration": "5.5.0-0419",
"cmii-uav-kpi-monitor": "5.5.0",
"cmii-uav-logger": "5.5.0",
"cmii-uav-material-warehouse": "5.5.0",
"cmii-uav-mission": "5.5.0",
"cmii-uav-mqtthandler": "5.5.0",
"cmii-uav-multilink": "5.5.0",
"cmii-uav-notice": "5.5.0",
"cmii-uav-oauth": "5.5.0",
"cmii-uav-platform": "5.5.0",
"cmii-uav-platform-ai-brain": "5.5.0",
"cmii-uav-platform-armypeople": "5.5.0",
"cmii-uav-platform-base": "5.4.0",
"cmii-uav-platform-cms-portal": "5.5.0",
"cmii-uav-platform-detection": "5.5.0",
"cmii-uav-platform-jiangsuwenlv": "4.1.3-jiangsu-0427",
"cmii-uav-platform-logistics": "5.5.0",
"cmii-uav-platform-media": "5.5.0",
"cmii-uav-platform-multiterminal": "5.5.0",
"cmii-uav-platform-mws": "5.5.0",
"cmii-uav-platform-oms": "5.5.0",
"cmii-uav-platform-open": "5.5.0-0419",
"cmii-uav-platform-qinghaitourism": "4.1.0-21377-0508",
"cmii-uav-platform-security": "5.5.0",
"cmii-uav-platform-securityh5": "5.5.0",
"cmii-uav-platform-share": "5.5.0",
"cmii-uav-platform-splice": "5.5.0",
"cmii-uav-platform-threedsimulation": "5.2.0-21392",
"cmii-uav-process": "5.5.0",
"cmii-uav-surveillance": "5.5.0",
"cmii-uav-threedsimulation": "5.5.0",
"cmii-uav-tower": "5.5.0",
"cmii-uav-user": "5.5.0",
"cmii-uav-waypoint": "5.5.0",
}