diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-04-15 18:24:22 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 14:05:27 -0400 |
| commit | 9584a2a8a17ecffa974891d76b6d6482555e7b72 (patch) | |
| tree | 0e67768eda43e1ac092829e059d8b9041c71b362 /pkg/domain | |
| parent | e4c811bb0f629a2d8718cd82b674dedeaecc31a2 (diff) | |
| download | podman-9584a2a8a17ecffa974891d76b6d6482555e7b72.tar.gz podman-9584a2a8a17ecffa974891d76b6d6482555e7b72.tar.bz2 podman-9584a2a8a17ecffa974891d76b6d6482555e7b72.zip | |
podman play kube apply correct log driver
The --log-driver flag was silently ignored by podman play kube. This
regression got introduced during the play kube rework.
Unfortunately the test for this was skipped for no good reason.
Fixes #10015
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
<MH: Fixed cherry-pick conflicts>
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 7d87fc83a..6e705ddd2 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -261,16 +261,17 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY } specgenOpts := kube.CtrSpecGenOptions{ - Container: container, - Image: newImage, - Volumes: volumes, - PodID: pod.ID(), - PodName: podName, - PodInfraID: podInfraID, - ConfigMaps: configMaps, - SeccompPaths: seccompPaths, - RestartPolicy: ctrRestartPolicy, - NetNSIsHost: p.NetNS.IsHost(), + Container: container, + Image: newImage, + Volumes: volumes, + PodID: pod.ID(), + PodName: podName, + PodInfraID: podInfraID, + ConfigMaps: configMaps, + SeccompPaths: seccompPaths, + RestartPolicy: ctrRestartPolicy, + NetNSIsHost: p.NetNS.IsHost(), + LogDriver: options.LogDriver, } specGen, err := kube.ToSpecGen(ctx, &specgenOpts) if err != nil { |