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

[ Cmii ] [ Operator ] - BJTG work

Browse Source
This commit is contained in:
zeaslity
2024-04-14 15:28:23 +08:00
parent c4b1c66f60
commit fb1bda3077
5 changed files with 103 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java
View File

@@ -77,6 +77,7 @@ public class HarborFuncScheduler {
project
);
projectDeployContext.setCurrentSynchronizingProject(project);
// sync
if (!SyncBetweenHarbor(projectDeployContext)) {
log.error(
"sync harbor project [ {} ] failed !",
@@ -177,14 +178,16 @@ public class HarborFuncScheduler {
ServerInfoPO masterNode = projectDeployContext.getMasterNode();
ArrayList<String> syncHarborArgList = new ArrayList<>();
// zero arg
syncHarborArgList.add(HarborFunctionEnum.SYNC_PROJECT_BETWEEN_HARBOR.getOpName());
// first func args
// first func 目标Harbor的Host
syncHarborArgList.add(masterNode.getServerIpInV4());
// second arg sourceHarborHost
// String sourceHarborHost = getIPv4Address();
// 源HarborHost 默认需要端口
syncHarborArgList.add("harbor.wdd.io"); // local
// syncHarborArgList.add("192.168.0.6:8034"); // public

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

@@ -118,30 +118,33 @@ public class TestBaseFuncScheduler {
// baseFuncScheduler.runProcedure(projectDeployContext);
harborFuncScheduler.runProcedure(projectDeployContext);
// 只能支持 带端口的HarborHost 默认为8033
// harborFuncScheduler.runProcedure(projectDeployContext);
List<AppFunctionEnum> appFunctionEnumList = List.of(
// AppFunctionEnum.DEPLOY_CHRONY_SERVER,
// AppFunctionEnum.DEPLOY_RKE
// AppFunctionEnum.DEPLOY_K8S_DASHBOARD,
// AppFunctionEnum.DEPLOY_NFS,
// AppFunctionEnum.DEPLOY_TEST_NFS
// AppFunctionEnum.DEPLOY_K8S_NAMESPACE,
// AppFunctionEnum.DEPLOY_K8S_PVC,
// AppFunctionEnum.DEPLOY_K8S_MYSQL,
// AppFunctionEnum.DEPLOY_K8S_REDIS,
// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES
// AppFunctionEnum.DEPLOY_INGRESS,
// AppFunctionEnum.DEPLOY_FRONTEND
// AppFunctionEnum.DEPLOY_BACKEND
AppFunctionEnum.DEPLOY_INGRESS,
AppFunctionEnum.DEPLOY_FRONTEND,
AppFunctionEnum.DEPLOY_BACKEND,
AppFunctionEnum.DEPLOY_K8S_SRS
);
projectDeployContext.setMasterAppProcedure(appFunctionEnumList);
// appFuncScheduler.runProcedure(projectDeployContext);
appFuncScheduler.runProcedure(projectDeployContext);
masterNodeProcedure = List.of(BaseFunctionEnum.CHRONY_TO_MASTER);