diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-15 14:26:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 14:26:09 -0400 |
| commit | 81ce39f10b1aec8b67e9b6e0e114ad63ff6c4596 (patch) | |
| tree | ba2abcf770af76ba193aaa5c0072bb3f60e5d810 | |
| parent | b074e80351de2be0ea2888ac54f92bc542209a36 (diff) | |
| parent | 1685c2dc36d3595fabc53451b60909937c64505b (diff) | |
| download | podman-81ce39f10b1aec8b67e9b6e0e114ad63ff6c4596.tar.gz podman-81ce39f10b1aec8b67e9b6e0e114ad63ff6c4596.tar.bz2 podman-81ce39f10b1aec8b67e9b6e0e114ad63ff6c4596.zip | |
Merge pull request #10044 from Luap99/fix-10015
podman play kube apply correct log driver
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 1 | ||||
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 6 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 52f759f13..6eecef2de 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -300,6 +300,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY RestartPolicy: ctrRestartPolicy, NetNSIsHost: p.NetNS.IsHost(), SecretsManager: secretsManager, + LogDriver: options.LogDriver, } specGen, err := kube.ToSpecGen(ctx, &specgenOpts) if err != nil { diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 31ed3fd7c..7aeec9d41 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -98,6 +98,8 @@ type CtrSpecGenOptions struct { NetNSIsHost bool // SecretManager to access the secrets SecretsManager *secrets.SecretsManager + // LogDriver which should be used for the container + LogDriver string } 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.LogConfiguration = &specgen.LogConfig{ + Driver: opts.LogDriver, + } + setupSecurityContext(s, opts.Container) // Since we prefix the container name with pod name to work-around the uniqueness requirement, diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 41afd9f75..e479b88cc 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1970,7 +1970,6 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`}) }) It("podman play kube applies log driver to containers", func() { - Skip("need to verify images have correct packages for journald") pod := getPod() err := generateKubeYaml("pod", pod, kubeYaml) Expect(err).To(BeNil()) |