From c17246b00656645a7b10f1313223af2d157456e9 Mon Sep 17 00:00:00 2001 From: Kostiantyn Kalynovskyi Date: Fri, 2 Apr 2021 21:34:43 +0000 Subject: [PATCH] Pass HostNetwork value to docker container 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 --- pkg/container/api.go | 11 ++++++----- pkg/container/container.go | 2 +- pkg/container/container_docker.go | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/container/api.go b/pkg/container/api.go index 79e30158a..1319b16da 100644 --- a/pkg/container/api.go +++ b/pkg/container/api.go @@ -151,11 +151,12 @@ func (c *clientV1Alpha1) runAirship() error { c.conf.Spec.Image, c.conf.Spec.Airship.Cmd) err = cont.RunCommand(RunCommandOptions{ - Privileged: c.conf.Spec.Airship.Privileged, - Cmd: c.conf.Spec.Airship.Cmd, - Mounts: convertDockerMount(c.conf.Spec.StorageMounts), - EnvVars: envs, - Input: decoratedInput, + Privileged: c.conf.Spec.Airship.Privileged, + Cmd: c.conf.Spec.Airship.Cmd, + Mounts: convertDockerMount(c.conf.Spec.StorageMounts), + EnvVars: envs, + Input: decoratedInput, + HostNetwork: c.conf.Spec.HostNetwork, }) if err != nil { return err diff --git a/pkg/container/container.go b/pkg/container/container.go index cdc03488e..cc465994d 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -51,7 +51,7 @@ type Container interface { // RunCommandOptions options for RunCommand type RunCommandOptions struct { Privileged bool - HostNewtork bool + HostNetwork bool Cmd []string EnvVars []string diff --git a/pkg/container/container_docker.go b/pkg/container/container_docker.go index 694d876f5..32f09d295 100644 --- a/pkg/container/container_docker.go +++ b/pkg/container/container_docker.go @@ -202,7 +202,7 @@ func (c *DockerContainer) getConfig(opts RunCommandOptions) (container.Config, c Mounts: mounts, Privileged: opts.Privileged, } - if opts.HostNewtork { + if opts.HostNetwork { hCfg.NetworkMode = "host" } return cCfg, hCfg, nil