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

Merge branch 'main' of https://gitea.107421.xyz/zeaslity/ProjectOctopus into main

Browse Source
This commit is contained in:
zeaslity
2023-11-14 17:24:59 +08:00
parent 750917d047 597c7c1e23
commit a20579d9c4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -32,5 +32,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/agent-go/output/ /agent-go/output/
/agent-go/vender/ /agent-go/vendor/
/agent-go/agent-go /agent-go/agent-go

9
agent-go/executor/HarborExecutor.go
View File

@@ -223,10 +223,10 @@ func (hOp *HarborOperator) SyncProjectExec(funcArgs []string) (bool, []string) {
Deletion: false, Deletion: false,
Override: true, Override: true,
SrcRegistry: &model.Registry{ SrcRegistry: &model.Registry{
ID: 0, // 源 Harbor 实例的注册表 ID，通常为 0 Name: "cmii", // 源 Harbor 实例的注册表 ID，通常为 0
}, },
DestRegistry: &model.Registry{ DestRegistry: &model.Registry{
ID: 1, // 目标 Harbor 实例的注册表 ID，需要根据实际情况设置 Name: "cmii", // 目标 Harbor 实例的注册表 ID，需要根据实际情况设置
}, },
DestNamespace: "", // 可以指定目标 Harbor 中的特定项目，如果为空，则使用源项目名称 DestNamespace: "", // 可以指定目标 Harbor 中的特定项目，如果为空，则使用源项目名称
Trigger: &model.ReplicationTrigger{ Trigger: &model.ReplicationTrigger{
@@ -251,9 +251,10 @@ func (hOp *HarborOperator) SyncProjectExec(funcArgs []string) (bool, []string) {
err := sourceClient.NewReplicationPolicy(ctx, newPolicy.DestRegistry, newPolicy.SrcRegistry, newPolicy.Deletion, newPolicy.Override, newPolicy.Enabled, newPolicy.Filters, newPolicy.Trigger, newPolicy.DestNamespace, newPolicy.Name, newPolicy.Name) err := sourceClient.NewReplicationPolicy(ctx, newPolicy.DestRegistry, newPolicy.SrcRegistry, newPolicy.Deletion, newPolicy.Override, newPolicy.Enabled, newPolicy.Filters, newPolicy.Trigger, newPolicy.DestNamespace, newPolicy.Name, newPolicy.Name)
if err != nil { if err != nil {
fmt.Printf("Error creating replication policy: %v\n", err) syncErrorMessage := fmt.Sprintf("[Harbor Sync Project ] - Sync Project Failed !: %v\n", err)
log.Error(syncErrorMessage)
return false, []string{ return false, []string{
"[Harbor Sync Project ] - Sync Project Failed !", syncErrorMessage,
} }
} }

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

@@ -139,7 +139,7 @@ public class HarborFuncScheduler {
ServerInfoPO masterNode = projectDeployContext.getMasterNode(); ServerInfoPO masterNode = projectDeployContext.getMasterNode();
ArrayList<String> syncHarborArgList = new ArrayList<>(); ArrayList<String> syncHarborArgList = new ArrayList<>();
syncHarborArgList.add(HarborFunctionEnum.LIST_PROJECT.getOpName()); syncHarborArgList.add(HarborFunctionEnum.SYNC_PROJECT_BETWEEN_HARBOR.getOpName());
syncHarborArgList.add(masterNode.getServerIpInV4()); syncHarborArgList.add(masterNode.getServerIpInV4());
String sourceHarborHost = getIPv4Address(); String sourceHarborHost = getIPv4Address();