github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-22 13:38:26 +00:00
Code Issues Projects Releases Wiki Activity

FC: Change default API socket path

Browse Source 
Firecracker has changed default API socket path to `/run/firecracker.socket`.
This path also applies when running with the jailer.
Related PR: https://github.com/firecracker-microvm/firecracker/pull/1500
kata is letting jailer automatically create API socket, so we need to
change api socket path from `/api.socket` to `/run/firecracker.socket` accordingly.

Fixes: #2504

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
This commit is contained in:
Penny Zheng 2020-03-02 06:56:15 +00:00
parent 2945bcd796
commit c3bafd5793
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
virtcontainers/fc.go
View File

@ -53,7 +53,7 @@ const (
const ( const (
//fcTimeout is the maximum amount of time in seconds to wait for the VMM to respond //fcTimeout is the maximum amount of time in seconds to wait for the VMM to respond
fcTimeout = 10 fcTimeout = 10
fcSocket = "api.socket" fcSocket = "firecracker.socket"
//Name of the files within jailer root //Name of the files within jailer root
//Having predefined names helps with cleanup //Having predefined names helps with cleanup
fcKernel = "vmlinux" fcKernel = "vmlinux"
@ -210,7 +210,10 @@ func (fc *firecracker) createSandbox(ctx context.Context, id string, networkNS N
fc.vmPath = filepath.Join(fc.chrootBaseDir, hypervisorName, fc.id) fc.vmPath = filepath.Join(fc.chrootBaseDir, hypervisorName, fc.id)
fc.jailerRoot = filepath.Join(fc.vmPath, "root") // auto created by jailer fc.jailerRoot = filepath.Join(fc.vmPath, "root") // auto created by jailer
fc.socketPath = filepath.Join(fc.jailerRoot, fcSocket)
// Firecracker and jailer automatically creates default API socket under /run
// with the name of "firecracker.socket"
fc.socketPath = filepath.Join(fc.jailerRoot, "run", fcSocket)
// So we need to repopulate this at startSandbox where it is valid // So we need to repopulate this at startSandbox where it is valid
fc.netNSPath = networkNS.NetNsPath fc.netNSPath = networkNS.NetNsPath
@ -649,7 +652,9 @@ func (fc *firecracker) fcListenToFifo(fifoName string) (string, error) {
} }
func (fc *firecracker) fcInitConfiguration() error { func (fc *firecracker) fcInitConfiguration() error {
err := os.MkdirAll(fc.jailerRoot, DirMode) // Firecracker API socket(firecracker.socket) is automatically created
// under /run dir.
err := os.MkdirAll(filepath.Join(fc.jailerRoot, "run"), DirMode)
if err != nil { if err != nil {
return err return err
} }
@ -664,7 +669,7 @@ func (fc *firecracker) fcInitConfiguration() error {
if fc.config.JailerPath != "" { if fc.config.JailerPath != "" {
fc.jailed = true fc.jailed = true
if err := fc.fcRemountJailerRootWithExec(); err != nil { if err := fc.fcRemountJailerRootWithExec(); err != nil {
return nil return err
} }
} }