Merge branch 'main' of https://gitea.107421.xyz/zeaslity/ProjectOctopus into main
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -32,5 +32,5 @@ build/
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
/agent-go/output/
|
||||
/agent-go/vender/
|
||||
/agent-go/vendor/
|
||||
/agent-go/agent-go
|
||||
|
||||
@@ -223,10 +223,10 @@ func (hOp *HarborOperator) SyncProjectExec(funcArgs []string) (bool, []string) {
|
||||
Deletion: false,
|
||||
Override: true,
|
||||
SrcRegistry: &model.Registry{
|
||||
ID: 0, // 源 Harbor 实例的注册表 ID,通常为 0
|
||||
Name: "cmii", // 源 Harbor 实例的注册表 ID,通常为 0
|
||||
},
|
||||
DestRegistry: &model.Registry{
|
||||
ID: 1, // 目标 Harbor 实例的注册表 ID,需要根据实际情况设置
|
||||
Name: "cmii", // 目标 Harbor 实例的注册表 ID,需要根据实际情况设置
|
||||
},
|
||||
DestNamespace: "", // 可以指定目标 Harbor 中的特定项目,如果为空,则使用源项目名称
|
||||
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)
|
||||
|
||||
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{
|
||||
"[Harbor Sync Project ] - Sync Project Failed !",
|
||||
syncErrorMessage,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@ public class HarborFuncScheduler {
|
||||
ServerInfoPO masterNode = projectDeployContext.getMasterNode();
|
||||
|
||||
ArrayList<String> syncHarborArgList = new ArrayList<>();
|
||||
syncHarborArgList.add(HarborFunctionEnum.LIST_PROJECT.getOpName());
|
||||
syncHarborArgList.add(HarborFunctionEnum.SYNC_PROJECT_BETWEEN_HARBOR.getOpName());
|
||||
syncHarborArgList.add(masterNode.getServerIpInV4());
|
||||
|
||||
String sourceHarborHost = getIPv4Address();
|
||||
|
||||
Reference in New Issue
Block a user