From 421f53a8aa43d65d8d7e1bae762697bc074a2d59 Mon Sep 17 00:00:00 2001 From: zeaslity Date: Fri, 26 Apr 2024 15:57:28 +0800 Subject: [PATCH] [agent-deploy] - bug fix --- agent-common/utils/FileUtils.go | 1 + agent-operator/CmiiOperator.go | 10 +- agent-operator/CmiiOperator_test.go | 75 +- agent-operator/deploy/OctopusDeploy.go | 107 +- agent-operator/deploy/OctopusDeploy_test.go | 5 + agent-operator/deploy/c_app/DeployCmiiApp.go | 11 +- .../deploy/c_app/FrontendConfigMap.go | 4 + .../deploy/c_app/TemplateCmiiBackend.go | 12 +- .../deploy/c_app/TemplateCmiiFrontend.go | 9 - .../deploy/c_app/TemplateCmiiSRS.go | 16 +- .../deploy/c_app/TemplateIngressConfigMap.go | 5 +- agent-operator/deploy/z_file/k8s-backend.yaml | 5074 ++++++++++++++++- .../deploy/z_file/k8s-configmap.yaml | 470 +- .../deploy/z_file/k8s-frontend.yaml | 1845 +++++- agent-operator/deploy/z_file/k8s-srs.yaml | 16 +- agent-operator/image/CmiiImageSync.go | 24 +- agent-operator/image/CmiiImageSync_test.go | 10 +- agent-operator/real_project/zjjt/Config.go | 64 + .../script}/1-proxy-setup.ps1 | 0 port_forwarding/script/2-代理全部cmii端口.ps1 | 30 + .../script}/start-proxy.sh | 0 .../server/func/TestImageSyncScheduler.java | 2 +- 22 files changed, 7369 insertions(+), 421 deletions(-) create mode 100644 agent-operator/real_project/zjjt/Config.go rename {agent-operator/real_project/proxy_project/windows => port_forwarding/script}/1-proxy-setup.ps1 (100%) create mode 100644 port_forwarding/script/2-代理全部cmii端口.ps1 rename {agent-operator/real_project/proxy_project/linux => port_forwarding/script}/start-proxy.sh (100%) diff --git a/agent-common/utils/FileUtils.go b/agent-common/utils/FileUtils.go index 9a3c6d3..ae6553e 100644 --- a/agent-common/utils/FileUtils.go +++ b/agent-common/utils/FileUtils.go @@ -68,6 +68,7 @@ func AppendContentToFile(content string, targetFile string) bool { return true } +// AppendContentWithSplitLineToFile 专门为k8s的yaml文件设计的，在每次写入内容之前，先写入一行分隔符 func AppendContentWithSplitLineToFile(content string, targetFile string) bool { // 打开文件用于追加。如果文件不存在，将会创建一个新文件。 diff --git a/agent-operator/CmiiOperator.go b/agent-operator/CmiiOperator.go index 64121d6..244ab4f 100644 --- a/agent-operator/CmiiOperator.go +++ b/agent-operator/CmiiOperator.go @@ -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 diff --git a/agent-operator/CmiiOperator_test.go b/agent-operator/CmiiOperator_test.go index d945631..0aba9e8 100644 --- a/agent-operator/CmiiOperator_test.go +++ b/agent-operator/CmiiOperator_test.go @@ -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, } // 调用函数并获取结果。这里需要根据你的实际需求来验证返回的结果是否符合预期。 diff --git a/agent-operator/deploy/OctopusDeploy.go b/agent-operator/deploy/OctopusDeploy.go index 42d8146..cdddcbe 100644 --- a/agent-operator/deploy/OctopusDeploy.go +++ b/agent-operator/deploy/OctopusDeploy.go @@ -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 diff --git a/agent-operator/deploy/OctopusDeploy_test.go b/agent-operator/deploy/OctopusDeploy_test.go index c322da7..c22ee1b 100644 --- a/agent-operator/deploy/OctopusDeploy_test.go +++ b/agent-operator/deploy/OctopusDeploy_test.go @@ -6,3 +6,8 @@ func TestOctopusDeploy(t *testing.T) { OctopusDeploy() } + +func TestCmiiAppDeploy(t *testing.T) { + + CmiiAppDeploy() +} diff --git a/agent-operator/deploy/c_app/DeployCmiiApp.go b/agent-operator/deploy/c_app/DeployCmiiApp.go index 5bd0108..b2a68a0 100644 --- a/agent-operator/deploy/c_app/DeployCmiiApp.go +++ b/agent-operator/deploy/c_app/DeployCmiiApp.go @@ -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) +} diff --git a/agent-operator/deploy/c_app/FrontendConfigMap.go b/agent-operator/deploy/c_app/FrontendConfigMap.go index 5882fc8..0bebb72 100644 --- a/agent-operator/deploy/c_app/FrontendConfigMap.go +++ b/agent-operator/deploy/c_app/FrontendConfigMap.go @@ -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", } diff --git a/agent-operator/deploy/c_app/TemplateCmiiBackend.go b/agent-operator/deploy/c_app/TemplateCmiiBackend.go index a64e453..08f1608 100644 --- a/agent-operator/deploy/c_app/TemplateCmiiBackend.go +++ b/agent-operator/deploy/c_app/TemplateCmiiBackend.go @@ -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: diff --git a/agent-operator/deploy/c_app/TemplateCmiiFrontend.go b/agent-operator/deploy/c_app/TemplateCmiiFrontend.go index dace056..b85c7e9 100644 --- a/agent-operator/deploy/c_app/TemplateCmiiFrontend.go +++ b/agent-operator/deploy/c_app/TemplateCmiiFrontend.go @@ -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 }} diff --git a/agent-operator/deploy/c_app/TemplateCmiiSRS.go b/agent-operator/deploy/c_app/TemplateCmiiSRS.go index 929c68d..0324e24 100644 --- a/agent-operator/deploy/c_app/TemplateCmiiSRS.go +++ b/agent-operator/deploy/c_app/TemplateCmiiSRS.go @@ -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 diff --git a/agent-operator/deploy/c_app/TemplateIngressConfigMap.go b/agent-operator/deploy/c_app/TemplateIngressConfigMap.go index 0a29788..8e617b6 100644 --- a/agent-operator/deploy/c_app/TemplateIngressConfigMap.go +++ b/agent-operator/deploy/c_app/TemplateIngressConfigMap.go @@ -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; diff --git a/agent-operator/deploy/z_file/k8s-backend.yaml b/agent-operator/deploy/z_file/k8s-backend.yaml index 614fcbf..5eb4ab6 100644 --- a/agent-operator/deploy/z_file/k8s-backend.yaml +++ b/agent-operator/deploy/z_file/k8s-backend.yaml @@ -2,11 +2,11 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: cmii-admin-data + name: cmii-uav-grid-datasource namespace: zjjt labels: cmii.type: backend - cmii.app: cmii-admin-data + cmii.app: cmii-uav-grid-datasource octopus/control: backend-app-1.0.0 app.kubernetes.io/managed-by: octopus app.kubernetes.io/app-version: 5.5.0 @@ -18,12 +18,12 @@ spec: selector: matchLabels: cmii.type: backend - cmii.app: cmii-admin-data + cmii.app: cmii-uav-grid-datasource template: metadata: labels: cmii.type: backend - cmii.app: cmii-admin-data + cmii.app: cmii-uav-grid-datasource spec: affinity: nodeAffinity: @@ -37,14 +37,14 @@ spec: imagePullSecrets: - name: harborsecret containers: - - name: cmii-admin-data - image: 10.100.2.121:8033/cmii/cmii-admin-data:5.2.0 + - name: cmii-uav-grid-datasource + image: 10.100.2.121:8033/cmii/cmii-uav-grid-datasource:5.2.0-24810 imagePullPolicy: Always env: - name: K8S_NAMESPACE value: zjjt - name: APPLICATION_NAME - value: cmii-admin-data + value: cmii-uav-grid-datasource - name: CUST_JAVA_OPTS value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY @@ -70,7 +70,7 @@ spec: containerPort: 8080 protocol: TCP resources: - limits: . + limits: memory: 2Gi cpu: "2" requests: @@ -107,23 +107,23 @@ spec: successThreshold: 1 failureThreshold: 5 volumeMounts: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume mountPath: /cmii/logs readOnly: false - subPath: zjjt/cmii-admin-data + subPath: zjjt/cmii-uav-grid-datasource volumes: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume persistentVolumeClaim: - claimName: glusterfs-backend-log-pvc + claimName: nfs-backend-log-pvc --- apiVersion: v1 kind: Service metadata: - name: cmii-admin-data + name: cmii-uav-grid-datasource namespace: zjjt labels: cmii.type: backend - cmii.app: cmii-admin-data + cmii.app: cmii-uav-grid-datasource octopus/control: backend-app-1.0.0 app.kubernetes.io/managed-by: octopus app.kubernetes.io/app-version: 5.5.0 @@ -131,7 +131,7 @@ spec: type: ClusterIP selector: cmii.type: backend - cmii.app: cmii-admin-data + cmii.app: cmii-uav-grid-datasource ports: - name: backend-tcp port: 8080 @@ -141,11 +141,11 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: cmii-admin-gateway + name: cmii-suav-supervision namespace: zjjt labels: cmii.type: backend - cmii.app: cmii-admin-gateway + cmii.app: cmii-suav-supervision octopus/control: backend-app-1.0.0 app.kubernetes.io/managed-by: octopus app.kubernetes.io/app-version: 5.5.0 @@ -157,12 +157,12 @@ spec: selector: matchLabels: cmii.type: backend - cmii.app: cmii-admin-gateway + cmii.app: cmii-suav-supervision template: metadata: labels: cmii.type: backend - cmii.app: cmii-admin-gateway + cmii.app: cmii-suav-supervision spec: affinity: nodeAffinity: @@ -176,14 +176,14 @@ spec: imagePullSecrets: - name: harborsecret containers: - - name: cmii-admin-gateway - image: 10.100.2.121:8033/cmii/cmii-admin-gateway:5.2.0 + - name: cmii-suav-supervision + image: 10.100.2.121:8033/cmii/cmii-suav-supervision:5.4.0-032501 imagePullPolicy: Always env: - name: K8S_NAMESPACE value: zjjt - name: APPLICATION_NAME - value: cmii-admin-gateway + value: cmii-suav-supervision - name: CUST_JAVA_OPTS value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" - name: NACOS_REGISTRY @@ -209,7 +209,7 @@ spec: containerPort: 8080 protocol: TCP resources: - limits: . + limits: memory: 2Gi cpu: "2" requests: @@ -246,23 +246,23 @@ spec: successThreshold: 1 failureThreshold: 5 volumeMounts: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume mountPath: /cmii/logs readOnly: false - subPath: zjjt/cmii-admin-gateway + subPath: zjjt/cmii-suav-supervision volumes: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume persistentVolumeClaim: - claimName: glusterfs-backend-log-pvc + claimName: nfs-backend-log-pvc --- apiVersion: v1 kind: Service metadata: - name: cmii-admin-gateway + name: cmii-suav-supervision namespace: zjjt labels: cmii.type: backend - cmii.app: cmii-admin-gateway + cmii.app: cmii-suav-supervision octopus/control: backend-app-1.0.0 app.kubernetes.io/managed-by: octopus app.kubernetes.io/app-version: 5.5.0 @@ -270,7 +270,3343 @@ spec: type: ClusterIP selector: cmii.type: backend - cmii.app: cmii-admin-gateway + cmii.app: cmii-suav-supervision + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-developer + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-developer + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-developer + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-developer + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-developer + image: 10.100.2.121:8033/cmii/cmii-uav-developer:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-developer + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-developer + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-developer + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-developer + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-developer + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-tower + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-tower + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-tower + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-tower + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-tower + image: 10.100.2.121:8033/cmii/cmii-uav-tower:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-tower + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-tower + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-tower + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-tower + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-tower + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-oauth + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-oauth + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-oauth + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-oauth + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-oauth + image: 10.100.2.121:8033/cmii/cmii-uav-oauth:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-oauth + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-oauth + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-oauth + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-oauth + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-oauth + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-device + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-device + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-device + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-device + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-device + image: 10.100.2.121:8033/cmii/cmii-uav-device:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-device + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-device + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-device + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-device + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-device + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-threedsimulation + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-threedsimulation + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-threedsimulation + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-threedsimulation + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-threedsimulation + image: 10.100.2.121:8033/cmii/cmii-uav-threedsimulation:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-threedsimulation + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-threedsimulation + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-threedsimulation + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-threedsimulation + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-threedsimulation + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-mqtthandler + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-mqtthandler + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-mqtthandler + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-mqtthandler + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-mqtthandler + image: 10.100.2.121:8033/cmii/cmii-uav-mqtthandler:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-mqtthandler + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-mqtthandler + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-mqtthandler + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-mqtthandler + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-mqtthandler + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-app-release + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-app-release + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-app-release + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-app-release + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-app-release + image: 10.100.2.121:8033/cmii/cmii-app-release:4.2.0-validation + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-app-release + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-app-release + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-app-release + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-app-release + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-app-release + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-logger + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-logger + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-logger + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-logger + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-logger + image: 10.100.2.121:8033/cmii/cmii-uav-logger:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-logger + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-logger + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-logger + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-logger + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-logger + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-surveillance + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-surveillance + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-surveillance + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-surveillance + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-surveillance + image: 10.100.2.121:8033/cmii/cmii-uav-surveillance:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-surveillance + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-surveillance + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-surveillance + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-surveillance + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-surveillance + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-user + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-user + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-user + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-user + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-user + image: 10.100.2.121:8033/cmii/cmii-uav-user:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-user + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-user + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-user + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-user + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-user + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-srs-oss-adaptor + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-srs-oss-adaptor + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-srs-oss-adaptor + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-srs-oss-adaptor + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-srs-oss-adaptor + image: 10.100.2.121:8033/cmii/cmii-srs-oss-adaptor:2023-SA + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-srs-oss-adaptor + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-srs-oss-adaptor + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-srs-oss-adaptor + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-srs-oss-adaptor + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-srs-oss-adaptor + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-gis-server + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-gis-server + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-gis-server + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-gis-server + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-gis-server + image: 10.100.2.121:8033/cmii/cmii-uav-gis-server:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-gis-server + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-gis-server + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-gis-server + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-gis-server + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-gis-server + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-open-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-open-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-open-gateway + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-open-gateway + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-open-gateway + image: 10.100.2.121:8033/cmii/cmii-open-gateway:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-open-gateway + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-open-gateway + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-open-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-open-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-open-gateway + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-autowaypoint + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-autowaypoint + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-autowaypoint + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-autowaypoint + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-autowaypoint + image: 10.100.2.121:8033/cmii/cmii-uav-autowaypoint:4.2.0-beta + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-autowaypoint + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-autowaypoint + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-autowaypoint + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-autowaypoint + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-autowaypoint + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-grid-manage + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-manage + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-grid-manage + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-manage + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-grid-manage + image: 10.100.2.121:8033/cmii/cmii-uav-grid-manage:5.1.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-grid-manage + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-grid-manage + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-grid-manage + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-manage + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-grid-manage + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-alarm + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-alarm + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-alarm + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-alarm + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-alarm + image: 10.100.2.121:8033/cmii/cmii-uav-alarm:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-alarm + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-alarm + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-alarm + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-alarm + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-alarm + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-gateway + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-gateway + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-gateway + image: 10.100.2.121:8033/cmii/cmii-uav-gateway:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-gateway + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-gateway + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-gateway + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-industrial-portfolio + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-industrial-portfolio + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-industrial-portfolio + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-industrial-portfolio + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-industrial-portfolio + image: 10.100.2.121:8033/cmii/cmii-uav-industrial-portfolio:5.5.0-041801 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-industrial-portfolio + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-industrial-portfolio + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-industrial-portfolio + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-industrial-portfolio + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-industrial-portfolio + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-process + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-process + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-process + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-process + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-process + image: 10.100.2.121:8033/cmii/cmii-uav-process:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-process + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-process + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-process + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-process + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-process + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-kpi-monitor + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-kpi-monitor + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-kpi-monitor + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-kpi-monitor + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-kpi-monitor + image: 10.100.2.121:8033/cmii/cmii-uav-kpi-monitor:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-kpi-monitor + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-kpi-monitor + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-kpi-monitor + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-kpi-monitor + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-kpi-monitor + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-waypoint + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-waypoint + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-waypoint + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-waypoint + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-waypoint + image: 10.100.2.121:8033/cmii/cmii-uav-waypoint:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-waypoint + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-waypoint + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-waypoint + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-waypoint + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-waypoint + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-integration + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-integration + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-integration + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-integration + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-integration + image: 10.100.2.121:8033/cmii/cmii-uav-integration:5.5.0-0419 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-integration + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-integration + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-integration + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-integration + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-integration + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-notice + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-notice + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-notice + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-notice + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-notice + image: 10.100.2.121:8033/cmii/cmii-uav-notice:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-notice + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-notice + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-notice + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-notice + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-notice + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-material-warehouse + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-material-warehouse + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-material-warehouse + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-material-warehouse + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-material-warehouse + image: 10.100.2.121:8033/cmii/cmii-uav-material-warehouse:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-material-warehouse + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-material-warehouse + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-material-warehouse + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-material-warehouse + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-material-warehouse ports: - name: backend-tcp port: 8080 @@ -316,7 +3652,7 @@ spec: - name: harborsecret containers: - name: cmii-admin-user - image: 10.100.2.121:8033/cmii/cmii-admin-user:5.2.0 + image: 10.100.2.121:8033/cmii/cmii-admin-user:5.5.0 imagePullPolicy: Always env: - name: K8S_NAMESPACE @@ -348,7 +3684,7 @@ spec: containerPort: 8080 protocol: TCP resources: - limits: . + limits: memory: 2Gi cpu: "2" requests: @@ -385,14 +3721,14 @@ spec: successThreshold: 1 failureThreshold: 5 volumeMounts: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume mountPath: /cmii/logs readOnly: false subPath: zjjt/cmii-admin-user volumes: - - name: glusterfs-backend-log-volume + - name: nfs-backend-log-volume persistentVolumeClaim: - claimName: glusterfs-backend-log-pvc + claimName: nfs-backend-log-pvc --- apiVersion: v1 kind: Service @@ -415,3 +3751,1671 @@ spec: port: 8080 protocol: TCP targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-multilink + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-multilink + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-multilink + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-multilink + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-multilink + image: 10.100.2.121:8033/cmii/cmii-uav-multilink:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-multilink + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-multilink + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-multilink + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-multilink + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-multilink + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-live-operator + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-live-operator + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-live-operator + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-live-operator + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-live-operator + image: 10.100.2.121:8033/cmii/cmii-live-operator:5.2.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-live-operator + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-live-operator + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-live-operator + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-live-operator + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-live-operator + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-airspace + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-airspace + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-airspace + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-airspace + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-airspace + image: 10.100.2.121:8033/cmii/cmii-uav-airspace:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-airspace + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-airspace + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-airspace + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-airspace + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-airspace + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-grid-engine + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-engine + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-grid-engine + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-engine + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-grid-engine + image: 10.100.2.121:8033/cmii/cmii-uav-grid-engine:5.1.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-grid-engine + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-grid-engine + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-grid-engine + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-grid-engine + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-grid-engine + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-emergency + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-emergency + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-emergency + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-emergency + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-emergency + image: 10.100.2.121:8033/cmii/cmii-uav-emergency:5.3.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-emergency + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-emergency + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-emergency + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-emergency + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-emergency + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-data-post-process + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-data-post-process + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-data-post-process + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-data-post-process + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-data-post-process + image: 10.100.2.121:8033/cmii/cmii-uav-data-post-process:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-data-post-process + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-data-post-process + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-data-post-process + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-data-post-process + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-data-post-process + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-admin-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-admin-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-admin-gateway + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-admin-gateway + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-admin-gateway + image: 10.100.2.121:8033/cmii/cmii-admin-gateway:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-admin-gateway + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-admin-gateway + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-admin-gateway + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-admin-gateway + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-admin-gateway + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-brain + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-brain + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-brain + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-brain + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-brain + image: 10.100.2.121:8033/cmii/cmii-uav-brain:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-brain + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-brain + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-brain + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-brain + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-brain + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-mission + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-mission + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-mission + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-mission + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-mission + image: 10.100.2.121:8033/cmii/cmii-uav-mission:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-mission + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-mission + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-mission + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-mission + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-mission + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-cms + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-cms + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-cms + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-cms + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-cms + image: 10.100.2.121:8033/cmii/cmii-uav-cms:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-cms + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-cms + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-cms + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-cms + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-cms + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-admin-data + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-admin-data + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-admin-data + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-admin-data + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-admin-data + image: 10.100.2.121:8033/cmii/cmii-admin-data:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-admin-data + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-admin-data + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-admin-data + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-admin-data + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-admin-data + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-cloud-live + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-cloud-live + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: backend + cmii.app: cmii-uav-cloud-live + template: + metadata: + labels: + cmii.type: backend + cmii.app: cmii-uav-cloud-live + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: uavcloud.env + operator: In + values: + - demo + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-cloud-live + image: 10.100.2.121:8033/cmii/cmii-uav-cloud-live:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-cloud-live + - name: CUST_JAVA_OPTS + value: "-Xms500m -Xmx1500m -Dlog4j2.formatMsgNoLookups=true" + - name: NACOS_REGISTRY + value: "helm-nacos:8848" + - name: NACOS_DISCOVERY_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: NACOS_DISCOVERY_PORT + value: "8080" + - name: BIZ_CONFIG_GROUP + value: 5.5.0 + - name: SYS_CONFIG_GROUP + value: 5.5.0 + - name: IMAGE_VERSION + value: 5.5.0 + - name: NACOS_USERNAME + value: "developer" + - name: NACOS_PASSWORD + value: "Deve@9128201" + ports: + - name: pod-port + containerPort: 8080 + protocol: TCP + resources: + limits: + memory: 2Gi + cpu: "2" + requests: + memory: 1Gi + cpu: 200m + livenessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + readinessProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: /cmii/ping + port: pod-port + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 3 + periodSeconds: 20 + successThreshold: 1 + failureThreshold: 5 + volumeMounts: + - name: nfs-backend-log-volume + mountPath: /cmii/logs + readOnly: false + subPath: zjjt/cmii-uav-cloud-live + volumes: + - name: nfs-backend-log-volume + persistentVolumeClaim: + claimName: nfs-backend-log-pvc +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-cloud-live + namespace: zjjt + labels: + cmii.type: backend + cmii.app: cmii-uav-cloud-live + octopus/control: backend-app-1.0.0 + app.kubernetes.io/managed-by: octopus + app.kubernetes.io/app-version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: backend + cmii.app: cmii-uav-cloud-live + ports: + - name: backend-tcp + port: 8080 + protocol: TCP + targetPort: 8080 diff --git a/agent-operator/deploy/z_file/k8s-configmap.yaml b/agent-operator/deploy/z_file/k8s-configmap.yaml index e6e15bb..ab0062a 100644 --- a/agent-operator/deploy/z_file/k8s-configmap.yaml +++ b/agent-operator/deploy/z_file/k8s-configmap.yaml @@ -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" + } diff --git a/agent-operator/deploy/z_file/k8s-frontend.yaml b/agent-operator/deploy/z_file/k8s-frontend.yaml index 0332c1d..a91ba11 100644 --- a/agent-operator/deploy/z_file/k8s-frontend.yaml +++ b/agent-operator/deploy/z_file/k8s-frontend.yaml @@ -1,12 +1,52 @@ --- +kind: ConfigMap +apiVersion: v1 +metadata: + name: nginx-cm + namespace: zjjt + labels: + cmii.type: frontend +data: + nginx.conf: | + user root; + worker_processes auto; + + events { + worker_connections 1024; + } + http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + + keepalive_timeout 600; + + server { + listen 9528; + server_name localhost; + gzip on; + + location / { + root /home/cmii-platform/dist; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } + } +--- apiVersion: apps/v1 kind: Deployment metadata: - name: cmii-admin-web + name: cmii-uav-platform-mws namespace: zjjt labels: cmii.type: frontend - cmii.app: cmii-admin-web + cmii.app: cmii-uav-platform-mws octopus.control: frontend-app-wdd app.kubernetes.io/app-version: 5.5.0 spec: @@ -17,24 +57,24 @@ spec: selector: matchLabels: cmii.type: frontend - cmii.app: cmii-admin-web + cmii.app: cmii-uav-platform-mws template: metadata: labels: cmii.type: frontend - cmii.app: cmii-admin-web + cmii.app: cmii-uav-platform-mws spec: imagePullSecrets: - name: harborsecret containers: - - name: cmii-admin-web - image: 10.100.2.121:8033/cmii/cmii-admin-web:5.2.0 + - name: cmii-uav-platform-mws + image: 10.100.2.121:8033/cmii/cmii-uav-platform-mws:5.5.0 imagePullPolicy: Always env: - name: K8S_NAMESPACE value: zjjt - name: APPLICATION_NAME - value: cmii-admin-web + value: cmii-uav-platform-mws ports: - name: platform-9528 containerPort: 9528 @@ -50,9 +90,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 @@ -63,12 +100,1074 @@ spec: items: - key: nginx.conf path: nginx.conf - - name: default-nginx-conf + - name: tenant-prefix configMap: - name: default-nginx-cm + name: tenant-prefix-mws items: - - key: default.conf - path: default.conf + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-mws + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-mws + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-mws + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-suav-platform-supervisionh5 + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervisionh5 + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervisionh5 + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervisionh5 + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-suav-platform-supervisionh5 + image: 10.100.2.121:8033/cmii/cmii-suav-platform-supervisionh5:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-suav-platform-supervisionh5 + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-supervisionh5 + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-suav-platform-supervisionh5 + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervisionh5 + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervisionh5 + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-jiangsuwenlv + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-jiangsuwenlv + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-jiangsuwenlv + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-jiangsuwenlv + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-jiangsuwenlv + image: 10.100.2.121:8033/cmii/cmii-uav-platform-jiangsuwenlv:4.1.3-jiangsu-0427 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-jiangsuwenlv + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-jiangsuwenlv + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-jiangsuwenlv + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-jiangsuwenlv + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-jiangsuwenlv + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-oms + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-oms + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-oms + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-oms + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-oms + image: 10.100.2.121:8033/cmii/cmii-uav-platform-oms:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-oms + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-oms + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-oms + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-oms + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-oms + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-threedsimulation + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-threedsimulation + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-threedsimulation + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-threedsimulation + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-threedsimulation + image: 10.100.2.121:8033/cmii/cmii-uav-platform-threedsimulation:5.2.0-21392 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-threedsimulation + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-threedsimulation + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-threedsimulation + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-threedsimulation + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-threedsimulation + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-base + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-base + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-base + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-base + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-base + image: 10.100.2.121:8033/cmii/cmii-uav-platform-base:5.4.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-base + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-base + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-base + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-base + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-base + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-splice + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-splice + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-splice + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-splice + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-splice + image: 10.100.2.121:8033/cmii/cmii-uav-platform-splice:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-splice + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-splice + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-splice + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-splice + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-splice + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-multiterminal + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-multiterminal + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-multiterminal + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-multiterminal + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-multiterminal + image: 10.100.2.121:8033/cmii/cmii-uav-platform-multiterminal:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-multiterminal + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-multiterminal + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-multiterminal + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-multiterminal + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-multiterminal + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-media + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-media + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-media + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-media + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-media + image: 10.100.2.121:8033/cmii/cmii-uav-platform-media:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-media + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-media + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-media + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-media + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-media + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-suav-platform-supervision + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervision + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervision + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervision + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-suav-platform-supervision + image: 10.100.2.121:8033/cmii/cmii-suav-platform-supervision:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-suav-platform-supervision + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-supervision + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-suav-platform-supervision + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervision + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-suav-platform-supervision + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-armypeople + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-armypeople + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-armypeople + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-armypeople + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-armypeople + image: 10.100.2.121:8033/cmii/cmii-uav-platform-armypeople:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-armypeople + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-armypeople + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-armypeople + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-armypeople + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-armypeople + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-securityh5 + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-securityh5 + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-securityh5 + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-securityh5 + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-securityh5 + image: 10.100.2.121:8033/cmii/cmii-uav-platform-securityh5:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-securityh5 + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-securityh5 + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-securityh5 + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-securityh5 + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-securityh5 + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-open + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-open + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-open + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-open + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-open + image: 10.100.2.121:8033/cmii/cmii-uav-platform-open:5.5.0-0419 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-open + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf - name: tenant-prefix configMap: name: tenant-prefix-open @@ -79,18 +1178,730 @@ spec: apiVersion: v1 kind: Service metadata: - name: cmii-admin-web + name: cmii-uav-platform-open namespace: zjjt labels: cmii.type: frontend - cmii.app: cmii-admin-web + cmii.app: cmii-uav-platform-open octopus.control: frontend-app-wdd app.kubernetes.io/version: 5.5.0 spec: type: ClusterIP selector: cmii.type: frontend - cmii.app: cmii-admin-web + cmii.app: cmii-uav-platform-open + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-cms-portal + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-cms-portal + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-cms-portal + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-cms-portal + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-cms-portal + image: 10.100.2.121:8033/cmii/cmii-uav-platform-cms-portal:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-cms-portal + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-cmsportal + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-cms-portal + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-cms-portal + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-cms-portal + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform + image: 10.100.2.121:8033/cmii/cmii-uav-platform:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-platform + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-qinghaitourism + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-qinghaitourism + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-qinghaitourism + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-qinghaitourism + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-qinghaitourism + image: 10.100.2.121:8033/cmii/cmii-uav-platform-qinghaitourism:4.1.0-21377-0508 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-qinghaitourism + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-qinghaitourism + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-qinghaitourism + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-qinghaitourism + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-qinghaitourism + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-detection + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-detection + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-detection + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-detection + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-detection + image: 10.100.2.121:8033/cmii/cmii-uav-platform-detection:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-detection + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-detection + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-detection + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-detection + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-detection + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-share + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-share + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-share + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-share + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-share + image: 10.100.2.121:8033/cmii/cmii-uav-platform-share:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-share + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-share + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-share + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-share + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-share + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-ai-brain + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-ai-brain + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-ai-brain + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-ai-brain + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-ai-brain + image: 10.100.2.121:8033/cmii/cmii-uav-platform-ai-brain:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-ai-brain + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-ai-brain + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-ai-brain + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-ai-brain + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-ai-brain + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-security + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-security + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-security + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-security + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-security + image: 10.100.2.121:8033/cmii/cmii-uav-platform-security:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-security + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-security + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-security + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-security + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-security + ports: + - name: web-svc-port + port: 9528 + protocol: TCP + targetPort: 9528 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cmii-uav-platform-logistics + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-logistics + octopus.control: frontend-app-wdd + app.kubernetes.io/app-version: 5.5.0 +spec: + replicas: 1 + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + cmii.type: frontend + cmii.app: cmii-uav-platform-logistics + template: + metadata: + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-logistics + spec: + imagePullSecrets: + - name: harborsecret + containers: + - name: cmii-uav-platform-logistics + image: 10.100.2.121:8033/cmii/cmii-uav-platform-logistics:5.5.0 + imagePullPolicy: Always + env: + - name: K8S_NAMESPACE + value: zjjt + - name: APPLICATION_NAME + value: cmii-uav-platform-logistics + ports: + - name: platform-9528 + containerPort: 9528 + protocol: TCP + resources: + limits: + cpu: "1" + memory: 1Gi + requests: + cpu: 500m + memory: 500Mi + volumeMounts: + - name: nginx-conf + mountPath: /usr/local/nginx/conf/nginx.conf + subPath: nginx.conf + - name: tenant-prefix + subPath: ingress-config.js + mountPath: /home/cmii-platform/dist/ingress-config.js + volumes: + - name: nginx-conf + configMap: + name: nginx-cm + items: + - key: nginx.conf + path: nginx.conf + - name: tenant-prefix + configMap: + name: tenant-prefix-logistics + items: + - key: ingress-config.js + path: ingress-config.js +--- +apiVersion: v1 +kind: Service +metadata: + name: cmii-uav-platform-logistics + namespace: zjjt + labels: + cmii.type: frontend + cmii.app: cmii-uav-platform-logistics + octopus.control: frontend-app-wdd + app.kubernetes.io/version: 5.5.0 +spec: + type: ClusterIP + selector: + cmii.type: frontend + cmii.app: cmii-uav-platform-logistics ports: - name: web-svc-port port: 9528 diff --git a/agent-operator/deploy/z_file/k8s-srs.yaml b/agent-operator/deploy/z_file/k8s-srs.yaml index 66fc976..60bb62c 100644 --- a/agent-operator/deploy/z_file/k8s-srs.yaml +++ b/agent-operator/deploy/z_file/k8s-srs.yaml @@ -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 diff --git a/agent-operator/image/CmiiImageSync.go b/agent-operator/image/CmiiImageSync.go index 5fba63b..c332b08 100644 --- a/agent-operator/image/CmiiImageSync.go +++ b/agent-operator/image/CmiiImageSync.go @@ -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 == "" { diff --git a/agent-operator/image/CmiiImageSync_test.go b/agent-operator/image/CmiiImageSync_test.go index d9efe37..333840e 100644 --- a/agent-operator/image/CmiiImageSync_test.go +++ b/agent-operator/image/CmiiImageSync_test.go @@ -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) +} diff --git a/agent-operator/real_project/zjjt/Config.go b/agent-operator/real_project/zjjt/Config.go new file mode 100644 index 0000000..78cc679 --- /dev/null +++ b/agent-operator/real_project/zjjt/Config.go @@ -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", +} diff --git a/agent-operator/real_project/proxy_project/windows/1-proxy-setup.ps1 b/port_forwarding/script/1-proxy-setup.ps1 similarity index 100% rename from agent-operator/real_project/proxy_project/windows/1-proxy-setup.ps1 rename to port_forwarding/script/1-proxy-setup.ps1 diff --git a/port_forwarding/script/2-代理全部cmii端口.ps1 b/port_forwarding/script/2-代理全部cmii端口.ps1 new file mode 100644 index 0000000..65ff592 --- /dev/null +++ b/port_forwarding/script/2-代理全部cmii端口.ps1 @@ -0,0 +1,30 @@ +Set-ExecutionPolicy RemoteSigned -Scope CurrentUser + +$basePath = $PWD + +$remoteHost = "10.100.2.121" + +Write-Host "Current Running Path is $basePath" +Write-Host "Connecting to remote host is $remoteHost" +# 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 "tcp listen:0.0.0.0:8888: conn:$remoteHost:8888" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:8889 conn:$remoteHost:8889" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:9000 conn:$remoteHost:9000" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:30554 conn:$remoteHost:30554" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:30557 conn:$remoteHost:30557" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:38989 conn:$remoteHost:38989" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "tcp listen:0.0.0.0:31935 conn:$remoteHost:31935" -Verb RunAs +Start-Process -FilePath "$basePath\port_win64.exe" -ArgumentList "udp listen:0.0.0.0:30090 conn:$remoteHost:30090" -Verb RunAs + + + +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:8888: conn:10.100.2.121:8888 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:8889 conn:10.100.2.121:8889 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:9000 conn:10.100.2.121:9000 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:30554 conn:10.100.2.121:30554 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:30557 conn:10.100.2.121:30557 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:38989 conn:10.100.2.121:38989 +C:\Users\SuperDD\Desktop\port_win64.exe tcp listen:10.250.0.20:30935 conn:10.100.2.121:30935 +C:\Users\SuperDD\Desktop\port_win64.exe udp listen:10.250.0.20:30090 conn:10.100.2.121:30090 \ No newline at end of file diff --git a/agent-operator/real_project/proxy_project/linux/start-proxy.sh b/port_forwarding/script/start-proxy.sh similarity index 100% rename from agent-operator/real_project/proxy_project/linux/start-proxy.sh rename to port_forwarding/script/start-proxy.sh diff --git a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java index ee7a6d1..8774be7 100644 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -44,7 +44,7 @@ public class TestImageSyncScheduler { ArrayList ImageFullNameList = new ArrayList<>(List.of( // "harbor.cdcyy.com.cn/cmii/cmii-live-operator:5.2.0", // "harbor.cdcyy.com.cn/cmii/cmii/srs:v5.0.195" - "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-042503" + "harbor.cdcyy.com.cn/cmii/cmii-uav-industrial-portfolio:5.4.0-cqly-042601" )); Boolean downloadAndCompressOnly = false;