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

Merge remote-tracking branch 'origin/local-ss' into local-ss

Browse Source
This commit is contained in:
zeaslity
2024-05-29 15:37:09 +08:00
parent d962a3d68e 019a011b55
commit a7498d3176
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
agent-go/a_executor/AppFunction.go
View File

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

6
server/src/main/resources/application.yml
View File

@@ -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

22
server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java
View File

@@ -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<BaseFunctionEnum> 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,13 +128,13 @@ public class TestBaseFuncScheduler {
// baseFuncScheduler.runProcedure(projectDeployContext);
// 只能支持 带端口的HarborHost 默认为8033
// 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110
// harborFuncScheduler.runProcedure(projectDeployContext);
List<AppFunctionEnum> appFunctionEnumList = List.of(
AppFunctionEnum.DEPLOY_CHRONY_SERVER,
AppFunctionEnum.DEPLOY_RKE
// AppFunctionEnum.DEPLOY_CHRONY_SERVER,
// AppFunctionEnum.DEPLOY_RKE
AppFunctionEnum.DEPLOY_K8S_DASHBOARD,
AppFunctionEnum.DEPLOY_NFS,