diff --git a/src/runtime/containerd-shim-v2/shim_management.go b/src/runtime/containerd-shim-v2/shim_management.go index ab7ebf2041..3d7cc4c515 100644 --- a/src/runtime/containerd-shim-v2/shim_management.go +++ b/src/runtime/containerd-shim-v2/shim_management.go @@ -186,5 +186,5 @@ func (s *service) mountPprofHandle(m *http.ServeMux, ociSpec *specs.Spec) { // SocketAddress returns the address of the abstract domain socket for communicating with the // shim management endpoint func SocketAddress(id string) string { - return filepath.Join(string(filepath.Separator), "run", "vc", id, "shim-monitor") + return fmt.Sprintf("unix://%s", filepath.Join(string(filepath.Separator), "run", "vc", id, "shim-monitor")) } diff --git a/src/runtime/pkg/kata-monitor/pprof.go b/src/runtime/pkg/kata-monitor/pprof.go index 86f39c4667..4943455ff0 100644 --- a/src/runtime/pkg/kata-monitor/pprof.go +++ b/src/runtime/pkg/kata-monitor/pprof.go @@ -7,6 +7,7 @@ package katamonitor import ( "fmt" + cdshim "github.com/containerd/containerd/runtime/v2/shim" "io" "net" "net/http" @@ -37,7 +38,7 @@ func (km *KataMonitor) composeSocketAddress(r *http.Request) (string, error) { func (km *KataMonitor) proxyRequest(w http.ResponseWriter, r *http.Request) { w.Header().Set("X-Content-Type-Options", "nosniff") - socket, err := km.composeSocketAddress(r) + socketAddress, err := km.composeSocketAddress(r) if err != nil { monitorLog.WithError(err).Error("failed to get shim monitor address") serveError(w, http.StatusBadRequest, "sandbox may be stopped or deleted") @@ -47,7 +48,7 @@ func (km *KataMonitor) proxyRequest(w http.ResponseWriter, r *http.Request) { transport := &http.Transport{ DisableKeepAlives: true, Dial: func(proto, addr string) (conn net.Conn, err error) { - return net.Dial("unix", "\x00"+socket) + return cdshim.AnonDialer(socketAddress, defaultTimeout) }, } diff --git a/src/runtime/pkg/kata-monitor/shim_client.go b/src/runtime/pkg/kata-monitor/shim_client.go index ef4dc8a330..31d014e091 100644 --- a/src/runtime/pkg/kata-monitor/shim_client.go +++ b/src/runtime/pkg/kata-monitor/shim_client.go @@ -12,6 +12,7 @@ import ( "net/http" "time" + cdshim "github.com/containerd/containerd/runtime/v2/shim" shim "github.com/kata-containers/kata-containers/src/runtime/containerd-shim-v2" ) @@ -45,7 +46,7 @@ func buildUnixSocketClient(socketAddr string, timeout time.Duration) (*http.Clie transport := &http.Transport{ DisableKeepAlives: true, Dial: func(proto, addr string) (conn net.Conn, err error) { - return net.Dial("unix", "\x00"+socketAddr) + return cdshim.AnonDialer(socketAddr, timeout) }, }