Skip to content

Commit e592790

Browse files
eraincosmo0920
authored andcommitted
tests: add kubernetes parser annotation order case
Add a filter_kubernetes runtime test fixture where fluentbit.io/parser is listed before container-specific parsers. Signed-off-by: Yu Yi <yiyu@google.com>
1 parent 9803547 commit e592790

File tree

4 files changed

+22
-0
lines changed

4 files changed

+22
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{"log":"[2019-04-05T14:54:23.584269761] Container 1 is logging on stdout\n","stream":"stdout","time":"2019-04-01T17:58:33.598656444Z"}
2+
{"log":"[2019-04-05T14:54:23.584269761] Container 1 is logging on stderr\n","stream":"stderr","time":"2019-04-01T17:58:33.698656444Z"}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"metadata": {
3+
"annotations": {
4+
"fluentbit.io/parser": "default-parser",
5+
"fluentbit.io/parser-container-1": "container-1-parser",
6+
"fluentbit.io/parser_stdout-container-2": "container-2-stdout-parser",
7+
"fluentbit.io/parser_stderr-container-2": "container-2-stderr-parser",
8+
"fluentbit.io/parser_stdout-container-3": "container-3-stdout-parser",
9+
"fluentbit.io/parser_stderr-container-4": "container-4-stderr-parser"
10+
}
11+
}
12+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[1554476063.584270,{"stream":"stdout","container_1_parser":"Container 1 is logging on stdout","kubernetes":{"pod_name":"multiple-1","namespace_name":"annotations-parser-order","annotations":{"fluentbit.io/parser":"default-parser","fluentbit.io/parser-container-1":"container-1-parser","fluentbit.io/parser_stdout-container-2":"container-2-stdout-parser","fluentbit.io/parser_stderr-container-2":"container-2-stderr-parser","fluentbit.io/parser_stdout-container-3":"container-3-stdout-parser","fluentbit.io/parser_stderr-container-4":"container-4-stderr-parser"},"container_name":"container-1"}}]

tests/runtime/filter_kubernetes.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,12 @@ static void flb_test_annotations_parser_multiple_1_container_1_stdout()
631631
flb_test_annotations_parser("annotations-parser_multiple-1_container-1", "stdout", 1);
632632
}
633633

634+
static void flb_test_annotations_parser_order_multiple_1_container_1_stdout()
635+
{
636+
flb_test_annotations_parser("annotations-parser-order_multiple-1_container-1",
637+
"stdout", 1);
638+
}
639+
634640
static void flb_test_annotations_parser_multiple_1_container_1_stderr()
635641
{
636642
flb_test_annotations_parser("annotations-parser_multiple-1_container-1", "stderr", 1);
@@ -1045,6 +1051,7 @@ TEST_LIST = {
10451051
{"kube_annotations_parser_stderr_text_stdout", flb_test_annotations_parser_stderr_text_stdout},
10461052
{"kube_annotations_parser_stderr_text_stderr", flb_test_annotations_parser_stderr_text_stderr},
10471053
{"kube_annotations_parser_multiple_1_container_1_stdout", flb_test_annotations_parser_multiple_1_container_1_stdout},
1054+
{"kube_annotations_parser_order_multiple_1_container_1_stdout", flb_test_annotations_parser_order_multiple_1_container_1_stdout},
10481055
{"kube_annotations_parser_multiple_1_container_1_stderr", flb_test_annotations_parser_multiple_1_container_1_stderr},
10491056
{"kube_annotations_parser_multiple_1_container_2_stdout", flb_test_annotations_parser_multiple_1_container_2_stdout},
10501057
{"kube_annotations_parser_multiple_1_container_2_stderr", flb_test_annotations_parser_multiple_1_container_2_stderr},

0 commit comments

Comments
 (0)