[agent-deploy] - modify deploy project

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

agent-deploy/OctopusDeploy_test.go

@@ -1,4 +1,4 @@
-package deploy
+package agent_deploy
 
 import "testing"
 

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 (

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 (

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 (

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

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

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=

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{

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) {

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

server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java

@@ -38,22 +38,23 @@ public class TestImageSyncScheduler {
     public void runImageSync() {
 
         ArrayList<String> CmiiAppNameList = new ArrayList<>(List.of(
-//                "cmii-uav-process:5.3.0-050601"
+                "cmii-uav-platform:5.4.0-25263-061101"
         ));
 
         ArrayList<String> 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
 
         // 之下不要修改 除非你知道自己在干什么！