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

[ Server ] [ Harbor ] - accomplish harbor create function | local oss url config

Browse Source
This commit is contained in:
zeaslity
2023-11-14 14:07:00 +08:00
parent ccffd8eea2
commit 2b3a503a5a
7 changed files with 74 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/io/wdd/func/auto/beans/BaseFunctionEnum.java
View File

@@ -41,7 +41,7 @@ public enum BaseFunctionEnum {
INSTALL_HARBOR(
"installHarbor",
"安装Harbor, 默认为2.1.0版本"
"安装Harbor, 默认为2.9.0版本"
),
INSTALL_CHRONY(

44
server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java
View File

@@ -86,15 +86,13 @@ public class BaseFuncScheduler {
private boolean MasterNodeBaseProcedure(String masterTopicName) {
List<BaseFunctionEnum> masterNodeProcedureList = List.of(
// Object.DISABLE_SWAP,
// Object.SHUTDOWN_FIREWALL,
// Object.INSTALL_CHRONY,
// Object.CHRONY_TO_PUBLIC_NTP,
// Object.INSTALL_DEFAULT_SSH_KEY,
// Object.INSTALL_DOCKER,
// Object.INSTALL_DOCKER_COMPOSE
// Object.INSTALL_HARBOR,
// Object.INSTALL_ZSH
// BaseFunctionEnum.DISABLE_SWAP,
// BaseFunctionEnum.SHUTDOWN_FIREWALL,
// BaseFunctionEnum.INSTALL_CHRONY,
// BaseFunctionEnum.CHRONY_TO_PUBLIC_NTP,
// BaseFunctionEnum.INSTALL_DEFAULT_SSH_KEY,
// BaseFunctionEnum.INSTALL_HARBOR,
// BaseFunctionEnum.INSTALL_ZSH
);
@@ -115,17 +113,29 @@ public class BaseFuncScheduler {
}
}
List<BaseFunctionEnum> masterNodeDurationTaskList = List.of(
// BaseFunctionEnum.INSTALL_DOCKER,
BaseFunctionEnum.INSTALL_DOCKER_COMPOSE,
BaseFunctionEnum.INSTALL_HARBOR
);
if (!funcService.callBaseFuncAndJudge(
masterTopicName,
BaseFunctionEnum.INSTALL_HARBOR,
null,
true
)) {
log.error("Master Install Harbor Failed !");
return false;
for (BaseFunctionEnum durationBaseFunc : masterNodeDurationTaskList) {
if (!funcService.callBaseFuncAndJudge(
masterTopicName,
durationBaseFunc,
null,
true
)) {
log.error(
"Master Duration Task Failed ! => {}",
durationBaseFunc
);
return false;
}
}
return true;
}

2
server/src/main/java/io/wdd/rpc/execute/service/ExecutionServiceImpl.java
View File

@@ -27,7 +27,7 @@ public class ExecutionServiceImpl implements ExecutionService {
private static final String MANUAL_COMMAND_TYPE = "manual-command";
private static final int COMMAND_MAX_WAIT_TIMEOUT = 60;
private static final int COMMAND_MAX_WAIT_TIMEOUT = 120;
@Resource
OMessageToAgentSender oMessageToAgentSender;

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

@@ -33,7 +33,7 @@ public class TestBaseFuncScheduler {
ServerQueryEntity serverQueryEntity = new ServerQueryEntity();
serverQueryEntity.setServerName("Chengdu");
serverQueryEntity.setServerName("Chengdu-amd64-99");
ServerInfoPO serverInfoPO = serverService
.serverGetByPage(serverQueryEntity)
.getRecords()