From c4b1c66f603f3570cf5d8af07a733a0832cbc9bf Mon Sep 17 00:00:00 2001 From: zeaslity Date: Fri, 12 Apr 2024 15:26:33 +0800 Subject: [PATCH] [ Cmii ] [ Operator ] - bug fix of harbor executor --- agent-go/a_executor/HarborExecutor.go | 9 +-------- .../io/wdd/func/auto/service/HarborFuncScheduler.java | 9 +++++---- server/src/main/resources/application.yml | 6 +++--- .../java/io/wdd/server/func/TestBaseFuncScheduler.java | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/agent-go/a_executor/HarborExecutor.go b/agent-go/a_executor/HarborExecutor.go index 8bc4634..a2c76f9 100644 --- a/agent-go/a_executor/HarborExecutor.go +++ b/agent-go/a_executor/HarborExecutor.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "fmt" - "net" "os" "strconv" "strings" @@ -117,17 +116,11 @@ func (hOp *HarborOperator) CreateProjectExec(funcArgs []string) (bool, []string) return true, []string{successLog} } +// todo refresh HarborClient不一定有端口 func (hOp *HarborOperator) CheckAndBuildHarborClient(targetHarborHost string, targetHarborPort string, isTarget bool) (bool, *apiv2.RESTClient) { log.InfoF("[Harbor Client Create] - start to create harbor client %s", targetHarborHost) - parseIP := net.ParseIP(targetHarborHost) - if parseIP == nil { - log.Error( - fmt.Sprintf("[Harbor Client Create] - ip format is wrong! parseIP is => %s ", parseIP), - ) - return false, nil - } if targetHarborPort == "" { targetHarborPort = hOp.HarborPort } diff --git a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java index e3666ab..3c21eaa 100644 --- a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java @@ -183,9 +183,10 @@ public class HarborFuncScheduler { // first func args syncHarborArgList.add(masterNode.getServerIpInV4()); // second arg sourceHarborHost + // String sourceHarborHost = getIPv4Address(); -// syncHarborArgList.add("harbor.wdd.io"); // local - syncHarborArgList.add("192.168.0.6:8034"); // public + syncHarborArgList.add("harbor.wdd.io"); // local +// syncHarborArgList.add("192.168.0.6:8034"); // public // third arg sync project name syncHarborArgList.add(projectDeployContext.getCurrentSynchronizingProject()); @@ -220,8 +221,8 @@ public class HarborFuncScheduler { String os = System .getProperty("os.name") .toLowerCase(); -// String devHarborSourceHost = "10.250.0.100"; - String devHarborSourceHost = "20.4.16.200"; // cqga + String devHarborSourceHost = "10.250.0.100"; +// String devHarborSourceHost = "20.4.16.200"; // cqga if (os.contains("linux")) { try { InetAddress localhost = InetAddress.getLocalHost(); diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index 73c195a..780e185 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: allow-circular-references: true allow-bean-definition-overriding: true rabbitmq: - host: 10.250.0.100 + host: 42.192.52.227 port: 20672 username: boge password: boge8tingH @@ -24,7 +24,7 @@ spring: max-interval: 65000 initial-interval: 65000 redis: - host: 10.250.0.100 + host: 42.192.52.227 port: 21370 database: 0 password: boge8tingH @@ -46,7 +46,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://10.250.0.100:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://42.192.52.227:21306/octopus_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: boge password: boge8tingH type: com.zaxxer.hikari.HikariDataSource diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index 06439cb..0d35472 100644 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -116,10 +116,10 @@ public class TestBaseFuncScheduler { throw new RuntimeException(e); } - baseFuncScheduler.runProcedure(projectDeployContext); +// baseFuncScheduler.runProcedure(projectDeployContext); -// harborFuncScheduler.runProcedure(projectDeployContext); + harborFuncScheduler.runProcedure(projectDeployContext); List appFunctionEnumList = List.of(