mirror of
https://github.com/aljazceru/kata-containers.git
synced 2026-01-04 15:04:25 +01:00
Add the `-sandbox` option when launching the proxy. This isn't strictly required by the proxy, but is extremely useful for log analysis to allow log entries to be matched to sandboxes as the proxy will add a `sandbox` field in each log entry. Fixes #463. Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
76 lines
1.8 KiB
Go
76 lines
1.8 KiB
Go
// Copyright (c) 2017 Intel Corporation
|
|
//
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
//
|
|
|
|
package virtcontainers
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
"syscall"
|
|
)
|
|
|
|
// This is the Kata Containers implementation of the proxy interface.
|
|
// This is pretty simple since it provides the same interface to both
|
|
// runtime and shim as if they were talking directly to the agent.
|
|
type kataProxy struct {
|
|
}
|
|
|
|
// The kata proxy doesn't need to watch the vm console, thus return false always.
|
|
func (p *kataProxy) consoleWatched() bool {
|
|
return false
|
|
}
|
|
|
|
// start is kataProxy start implementation for proxy interface.
|
|
func (p *kataProxy) start(sandbox *Sandbox, params proxyParams) (int, string, error) {
|
|
if sandbox.agent == nil {
|
|
return -1, "", fmt.Errorf("No agent")
|
|
}
|
|
|
|
if params.agentURL == "" {
|
|
return -1, "", fmt.Errorf("AgentURL cannot be empty")
|
|
}
|
|
|
|
config, err := newProxyConfig(sandbox.config)
|
|
if err != nil {
|
|
return -1, "", err
|
|
}
|
|
|
|
// construct the socket path the proxy instance will use
|
|
proxyURL, err := defaultProxyURL(sandbox, SocketTypeUNIX)
|
|
if err != nil {
|
|
return -1, "", err
|
|
}
|
|
|
|
args := []string{
|
|
config.Path,
|
|
"-listen-socket", proxyURL,
|
|
"-mux-socket", params.agentURL,
|
|
"-sandbox", sandbox.ID(),
|
|
}
|
|
|
|
if config.Debug {
|
|
args = append(args, "-log", "debug")
|
|
console, err := sandbox.hypervisor.getSandboxConsole(sandbox.id)
|
|
if err != nil {
|
|
return -1, "", err
|
|
}
|
|
|
|
args = append(args, "-agent-logs-socket", console)
|
|
}
|
|
|
|
cmd := exec.Command(args[0], args[1:]...)
|
|
if err := cmd.Start(); err != nil {
|
|
return -1, "", err
|
|
}
|
|
|
|
return cmd.Process.Pid, proxyURL, nil
|
|
}
|
|
|
|
// stop is kataProxy stop implementation for proxy interface.
|
|
func (p *kataProxy) stop(sandbox *Sandbox, pid int) error {
|
|
// Signal the proxy with SIGTERM.
|
|
return syscall.Kill(pid, syscall.SIGTERM)
|
|
}
|