From 019a011b55f313a0eb5c0983d5983cc8a27e6d6a Mon Sep 17 00:00:00 2001 From: zeaslity Date: Wed, 29 May 2024 15:20:19 +0800 Subject: [PATCH] [Agent][Deploy] - fix bugs --- agent-go/a_executor/AppFunction.go | 5 ---- server/src/main/resources/application.yml | 6 ++-- .../server/func/TestBaseFuncScheduler.java | 28 ++++++++++--------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/agent-go/a_executor/AppFunction.go b/agent-go/a_executor/AppFunction.go index 9ee7107..8420d45 100644 --- a/agent-go/a_executor/AppFunction.go +++ b/agent-go/a_executor/AppFunction.go @@ -169,11 +169,6 @@ func (op *AgentOsOperator) deployRke(funcArgs []string) (bool, []string) { func (op *AgentOsOperator) deployK8sDashboard(funcArgs []string) (bool, []string) { - restartHarborExec, strings := op.restartHarborExec() - if !restartHarborExec { - return false, strings - } - // check folder folder, i := CheckAppInstallFolder() if !folder { diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 92d9fe4..56b30b6 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: 172.28.0.10 + host: 10.250.0.100 port: 20672 username: boge password: boge8tingH @@ -24,7 +24,7 @@ spring: max-interval: 65000 initial-interval: 2000 redis: - host: 172.28.0.10 + host: 10.250.0.100 port: 21370 database: 0 password: boge8tingH @@ -46,7 +46,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://172.28.0.10:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://10.250.0.100: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/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index 36a54c9..8a357b6 100644 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -52,7 +52,8 @@ public class TestBaseFuncScheduler { // Long projectServerId = 1765654823726669826L;// 资阳公安 // Long projectServerId = 1778681124701483009L;// 北京通感 // Long projectServerId = 1788026824445317122L;// 新疆移动 - Long projectServerId = 1791639665955184642L;// 深圳公安 +// Long projectServerId = 1791639665955184642L;// 深圳公安 + Long projectServerId = 1795703135172485122L;// 北京通感 // Long projectServerId = 1773619219367120898L; // 内网35-71项目 @@ -64,7 +65,8 @@ public class TestBaseFuncScheduler { // String masterNodeServerName = "Chengdu-amd64-51"; // 吉林移动 // String masterNodeServerName = "Chengdu-amd64-10"; // 北京通感 // String masterNodeServerName = "Chengdu-amd64-14"; // 新疆移动 - String masterNodeServerName = "Local-amd64-251"; // 新疆移动 +// String masterNodeServerName = "Local-amd64-251"; // 新疆移动 + String masterNodeServerName = "Chengdu-amd64-110"; // 北京通感 // String masterNodeServerName = "Ziyang-amd64-61"; // 资阳公安 ProjectServerVO projectServerVO = coreProjectServerService.projectServerOne(projectServerId); @@ -85,11 +87,11 @@ public class TestBaseFuncScheduler { List masterNodeProcedure = List.of( -// BaseFunctionEnum.DISABLE_SWAP, -// BaseFunctionEnum.DISABLE_SELINUX, -// BaseFunctionEnum.MODIFY_SYSCONFIG, -// BaseFunctionEnum.SHUTDOWN_FIREWALL, -// BaseFunctionEnum.INSTALL_DOCKER, + BaseFunctionEnum.DISABLE_SWAP, + BaseFunctionEnum.DISABLE_SELINUX, + BaseFunctionEnum.MODIFY_SYSCONFIG, + BaseFunctionEnum.SHUTDOWN_FIREWALL, + BaseFunctionEnum.INSTALL_DOCKER, BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY, BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, BaseFunctionEnum.MODIFY_DOCKER_CONFIG, @@ -126,17 +128,17 @@ public class TestBaseFuncScheduler { // baseFuncScheduler.runProcedure(projectDeployContext); - // 只能支持 带端口的HarborHost 默认为8033 + // 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110 // harborFuncScheduler.runProcedure(projectDeployContext); List appFunctionEnumList = List.of( - AppFunctionEnum.DEPLOY_CHRONY_SERVER, - AppFunctionEnum.DEPLOY_RKE +// AppFunctionEnum.DEPLOY_CHRONY_SERVER, +// AppFunctionEnum.DEPLOY_RKE -// AppFunctionEnum.DEPLOY_K8S_DASHBOARD, -// AppFunctionEnum.DEPLOY_NFS, -// AppFunctionEnum.DEPLOY_TEST_NFS + AppFunctionEnum.DEPLOY_K8S_DASHBOARD, + AppFunctionEnum.DEPLOY_NFS, + AppFunctionEnum.DEPLOY_TEST_NFS // AppFunctionEnum.DEPLOY_K8S_NAMESPACE, // AppFunctionEnum.DEPLOY_K8S_PVC,