github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-02 13:44:33 +00:00
Code Issues Projects Releases Wiki Activity

kata-runtime: use filepath.Join() to compose file path

Browse Source 
Use filepath.Join() will be safer than format string directly.

Signed-off-by: bin <bin@hyper.sh>
This commit is contained in:
bin 2021-02-04 21:57:52 +08:00
parent f4ae9c8476
commit 10f1c30f3d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Developer-Guide.md
View File

@ -491,7 +491,7 @@ exit
``` ```
`kata-runtime exec` has a command-line option `runtime-namespace`, which is used to specify under which [runtime namespace](https://github.com/containerd/containerd/blob/master/docs/namespaces.md) the particular pod was created. By default, it is set to `k8s.io` and works for containerd when configured `kata-runtime exec` has a command-line option `runtime-namespace`, which is used to specify under which [runtime namespace](https://github.com/containerd/containerd/blob/master/docs/namespaces.md) the particular pod was created. By default, it is set to `k8s.io` and works for containerd when configured
with Kubernetes. This should not be confused with [Kubernetes namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/). with Kubernetes. For CRI-O, the namespace should set to `default` explicitly. This should not be confused with [Kubernetes namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/).
For other CRI-runtimes and configurations, you may need to set the namespace utilizing the `runtime-namespace` option. For other CRI-runtimes and configurations, you may need to set the namespace utilizing the `runtime-namespace` option.
If you want to access guest OS through a traditional way, see [Traditional debug console setup)](#traditional-debug-console-setup). If you want to access guest OS through a traditional way, see [Traditional debug console setup)](#traditional-debug-console-setup).

3
src/runtime/cli/kata-exec.go
View File

@ -14,6 +14,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"path/filepath"
"strings" "strings"
"sync" "sync"
@ -175,7 +176,7 @@ func (s *iostream) Read(data []byte) (n int, err error) {
} }
func getConn(namespace, sandboxID string, port uint64) (net.Conn, error) { func getConn(namespace, sandboxID string, port uint64) (net.Conn, error) {
socketAddr := fmt.Sprintf("/containerd-shim/%s/%s/shim-monitor.sock", namespace, sandboxID) socketAddr := filepath.Join(string(filepath.Separator), "containerd-shim", namespace, sandboxID, "shim-monitor.sock")
client, err := kataMonitor.BuildUnixSocketClient(socketAddr, defaultTimeout) client, err := kataMonitor.BuildUnixSocketClient(socketAddr, defaultTimeout)
if err != nil { if err != nil {
return nil, err return nil, err