opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

podman play kube apply correct log driver

Browse Source 
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>
This commit is contained in:
Paul Holzinger
2021-04-15 18:24:22 +02:00
parent b074e80351
commit 1685c2dc36
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/domain/infra/abi/play.go
View File

@ -300,6 +300,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
RestartPolicy: ctrRestartPolicy, RestartPolicy: ctrRestartPolicy,
NetNSIsHost: p.NetNS.IsHost(), NetNSIsHost: p.NetNS.IsHost(),
SecretsManager: secretsManager, SecretsManager: secretsManager,
LogDriver: options.LogDriver,
} }
specGen, err := kube.ToSpecGen(ctx, &specgenOpts) specGen, err := kube.ToSpecGen(ctx, &specgenOpts)
if err != nil { if err != nil {

6
pkg/specgen/generate/kube/kube.go
View File

@ -98,6 +98,8 @@ type CtrSpecGenOptions struct {
NetNSIsHost bool NetNSIsHost bool
// SecretManager to access the secrets // SecretManager to access the secrets
SecretsManager *secrets.SecretsManager SecretsManager *secrets.SecretsManager
// LogDriver which should be used for the container
LogDriver string
} }
func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGenerator, error) { func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGenerator, error) {
@ -115,6 +117,10 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
s.Pod = opts.PodID s.Pod = opts.PodID
s.LogConfiguration = &specgen.LogConfig{
Driver: opts.LogDriver,
}
setupSecurityContext(s, opts.Container) setupSecurityContext(s, opts.Container)
// Since we prefix the container name with pod name to work-around the uniqueness requirement, // Since we prefix the container name with pod name to work-around the uniqueness requirement,

1
test/e2e/play_kube_test.go
View File

@ -1970,7 +1970,6 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`})
}) })
It("podman play kube applies log driver to containers", func() { It("podman play kube applies log driver to containers", func() {
Skip("need to verify images have correct packages for journald")
pod := getPod() pod := getPod()
err := generateKubeYaml("pod", pod, kubeYaml) err := generateKubeYaml("pod", pod, kubeYaml)
Expect(err).To(BeNil()) Expect(err).To(BeNil())