This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new c0030f9b fix pre release v0.1.0
c0030f9b is described below
commit c0030f9b1c06a2a6c9535a3cc574681a132a25ac
Author: mfordjody <[email protected]>
AuthorDate: Mon Jun 2 09:34:09 2025 +0800
fix pre release v0.1.0
---
dubboctl/pkg/hub/ssh/{connection_windows.go => agent.go} | 0
.../hub/ssh/{connection_windows.go => agent_windows.go} | 16 +++++++++++++---
operator/pkg/helm/{path_windows.go => path.go} | 0
operator/pkg/helm/path_windows.go | 10 ++++------
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dubboctl/pkg/hub/ssh/connection_windows.go
b/dubboctl/pkg/hub/ssh/agent.go
similarity index 100%
copy from dubboctl/pkg/hub/ssh/connection_windows.go
copy to dubboctl/pkg/hub/ssh/agent.go
diff --git a/dubboctl/pkg/hub/ssh/connection_windows.go
b/dubboctl/pkg/hub/ssh/agent_windows.go
similarity index 78%
rename from dubboctl/pkg/hub/ssh/connection_windows.go
rename to dubboctl/pkg/hub/ssh/agent_windows.go
index f3808da9..228829e7 100644
--- a/dubboctl/pkg/hub/ssh/connection_windows.go
+++ b/dubboctl/pkg/hub/ssh/agent_windows.go
@@ -1,5 +1,5 @@
-//go:build !windows
-// +build !windows
+//go:build windows
+// +build windows
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,8 +22,18 @@ package ssh
import (
"net"
+ "strings"
+)
+
+import (
+ "github.com/Microsoft/go-winio"
)
func dialSSHAgentConnection(sock string) (agentConn net.Conn, error error) {
- return net.Dial("unix", sock)
+ if strings.Contains(sock, "\\pipe\\") {
+ agentConn, error = winio.DialPipe(sock, nil)
+ } else {
+ agentConn, error = net.Dial("unix", sock)
+ }
+ return
}
diff --git a/operator/pkg/helm/path_windows.go b/operator/pkg/helm/path.go
similarity index 100%
copy from operator/pkg/helm/path_windows.go
copy to operator/pkg/helm/path.go
diff --git a/operator/pkg/helm/path_windows.go
b/operator/pkg/helm/path_windows.go
index 49be03cc..5b34058c 100644
--- a/operator/pkg/helm/path_windows.go
+++ b/operator/pkg/helm/path_windows.go
@@ -1,4 +1,4 @@
-//go:build !windows
+//go:build windows
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,10 +19,8 @@
package helm
-import (
- "path/filepath"
-)
-
func pathJoin(elem ...string) string {
- return filepath.Join(elem...)
+ elems := make([]string, 0, len(elem))
+ elems = append(elems, elem...)
+ return strings.Join(elems, "/")
}