diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-05-18 10:37:54 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-05-26 16:39:04 -0400 |
| commit | de293c9802a79f83eef83a0ca278ebb22cfb685d (patch) | |
| tree | 002393067198891b819afff9de236545c3faa811 /pkg/specgen/generate/kube | |
| parent | 5b4ffc7ba79d0c3ad59cce17500c5a98ea686577 (diff) | |
| download | podman-de293c9802a79f83eef83a0ca278ebb22cfb685d.tar.gz podman-de293c9802a79f83eef83a0ca278ebb22cfb685d.tar.bz2 podman-de293c9802a79f83eef83a0ca278ebb22cfb685d.zip | |
Handle image user and exposed ports in podman play kube
Currently if a user runs an image with a user specified or
exposed ports with podman play kube, the fields are ignored.
Fixed: https://github.com/containers/podman/issues/9609
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate/kube')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 054388384..fb563f935 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -12,6 +12,7 @@ import ( "github.com/containers/common/pkg/secrets" ann "github.com/containers/podman/v3/pkg/annotations" "github.com/containers/podman/v3/pkg/specgen" + "github.com/containers/podman/v3/pkg/specgen/generate" "github.com/containers/podman/v3/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" @@ -182,6 +183,19 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener if imageData.Config.WorkingDir != "" { s.WorkDir = imageData.Config.WorkingDir } + if s.User == "" { + s.User = imageData.Config.User + } + + exposed, err := generate.GenExposedPorts(imageData.Config.ExposedPorts) + if err != nil { + return nil, err + } + + for k, v := range s.Expose { + exposed[k] = v + } + s.Expose = exposed // Pull entrypoint and cmd from image s.Entrypoint = imageData.Config.Entrypoint s.Command = imageData.Config.Cmd |