airship/airshipctl
Code Issues Proposed changes

Pass HostNetwork value to docker container

Browse Source 
This fixes a bug when in host value is specified in api object,
but it is ignored by docker

Closes: #512
Related-To: #512

Change-Id: I57e66a19124d1d0a295396491dbd22e2e2193d31
This commit is contained in:
Kostiantyn Kalynovskyi 2021-04-02 21:34:43 +00:00
parent 34282759af
commit c17246b006
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/container/api.go
View File

@ -151,11 +151,12 @@ func (c *clientV1Alpha1) runAirship() error {
c.conf.Spec.Image, c.conf.Spec.Image,
c.conf.Spec.Airship.Cmd) c.conf.Spec.Airship.Cmd)
err = cont.RunCommand(RunCommandOptions{ err = cont.RunCommand(RunCommandOptions{
Privileged: c.conf.Spec.Airship.Privileged, Privileged: c.conf.Spec.Airship.Privileged,
Cmd: c.conf.Spec.Airship.Cmd, Cmd: c.conf.Spec.Airship.Cmd,
Mounts: convertDockerMount(c.conf.Spec.StorageMounts), Mounts: convertDockerMount(c.conf.Spec.StorageMounts),
EnvVars: envs, EnvVars: envs,
Input: decoratedInput, Input: decoratedInput,
HostNetwork: c.conf.Spec.HostNetwork,
}) })
if err != nil { if err != nil {
return err return err

2
pkg/container/container.go
View File

@ -51,7 +51,7 @@ type Container interface {
// RunCommandOptions options for RunCommand // RunCommandOptions options for RunCommand
type RunCommandOptions struct { type RunCommandOptions struct {
Privileged bool Privileged bool
HostNewtork bool HostNetwork bool
Cmd []string Cmd []string
EnvVars []string EnvVars []string

2
pkg/container/container_docker.go
View File

@ -202,7 +202,7 @@ func (c *DockerContainer) getConfig(opts RunCommandOptions) (container.Config, c
Mounts: mounts, Mounts: mounts,
Privileged: opts.Privileged, Privileged: opts.Privileged,
} }
if opts.HostNewtork { if opts.HostNetwork {
hCfg.NetworkMode = "host" hCfg.NetworkMode = "host"
} }
return cCfg, hCfg, nil return cCfg, hCfg, nil