From 2be4b007b08283fc8a1a98a4d56ec88dcc52a181 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 8 Dec 2023 18:11:52 +0100 Subject: [PATCH] cli: podman kube play --log-opt use StringArray() This option accepts arbitrary input so we should allow commas in it. Signed-off-by: Paul Holzinger --- cmd/podman/kube/play.go | 2 +- test/e2e/play_kube_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 59643fc635..3a8358063f 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -124,7 +124,7 @@ func playFlags(cmd *cobra.Command) { _ = cmd.RegisterFlagCompletionFunc(logDriverFlagName, common.AutocompleteLogDriver) logOptFlagName := "log-opt" - flags.StringSliceVar( + flags.StringArrayVar( &playOptions.LogOptions, logOptFlagName, []string{}, "Logging driver options", diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 77aed75e86..8581af4384 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -4886,7 +4886,7 @@ ENV OPENJ9_JAVA_OPTIONS=%q err := generateKubeYaml("pod", pod, kubeYaml) Expect(err).ToNot(HaveOccurred()) - kube := podmanTest.Podman([]string{"kube", "play", kubeYaml, "--log-driver", "journald", "--log-opt", "tag={{.ImageName}}"}) + kube := podmanTest.Podman([]string{"kube", "play", kubeYaml, "--log-driver", "journald", "--log-opt", "tag={{.ImageName}},withcomma"}) kube.WaitWithDefaultTimeout() Expect(kube).Should(ExitCleanly()) @@ -4897,7 +4897,7 @@ ENV OPENJ9_JAVA_OPTIONS=%q inspect := podmanTest.Podman([]string{"inspect", getCtrNameInPod(pod)}) inspect.WaitWithDefaultTimeout() Expect(start).Should(ExitCleanly()) - Expect((inspect.InspectContainerToJSON()[0]).HostConfig.LogConfig.Tag).To(Equal("{{.ImageName}}")) + Expect((inspect.InspectContainerToJSON()[0]).HostConfig.LogConfig.Tag).To(Equal("{{.ImageName}},withcomma")) }) It("using a user namespace", func() {