From 4d44a9eac106131e36ccda6940bde6322075b61c Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 11 Jun 2024 14:01:28 +0800 Subject: [PATCH] [agent-deploy] - modify deploy project --- .../deploy => agent-deploy}/OctopusDeploy.go | 12 +++---- .../OctopusDeploy_test.go | 2 +- .../a_dashboard/DeployK8sDashboard.go | 2 +- .../a_dashboard/TemplateK8SDashboard.go | 0 .../a_nfs/DeployNFS.go | 2 +- .../a_nfs/TemplateNFS.go | 0 .../a_nfs/TemplateNFSTest.go | 0 .../b_middle/CmiiEmqxTemplate.go | 0 .../b_middle/CmiiMongoTemplate.go | 0 .../b_middle/CmiiMySQLTemplate.go | 0 .../b_middle/CmiiNacosTemplate.go | 0 .../b_middle/CmiiRabbitMQTemplate.go | 0 .../b_middle/CmiiRedisTemplate.go | 0 .../b_middle/DeployMiddleware.go | 2 +- .../b_middle/TemplateCmiiPVC.go | 0 .../c_app/DeployCmiiApp.go | 2 +- .../c_app/DeployCmiiApp_test.go | 0 .../c_app/FrontendConfigMap.go | 0 .../c_app/TemplateCmiiBackend.go | 0 .../c_app/TemplateCmiiFrontend.go | 0 .../c_app/TemplateCmiiSRS.go | 0 .../c_app/TemplateIngressConfigMap.go | 0 agent-deploy/go.mod | 23 +++++++++++++ agent-deploy/go.sum | 34 +++++++++++++++++++ .../z_5.5.0/k8s-backend.yaml | 0 .../z_5.5.0/k8s-configmap.yaml | 0 .../z_5.5.0/k8s-dashboard.yaml | 0 .../z_5.5.0/k8s-emqx.yaml | 0 .../z_5.5.0/k8s-frontend.yaml | 0 .../z_5.5.0/k8s-ingress.yaml | 0 .../z_5.5.0/k8s-mongo.yaml | 0 .../z_5.5.0/k8s-mysql.yaml | 0 .../z_5.5.0/k8s-nacos.yaml | 0 .../z_5.5.0/k8s-nfs-test.yaml | 0 .../z_5.5.0/k8s-nfs.yaml | 0 .../z_5.5.0/k8s-pvc.yaml | 0 .../z_5.5.0/k8s-rabbitmq.yaml | 0 .../z_5.5.0/k8s-redis.yaml | 0 .../z_5.5.0/k8s-srs.yaml | 0 .../deploy => agent-deploy}/z_dep/G.go | 0 .../z_file/k8s-backend.yaml | 0 .../z_file/k8s-configmap.yaml | 0 .../z_file/k8s-dashboard.yaml | 0 .../z_file/k8s-emqx.yaml | 0 .../z_file/k8s-frontend.yaml | 0 .../z_file/k8s-ingress.yaml | 0 .../z_file/k8s-mongo.yaml | 0 .../z_file/k8s-mysql.yaml | 0 .../z_file/k8s-nacos.yaml | 0 .../z_file/k8s-nfs-test.yaml | 0 .../z_file/k8s-nfs.yaml | 0 .../z_file/k8s-pvc.yaml | 0 .../z_file/k8s-rabbitmq.yaml | 0 .../z_file/k8s-redis.yaml | 0 .../z_file/k8s-srs.yaml | 0 .../z_xjyd/k8s-backend.yaml | 0 .../z_xjyd/k8s-configmap.yaml | 0 .../z_xjyd/k8s-dashboard.yaml | 0 .../z_xjyd/k8s-emqx.yaml | 0 .../z_xjyd/k8s-frontend.yaml | 0 .../z_xjyd/k8s-ingress.yaml | 0 .../z_xjyd/k8s-mongo.yaml | 0 .../z_xjyd/k8s-mysql.yaml | 0 .../z_xjyd/k8s-nacos.yaml | 0 .../z_xjyd/k8s-nfs-test.yaml | 0 .../z_xjyd/k8s-nfs.yaml | 0 .../z_xjyd/k8s-pvc.yaml | 0 .../z_xjyd/k8s-rabbitmq.yaml | 0 .../z_xjyd/k8s-redis.yaml | 0 .../z_xjyd/k8s-srs.yaml | 0 agent-operator/CmiiK8sConfig.go | 4 +++ agent-operator/CmiiK8sOperator_test.go | 4 +-- server/src/main/resources/application.yml | 6 ++-- .../server/func/TestImageSyncScheduler.java | 11 +++--- 74 files changed, 83 insertions(+), 21 deletions(-) rename {agent-operator/deploy => agent-deploy}/OctopusDeploy.go (95%) rename {agent-operator/deploy => agent-deploy}/OctopusDeploy_test.go (86%) rename {agent-operator/deploy => agent-deploy}/a_dashboard/DeployK8sDashboard.go (92%) rename {agent-operator/deploy => agent-deploy}/a_dashboard/TemplateK8SDashboard.go (100%) rename {agent-operator/deploy => agent-deploy}/a_nfs/DeployNFS.go (95%) rename {agent-operator/deploy => agent-deploy}/a_nfs/TemplateNFS.go (100%) rename {agent-operator/deploy => agent-deploy}/a_nfs/TemplateNFSTest.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiEmqxTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiMongoTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiMySQLTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiNacosTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiRabbitMQTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/CmiiRedisTemplate.go (100%) rename {agent-operator/deploy => agent-deploy}/b_middle/DeployMiddleware.go (98%) rename {agent-operator/deploy => agent-deploy}/b_middle/TemplateCmiiPVC.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/DeployCmiiApp.go (99%) rename {agent-operator/deploy => agent-deploy}/c_app/DeployCmiiApp_test.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/FrontendConfigMap.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/TemplateCmiiBackend.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/TemplateCmiiFrontend.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/TemplateCmiiSRS.go (100%) rename {agent-operator/deploy => agent-deploy}/c_app/TemplateIngressConfigMap.go (100%) create mode 100644 agent-deploy/go.mod create mode 100644 agent-deploy/go.sum rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-backend.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-configmap.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-dashboard.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-emqx.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-frontend.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-ingress.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-mongo.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-mysql.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-nacos.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-nfs-test.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-nfs.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-pvc.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-rabbitmq.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-redis.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_5.5.0/k8s-srs.yaml (100%) mode change 100755 => 100644 rename {agent-operator/deploy => agent-deploy}/z_dep/G.go (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-backend.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-configmap.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-dashboard.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-emqx.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-frontend.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-ingress.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-mongo.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-mysql.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-nacos.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-nfs-test.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-nfs.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-pvc.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-rabbitmq.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-redis.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_file/k8s-srs.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-backend.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-configmap.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-dashboard.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-emqx.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-frontend.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-ingress.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-mongo.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-mysql.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-nacos.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-nfs-test.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-nfs.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-pvc.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-rabbitmq.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-redis.yaml (100%) rename {agent-operator/deploy => agent-deploy}/z_xjyd/k8s-srs.yaml (100%) diff --git a/agent-operator/deploy/OctopusDeploy.go b/agent-deploy/OctopusDeploy.go similarity index 95% rename from agent-operator/deploy/OctopusDeploy.go rename to agent-deploy/OctopusDeploy.go index 5fd1cb0..4eae8c6 100644 --- a/agent-operator/deploy/OctopusDeploy.go +++ b/agent-deploy/OctopusDeploy.go @@ -1,14 +1,14 @@ -package deploy +package agent_deploy import ( "os" image2 "wdd.io/agent-common/image" "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-deploy/a_dashboard" + "wdd.io/agent-deploy/a_nfs" + "wdd.io/agent-deploy/b_middle" + "wdd.io/agent-deploy/c_app" + "wdd.io/agent-deploy/z_dep" ) var log = logger.Log diff --git a/agent-operator/deploy/OctopusDeploy_test.go b/agent-deploy/OctopusDeploy_test.go similarity index 86% rename from agent-operator/deploy/OctopusDeploy_test.go rename to agent-deploy/OctopusDeploy_test.go index c22ee1b..0195887 100644 --- a/agent-operator/deploy/OctopusDeploy_test.go +++ b/agent-deploy/OctopusDeploy_test.go @@ -1,4 +1,4 @@ -package deploy +package agent_deploy import "testing" diff --git a/agent-operator/deploy/a_dashboard/DeployK8sDashboard.go b/agent-deploy/a_dashboard/DeployK8sDashboard.go similarity index 92% rename from agent-operator/deploy/a_dashboard/DeployK8sDashboard.go rename to agent-deploy/a_dashboard/DeployK8sDashboard.go index 15d19b0..ead289e 100644 --- a/agent-operator/deploy/a_dashboard/DeployK8sDashboard.go +++ b/agent-deploy/a_dashboard/DeployK8sDashboard.go @@ -2,7 +2,7 @@ package a_dashboard import ( "wdd.io/agent-common/logger" - "wdd.io/agent-operator/deploy/z_dep" + "wdd.io/agent-deploy/z_dep" ) var ( diff --git a/agent-operator/deploy/a_dashboard/TemplateK8SDashboard.go b/agent-deploy/a_dashboard/TemplateK8SDashboard.go similarity index 100% rename from agent-operator/deploy/a_dashboard/TemplateK8SDashboard.go rename to agent-deploy/a_dashboard/TemplateK8SDashboard.go diff --git a/agent-operator/deploy/a_nfs/DeployNFS.go b/agent-deploy/a_nfs/DeployNFS.go similarity index 95% rename from agent-operator/deploy/a_nfs/DeployNFS.go rename to agent-deploy/a_nfs/DeployNFS.go index 9e88a0d..dd432c5 100644 --- a/agent-operator/deploy/a_nfs/DeployNFS.go +++ b/agent-deploy/a_nfs/DeployNFS.go @@ -2,7 +2,7 @@ package a_nfs import ( "wdd.io/agent-common/logger" - "wdd.io/agent-operator/deploy/z_dep" + "wdd.io/agent-deploy/z_dep" ) var ( diff --git a/agent-operator/deploy/a_nfs/TemplateNFS.go b/agent-deploy/a_nfs/TemplateNFS.go similarity index 100% rename from agent-operator/deploy/a_nfs/TemplateNFS.go rename to agent-deploy/a_nfs/TemplateNFS.go diff --git a/agent-operator/deploy/a_nfs/TemplateNFSTest.go b/agent-deploy/a_nfs/TemplateNFSTest.go similarity index 100% rename from agent-operator/deploy/a_nfs/TemplateNFSTest.go rename to agent-deploy/a_nfs/TemplateNFSTest.go diff --git a/agent-operator/deploy/b_middle/CmiiEmqxTemplate.go b/agent-deploy/b_middle/CmiiEmqxTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiEmqxTemplate.go rename to agent-deploy/b_middle/CmiiEmqxTemplate.go diff --git a/agent-operator/deploy/b_middle/CmiiMongoTemplate.go b/agent-deploy/b_middle/CmiiMongoTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiMongoTemplate.go rename to agent-deploy/b_middle/CmiiMongoTemplate.go diff --git a/agent-operator/deploy/b_middle/CmiiMySQLTemplate.go b/agent-deploy/b_middle/CmiiMySQLTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiMySQLTemplate.go rename to agent-deploy/b_middle/CmiiMySQLTemplate.go diff --git a/agent-operator/deploy/b_middle/CmiiNacosTemplate.go b/agent-deploy/b_middle/CmiiNacosTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiNacosTemplate.go rename to agent-deploy/b_middle/CmiiNacosTemplate.go diff --git a/agent-operator/deploy/b_middle/CmiiRabbitMQTemplate.go b/agent-deploy/b_middle/CmiiRabbitMQTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiRabbitMQTemplate.go rename to agent-deploy/b_middle/CmiiRabbitMQTemplate.go diff --git a/agent-operator/deploy/b_middle/CmiiRedisTemplate.go b/agent-deploy/b_middle/CmiiRedisTemplate.go similarity index 100% rename from agent-operator/deploy/b_middle/CmiiRedisTemplate.go rename to agent-deploy/b_middle/CmiiRedisTemplate.go diff --git a/agent-operator/deploy/b_middle/DeployMiddleware.go b/agent-deploy/b_middle/DeployMiddleware.go similarity index 98% rename from agent-operator/deploy/b_middle/DeployMiddleware.go rename to agent-deploy/b_middle/DeployMiddleware.go index b9d39ec..2e68d05 100644 --- a/agent-operator/deploy/b_middle/DeployMiddleware.go +++ b/agent-deploy/b_middle/DeployMiddleware.go @@ -2,7 +2,7 @@ package b_middle import ( "wdd.io/agent-common/logger" - "wdd.io/agent-operator/deploy/z_dep" + "wdd.io/agent-deploy/z_dep" ) var ( diff --git a/agent-operator/deploy/b_middle/TemplateCmiiPVC.go b/agent-deploy/b_middle/TemplateCmiiPVC.go similarity index 100% rename from agent-operator/deploy/b_middle/TemplateCmiiPVC.go rename to agent-deploy/b_middle/TemplateCmiiPVC.go diff --git a/agent-operator/deploy/c_app/DeployCmiiApp.go b/agent-deploy/c_app/DeployCmiiApp.go similarity index 99% rename from agent-operator/deploy/c_app/DeployCmiiApp.go rename to agent-deploy/c_app/DeployCmiiApp.go index 4cda66a..56614e3 100644 --- a/agent-operator/deploy/c_app/DeployCmiiApp.go +++ b/agent-deploy/c_app/DeployCmiiApp.go @@ -5,7 +5,7 @@ import ( "os" "wdd.io/agent-common/logger" "wdd.io/agent-common/utils" - "wdd.io/agent-operator/deploy/z_dep" + "wdd.io/agent-deploy/z_dep" ) var log = logger.Log diff --git a/agent-operator/deploy/c_app/DeployCmiiApp_test.go b/agent-deploy/c_app/DeployCmiiApp_test.go similarity index 100% rename from agent-operator/deploy/c_app/DeployCmiiApp_test.go rename to agent-deploy/c_app/DeployCmiiApp_test.go diff --git a/agent-operator/deploy/c_app/FrontendConfigMap.go b/agent-deploy/c_app/FrontendConfigMap.go similarity index 100% rename from agent-operator/deploy/c_app/FrontendConfigMap.go rename to agent-deploy/c_app/FrontendConfigMap.go diff --git a/agent-operator/deploy/c_app/TemplateCmiiBackend.go b/agent-deploy/c_app/TemplateCmiiBackend.go similarity index 100% rename from agent-operator/deploy/c_app/TemplateCmiiBackend.go rename to agent-deploy/c_app/TemplateCmiiBackend.go diff --git a/agent-operator/deploy/c_app/TemplateCmiiFrontend.go b/agent-deploy/c_app/TemplateCmiiFrontend.go similarity index 100% rename from agent-operator/deploy/c_app/TemplateCmiiFrontend.go rename to agent-deploy/c_app/TemplateCmiiFrontend.go diff --git a/agent-operator/deploy/c_app/TemplateCmiiSRS.go b/agent-deploy/c_app/TemplateCmiiSRS.go similarity index 100% rename from agent-operator/deploy/c_app/TemplateCmiiSRS.go rename to agent-deploy/c_app/TemplateCmiiSRS.go diff --git a/agent-operator/deploy/c_app/TemplateIngressConfigMap.go b/agent-deploy/c_app/TemplateIngressConfigMap.go similarity index 100% rename from agent-operator/deploy/c_app/TemplateIngressConfigMap.go rename to agent-deploy/c_app/TemplateIngressConfigMap.go diff --git a/agent-deploy/go.mod b/agent-deploy/go.mod new file mode 100644 index 0000000..29693b6 --- /dev/null +++ b/agent-deploy/go.mod @@ -0,0 +1,23 @@ +module wdd.io/agent-deploy + +go 1.22.1 + +require ( + github.com/go-playground/validator/v10 v10.21.0 + wdd.io/agent-common v0.0.0 +) + +require ( + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + go.uber.org/multierr v1.10.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect +) + +replace wdd.io/agent-common => ../agent-common diff --git a/agent-deploy/go.sum b/agent-deploy/go.sum new file mode 100644 index 0000000..923bb89 --- /dev/null +++ b/agent-deploy/go.sum @@ -0,0 +1,34 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H8W+rNYyH/ySBb0= +github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/agent-operator/deploy/z_5.5.0/k8s-backend.yaml b/agent-deploy/z_5.5.0/k8s-backend.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-backend.yaml rename to agent-deploy/z_5.5.0/k8s-backend.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-configmap.yaml b/agent-deploy/z_5.5.0/k8s-configmap.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-configmap.yaml rename to agent-deploy/z_5.5.0/k8s-configmap.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-dashboard.yaml b/agent-deploy/z_5.5.0/k8s-dashboard.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-dashboard.yaml rename to agent-deploy/z_5.5.0/k8s-dashboard.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-emqx.yaml b/agent-deploy/z_5.5.0/k8s-emqx.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-emqx.yaml rename to agent-deploy/z_5.5.0/k8s-emqx.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-frontend.yaml b/agent-deploy/z_5.5.0/k8s-frontend.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-frontend.yaml rename to agent-deploy/z_5.5.0/k8s-frontend.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-ingress.yaml b/agent-deploy/z_5.5.0/k8s-ingress.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-ingress.yaml rename to agent-deploy/z_5.5.0/k8s-ingress.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-mongo.yaml b/agent-deploy/z_5.5.0/k8s-mongo.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-mongo.yaml rename to agent-deploy/z_5.5.0/k8s-mongo.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-mysql.yaml b/agent-deploy/z_5.5.0/k8s-mysql.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-mysql.yaml rename to agent-deploy/z_5.5.0/k8s-mysql.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-nacos.yaml b/agent-deploy/z_5.5.0/k8s-nacos.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-nacos.yaml rename to agent-deploy/z_5.5.0/k8s-nacos.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-nfs-test.yaml b/agent-deploy/z_5.5.0/k8s-nfs-test.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-nfs-test.yaml rename to agent-deploy/z_5.5.0/k8s-nfs-test.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-nfs.yaml b/agent-deploy/z_5.5.0/k8s-nfs.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-nfs.yaml rename to agent-deploy/z_5.5.0/k8s-nfs.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-pvc.yaml b/agent-deploy/z_5.5.0/k8s-pvc.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-pvc.yaml rename to agent-deploy/z_5.5.0/k8s-pvc.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-rabbitmq.yaml b/agent-deploy/z_5.5.0/k8s-rabbitmq.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-rabbitmq.yaml rename to agent-deploy/z_5.5.0/k8s-rabbitmq.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-redis.yaml b/agent-deploy/z_5.5.0/k8s-redis.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-redis.yaml rename to agent-deploy/z_5.5.0/k8s-redis.yaml diff --git a/agent-operator/deploy/z_5.5.0/k8s-srs.yaml b/agent-deploy/z_5.5.0/k8s-srs.yaml old mode 100755 new mode 100644 similarity index 100% rename from agent-operator/deploy/z_5.5.0/k8s-srs.yaml rename to agent-deploy/z_5.5.0/k8s-srs.yaml diff --git a/agent-operator/deploy/z_dep/G.go b/agent-deploy/z_dep/G.go similarity index 100% rename from agent-operator/deploy/z_dep/G.go rename to agent-deploy/z_dep/G.go diff --git a/agent-operator/deploy/z_file/k8s-backend.yaml b/agent-deploy/z_file/k8s-backend.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-backend.yaml rename to agent-deploy/z_file/k8s-backend.yaml diff --git a/agent-operator/deploy/z_file/k8s-configmap.yaml b/agent-deploy/z_file/k8s-configmap.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-configmap.yaml rename to agent-deploy/z_file/k8s-configmap.yaml diff --git a/agent-operator/deploy/z_file/k8s-dashboard.yaml b/agent-deploy/z_file/k8s-dashboard.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-dashboard.yaml rename to agent-deploy/z_file/k8s-dashboard.yaml diff --git a/agent-operator/deploy/z_file/k8s-emqx.yaml b/agent-deploy/z_file/k8s-emqx.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-emqx.yaml rename to agent-deploy/z_file/k8s-emqx.yaml diff --git a/agent-operator/deploy/z_file/k8s-frontend.yaml b/agent-deploy/z_file/k8s-frontend.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-frontend.yaml rename to agent-deploy/z_file/k8s-frontend.yaml diff --git a/agent-operator/deploy/z_file/k8s-ingress.yaml b/agent-deploy/z_file/k8s-ingress.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-ingress.yaml rename to agent-deploy/z_file/k8s-ingress.yaml diff --git a/agent-operator/deploy/z_file/k8s-mongo.yaml b/agent-deploy/z_file/k8s-mongo.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-mongo.yaml rename to agent-deploy/z_file/k8s-mongo.yaml diff --git a/agent-operator/deploy/z_file/k8s-mysql.yaml b/agent-deploy/z_file/k8s-mysql.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-mysql.yaml rename to agent-deploy/z_file/k8s-mysql.yaml diff --git a/agent-operator/deploy/z_file/k8s-nacos.yaml b/agent-deploy/z_file/k8s-nacos.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-nacos.yaml rename to agent-deploy/z_file/k8s-nacos.yaml diff --git a/agent-operator/deploy/z_file/k8s-nfs-test.yaml b/agent-deploy/z_file/k8s-nfs-test.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-nfs-test.yaml rename to agent-deploy/z_file/k8s-nfs-test.yaml diff --git a/agent-operator/deploy/z_file/k8s-nfs.yaml b/agent-deploy/z_file/k8s-nfs.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-nfs.yaml rename to agent-deploy/z_file/k8s-nfs.yaml diff --git a/agent-operator/deploy/z_file/k8s-pvc.yaml b/agent-deploy/z_file/k8s-pvc.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-pvc.yaml rename to agent-deploy/z_file/k8s-pvc.yaml diff --git a/agent-operator/deploy/z_file/k8s-rabbitmq.yaml b/agent-deploy/z_file/k8s-rabbitmq.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-rabbitmq.yaml rename to agent-deploy/z_file/k8s-rabbitmq.yaml diff --git a/agent-operator/deploy/z_file/k8s-redis.yaml b/agent-deploy/z_file/k8s-redis.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-redis.yaml rename to agent-deploy/z_file/k8s-redis.yaml diff --git a/agent-operator/deploy/z_file/k8s-srs.yaml b/agent-deploy/z_file/k8s-srs.yaml similarity index 100% rename from agent-operator/deploy/z_file/k8s-srs.yaml rename to agent-deploy/z_file/k8s-srs.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-backend.yaml b/agent-deploy/z_xjyd/k8s-backend.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-backend.yaml rename to agent-deploy/z_xjyd/k8s-backend.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-configmap.yaml b/agent-deploy/z_xjyd/k8s-configmap.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-configmap.yaml rename to agent-deploy/z_xjyd/k8s-configmap.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-dashboard.yaml b/agent-deploy/z_xjyd/k8s-dashboard.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-dashboard.yaml rename to agent-deploy/z_xjyd/k8s-dashboard.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-emqx.yaml b/agent-deploy/z_xjyd/k8s-emqx.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-emqx.yaml rename to agent-deploy/z_xjyd/k8s-emqx.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-frontend.yaml b/agent-deploy/z_xjyd/k8s-frontend.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-frontend.yaml rename to agent-deploy/z_xjyd/k8s-frontend.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-ingress.yaml b/agent-deploy/z_xjyd/k8s-ingress.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-ingress.yaml rename to agent-deploy/z_xjyd/k8s-ingress.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-mongo.yaml b/agent-deploy/z_xjyd/k8s-mongo.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-mongo.yaml rename to agent-deploy/z_xjyd/k8s-mongo.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-mysql.yaml b/agent-deploy/z_xjyd/k8s-mysql.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-mysql.yaml rename to agent-deploy/z_xjyd/k8s-mysql.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-nacos.yaml b/agent-deploy/z_xjyd/k8s-nacos.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-nacos.yaml rename to agent-deploy/z_xjyd/k8s-nacos.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-nfs-test.yaml b/agent-deploy/z_xjyd/k8s-nfs-test.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-nfs-test.yaml rename to agent-deploy/z_xjyd/k8s-nfs-test.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-nfs.yaml b/agent-deploy/z_xjyd/k8s-nfs.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-nfs.yaml rename to agent-deploy/z_xjyd/k8s-nfs.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-pvc.yaml b/agent-deploy/z_xjyd/k8s-pvc.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-pvc.yaml rename to agent-deploy/z_xjyd/k8s-pvc.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-rabbitmq.yaml b/agent-deploy/z_xjyd/k8s-rabbitmq.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-rabbitmq.yaml rename to agent-deploy/z_xjyd/k8s-rabbitmq.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-redis.yaml b/agent-deploy/z_xjyd/k8s-redis.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-redis.yaml rename to agent-deploy/z_xjyd/k8s-redis.yaml diff --git a/agent-operator/deploy/z_xjyd/k8s-srs.yaml b/agent-deploy/z_xjyd/k8s-srs.yaml similarity index 100% rename from agent-operator/deploy/z_xjyd/k8s-srs.yaml rename to agent-deploy/z_xjyd/k8s-srs.yaml diff --git a/agent-operator/CmiiK8sConfig.go b/agent-operator/CmiiK8sConfig.go index 98dd4fb..58ea2c7 100644 --- a/agent-operator/CmiiK8sConfig.go +++ b/agent-operator/CmiiK8sConfig.go @@ -35,6 +35,10 @@ var CmiiBackendAppMap = map[string]string{ "cmii-uav-tower": "5.2.0", "cmii-uav-user": "5.2.0", "cmii-uav-waypoint": "5.2.0", + "cmii-uav-multilink": "5.2.0", + "cmii-uav-bridge": "5.2.0", + "cmii-uas-lifecycle": "5.2.0", + "cmii-uas-gateway": "5.2.0", } var CmiiFrontendAppMap = map[string]string{ diff --git a/agent-operator/CmiiK8sOperator_test.go b/agent-operator/CmiiK8sOperator_test.go index 0cc68ca..436a052 100644 --- a/agent-operator/CmiiK8sOperator_test.go +++ b/agent-operator/CmiiK8sOperator_test.go @@ -218,11 +218,11 @@ func TestUpdateCmiiImageTagFromNameTagMap(t *testing.T) { } func TestScaleCmiiFrontendDeploymentToDesiredReplicas(t *testing.T) { - ScaleCmiiFrontendDeploymentToDesiredReplicas(uat, 0) + ScaleCmiiFrontendDeploymentToDesiredReplicas(dev, 0) } func TestScaleCmiiBackendDeploymentToDesiredReplicas(t *testing.T) { - ScaleCmiiBackendDeploymentToDesiredReplicas(uat, 0) + ScaleCmiiBackendDeploymentToDesiredReplicas(dev, 0) } func TestBackupAllDeploymentFromEnv(t *testing.T) { diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 56b30b6..a45565f 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: allow-circular-references: true allow-bean-definition-overriding: true rabbitmq: - host: 10.250.0.100 + host: 42.192.52.227 port: 20672 username: boge password: boge8tingH @@ -24,7 +24,7 @@ spring: max-interval: 65000 initial-interval: 2000 redis: - host: 10.250.0.100 + host: 42.192.52.227 port: 21370 database: 0 password: boge8tingH @@ -46,7 +46,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://10.250.0.100:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: boge password: boge8tingH type: com.zaxxer.hikari.HikariDataSource 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 a12ced8..56337c4 100644 --- a/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java @@ -38,22 +38,23 @@ public class TestImageSyncScheduler { public void runImageSync() { ArrayList CmiiAppNameList = new ArrayList<>(List.of( -// "cmii-uav-process:5.3.0-050601" + "cmii-uav-platform:5.4.0-25263-061101" )); ArrayList ImageFullNameList = new ArrayList<>(List.of( - "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-052901" +// "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-060601" )); Boolean downloadAndCompressOnly = false; // String projectNamespace = "wdd"; // wdd - String projectNamespace = "cqlyj"; // 重庆林业局 +// String projectNamespace = "cqlyj"; // 重庆林业局 // String projectNamespace = "jlyd"; // 吉林移动 -// String projectNamespace = "xmyd"; // 厦门移动 +// String projectNamespace = "jxyd"; // 吉林移动 + String projectNamespace = "xmyd"; // 厦门移动 // String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd - String innerWorkerAgentName = "Chengdu-amd64-71-3571gda5"; //prod + String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod // 之下不要修改 除非你知道自己在干什么！