diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-05 09:41:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 09:41:26 -0400 |
| commit | f2432335ef1be0a6a4482354e3c288381127ee49 (patch) | |
| tree | 57940c3e3b9aa2d7626a513d6c0184a6137f0954 /pkg/specgen/generate/namespaces.go | |
| parent | 2f2ffd8678587db040ae76ef0231669ee19a5175 (diff) | |
| parent | 9be0d759b8dc6f1f5967d511c85924cd923b5ae6 (diff) | |
| download | podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.gz podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.bz2 podman-f2432335ef1be0a6a4482354e3c288381127ee49.zip | |
Merge pull request #6498 from mheon/fix_pod_hostname
Ensure that containers in pods properly set hostname
Diffstat (limited to 'pkg/specgen/generate/namespaces.go')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 138d9e0cd..ffa96a5cf 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -265,7 +265,7 @@ func GenerateNamespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt return toReturn, nil } -func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt *libpod.Runtime) error { +func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt *libpod.Runtime, pod *libpod.Pod) error { // PID switch s.PidNS.NSMode { case specgen.Path: @@ -326,6 +326,8 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt hostname := s.Hostname if hostname == "" { switch { + case s.UtsNS.NSMode == specgen.FromPod: + hostname = pod.Hostname() case s.UtsNS.NSMode == specgen.FromContainer: utsCtr, err := rt.LookupContainer(s.UtsNS.Value) if err != nil { |