From e916f49f0bf303ecd4b4ab59317b83d7a0424f06 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 8 Dec 2023 18:01:29 +0100 Subject: [PATCH] cli: podman kube play --annotation 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/system/700-play.bats | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/podman/kube/play.go b/cmd/podman/kube/play.go index 8ca7354dc6..3de89ab31d 100644 --- a/cmd/podman/kube/play.go +++ b/cmd/podman/kube/play.go @@ -98,7 +98,7 @@ func playFlags(cmd *cobra.Command) { flags.SetNormalizeFunc(utils.AliasFlags) annotationFlagName := "annotation" - flags.StringSliceVar( + flags.StringArrayVar( &playOptions.annotations, annotationFlagName, []string{}, "Add annotations to pods (key=value)", diff --git a/test/system/700-play.bats b/test/system/700-play.bats index bb8d85ff4b..d3bf0eddef 100644 --- a/test/system/700-play.bats +++ b/test/system/700-play.bats @@ -435,11 +435,14 @@ _EOF @test "podman kube --annotation" { TESTDIR=$PODMAN_TMPDIR/testdir RANDOMSTRING=$(random_string 15) + ANNOTATION_WITH_COMMA="comma,$(random_string 5)" mkdir -p $TESTDIR echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml - run_podman kube play --annotation "name=$RANDOMSTRING" $PODMAN_TMPDIR/test.yaml + run_podman kube play --annotation "name=$RANDOMSTRING" \ + --annotation "anno=$ANNOTATION_WITH_COMMA" $PODMAN_TMPDIR/test.yaml run_podman inspect --format "{{ .Config.Annotations }}" test_pod-test is "$output" ".*name:$RANDOMSTRING" "Annotation should be added to pod" + is "$output" ".*anno:$ANNOTATION_WITH_COMMA" "Annotation with comma should be added to pod" run_podman stop -a -t 0 run_podman pod rm -t 0 -f test_pod