From 97d5441b0995ddaea58c920efc29aa9109ffa730 Mon Sep 17 00:00:00 2001 From: ryanohnemus Date: Wed, 24 Jan 2024 19:36:08 -0600 Subject: [PATCH] skip kubelet-enabled tests until #134 is resolved Signed-off-by: ryanohnemus --- tests/kubernetes-plugins/full.bats | 14 ++++----- .../resources/fluentbit-full.yaml | 31 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/tests/kubernetes-plugins/full.bats b/tests/kubernetes-plugins/full.bats index a7ad70d..a2b35e1 100644 --- a/tests/kubernetes-plugins/full.bats +++ b/tests/kubernetes-plugins/full.bats @@ -161,10 +161,10 @@ function check_fluent_output_has_namespace_labels() { check_fluent_output_has_namespace_labels true } -#@test "test fluent-bit adds kubernetes pod and namespace labels to records - kubelet enabled" { -# run kubectl get -# set_fluent_bit_pod_name -# create_test_pod "k8s-pod-and-namespace-label-kubelet-tester" -# check_fluent_output_has_pod_labels true -# check_fluent_output_has_namespace_labels true -#} \ No newline at end of file +@test "test fluent-bit adds kubernetes pod and namespace labels to records - kubelet enabled" { + skip "kubelet-enabled test skipped until https://github.com/fluent/fluent-bit-ci/issues/134 is resolved" + set_fluent_bit_pod_name + create_test_pod "k8s-pod-and-namespace-label-kubelet-tester" + check_fluent_output_has_pod_labels true + check_fluent_output_has_namespace_labels true +} \ No newline at end of file diff --git a/tests/kubernetes-plugins/resources/fluentbit-full.yaml b/tests/kubernetes-plugins/resources/fluentbit-full.yaml index 6a823d1..d826277 100644 --- a/tests/kubernetes-plugins/resources/fluentbit-full.yaml +++ b/tests/kubernetes-plugins/resources/fluentbit-full.yaml @@ -65,22 +65,21 @@ config: Labels On Namespace_labels On - #[FILTER] - # Name kubernetes - # Alias k8s_namespace_and_pod_labels_with_kubelet - # Match kube.*k8s-pod-and-namespace-label-kubelet-tester* - # Kube_URL https://kubernetes.default.svc:443 - # Kube_CA_File /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - # Kube_Token_File /var/run/secrets/kubernetes.io/serviceaccount/token - # Kube_Tag_Prefix kube.var.log.containers. - # Merge_Log Off - # Annotations Off - # Labels On - # Use_Kubelet On - # Kubelet_Host ${NODE_IP} - # tls.verify Off - # Namespace_labels On - + [FILTER] + Name kubernetes + Alias k8s_namespace_and_pod_labels_with_kubelet + Match kube.*k8s-pod-and-namespace-label-kubelet-tester* + Kube_URL https://kubernetes.default.svc:443 + Kube_CA_File /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + Kube_Token_File /var/run/secrets/kubernetes.io/serviceaccount/token + Kube_Tag_Prefix kube.var.log.containers. + Merge_Log Off + Annotations Off + Labels On + Use_Kubelet On + Kubelet_Host ${NODE_IP} + tls.verify Off + Namespace_labels On outputs: | [OUTPUT]