diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-07-17 12:46:31 -0400 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2019-07-17 12:59:50 -0400 |
| commit | 6f35a5742313a8406bcc197e0696c504d18793ff (patch) | |
| tree | 56bb94938f690356ed410ca670576c13c2755b7f /pkg/adapter/pods.go | |
| parent | 04a9cb01fec7a31a6ab4156f369a45399930e418 (diff) | |
| download | podman-6f35a5742313a8406bcc197e0696c504d18793ff.tar.gz podman-6f35a5742313a8406bcc197e0696c504d18793ff.tar.bz2 podman-6f35a5742313a8406bcc197e0696c504d18793ff.zip | |
Fix play kube command
Before, play kube wasn't properly setting the command. Fix this
Also, begin a dedicated test suite for play kube to catch regressions like this in the future
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'pkg/adapter/pods.go')
| -rw-r--r-- | pkg/adapter/pods.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index b45b02d09..2ca4f228f 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -676,7 +676,7 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container if imageData != nil && imageData.Config != nil { containerConfig.Command = append(containerConfig.Command, imageData.Config.Entrypoint...) } - if len(containerConfig.Command) != 0 { + if len(containerYAML.Command) != 0 { containerConfig.Command = append(containerConfig.Command, containerYAML.Command...) } else if imageData != nil && imageData.Config != nil { containerConfig.Command = append(containerConfig.Command, imageData.Config.Cmd...) |