fix e2e tests

Signed-off-by: chengweiguo <[email protected]>

Author: cw-Guo

Makefile

@@ -78,8 +78,7 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
 
 # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
 .PHONY: test-e2e  # Run the e2e tests against a Kind k8s instance that is spun up.
-test-e2e:
-	go test ./tests/e2e/ -v -ginkgo.v
+test-e2e: fluentd-e2e
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
@@ -215,7 +214,7 @@ ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller
 #ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
 ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
 GOLANGCI_LINT_VERSION ?= v2.1.0
-GINKGO_VERSION ?= v2.23.4
+GINKGO_VERSION ?= v2.27.2
 CODE_GENERATOR_VERSION ?= v0.32.3
 KIND_VERSION ?= v0.17.0
 
@@ -376,10 +375,10 @@ go-deps: # download go dependencies
 docs-update: # update api docs
 	go run ./cmd/doc-gen/main.go
 
-e2e: ginkgo # make e2e tests
+fluentd-e2e: ginkgo # make e2e tests
 	tests/scripts/fluentd_e2e.sh
 
-helm-e2e: ginkgo # make helm e2e tests
+fluentd-helm-e2e: ginkgo # make helm e2e tests
 	tests/scripts/fluentd_helm_e2e.sh
 
 update-helm-package: # update helm repo

apis/fluentd/v1alpha1/tests/expected/fluentd-namespaced-cfg-filter-output-selector.cfg

@@ -0,0 +1,29 @@
+<source>
+  @type  forward
+  bind  0.0.0.0
+  port  24224
+</source>
+<match **>
+  @id  main
+  @type  label_router
+  <route>
+    @label  @5789d57841808bf91cfb0ed603d9ee86
+    <match>
+      namespaces  fluent
+    </match>
+  </route>
+</match>
+<label @5789d57841808bf91cfb0ed603d9ee86>
+  <filter **>
+    @id  FluentdConfig-fluent-fluentd-config-label-selector-test::fluent::filter::test-filter-recordtransformer-0
+    @type  record_transformer
+    <record>
+      environment  testing
+      hostname  test-host
+    </record>
+  </filter>
+  <match **>
+    @id  FluentdConfig-fluent-fluentd-config-label-selector-test::fluent::output::test-output-stdout-0
+    @type  stdout
+  </match>
+</label>

apis/fluentd/v1alpha1/tests/expected/fluentd-namespaced-cfg-filter-selector.cfg

@@ -0,0 +1,29 @@
+<source>
+  @type  forward
+  bind  0.0.0.0
+  port  24224
+</source>
+<match **>
+  @id  main
+  @type  label_router
+  <route>
+    @label  @7d670e99fb44ef7d003c936b2c226ac3
+    <match>
+      namespaces  fluent
+    </match>
+  </route>
+</match>
+<label @7d670e99fb44ef7d003c936b2c226ac3>
+  <filter **>
+    @id  FluentdConfig-fluent-fluentd-config-filter-only::fluent::filter::test-filter-grep-0
+    @type  grep
+    <regexp>
+      key  level
+      pattern  /error/
+    </regexp>
+  </filter>
+  <match **>
+    @id  FluentdConfig-fluent-fluentd-config-filter-only::cluster::clusteroutput::cluster-output-stdout-filter-test-0
+    @type  stdout
+  </match>
+</label>

tests/e2e/fluentd/label_selector_test.go

@@ -3,7 +3,6 @@ package fluentd
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -13,6 +12,7 @@ import (
 	"sigs.k8s.io/yaml"
 
 	fluentdv1alpha1 "github.com/fluent/fluent-operator/v3/apis/fluentd/v1alpha1"
+	"github.com/fluent/fluent-operator/v3/tests/utils"
 )
 
 var (
@@ -34,7 +34,7 @@ spec:
   image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.1
   fluentdCfgSelector:
     matchLabels:
-      config.fluentd.fluent.io/enabled: "true"
+      label.config.fluentd.fluent.io/enabled: "true"
 `
 
 	// FluentdConfig with filterSelector and outputSelector
@@ -45,7 +45,7 @@ metadata:
   name: fluentd-config-label-selector-test
   namespace: fluent
   labels:
-    config.fluentd.fluent.io/enabled: "true"
+    label.config.fluentd.fluent.io/enabled: "true"
 spec:
   filterSelector:
     matchLabels:
@@ -100,7 +100,7 @@ metadata:
   name: fluentd-config-filter-only
   namespace: fluent
   labels:
-    config.fluentd.fluent.io/enabled: "true"
+    label.config.fluentd.fluent.io/enabled: "true"
 spec:
   filterSelector:
     matchLabels:
@@ -199,22 +199,7 @@ var _ = Describe("Test FluentdConfig with namespace-level filter and output sele
 
 			// Verify that the filter configuration is present
 			// Before the fix, the filter would not be loaded because it was written to the inputs list
-			Expect(config).To(ContainSubstring("<filter"))
-			Expect(config).To(ContainSubstring("@type record_transformer"))
-			Expect(config).To(ContainSubstring("hostname"))
-			Expect(config).To(ContainSubstring("test-host"))
-			Expect(config).To(ContainSubstring("environment"))
-			Expect(config).To(ContainSubstring("testing"))
-
-			// Verify that the output configuration is present
-			// Before the fix, the output would not be loaded because it was written to the inputs list
-			Expect(config).To(ContainSubstring("<match"))
-			Expect(config).To(ContainSubstring("@type stdout"))
-
-			// Verify that filter and output are in the correct order (filter before output)
-			filterIndex := strings.Index(config, "<filter")
-			outputIndex := strings.Index(config, "<match")
-			Expect(filterIndex).To(BeNumerically("<", outputIndex), "Filter should appear before output in configuration")
+			Expect(string(utils.ExpectedFluentdNamespacedCfgFilterOutputSelector)).To(Equal(config))
 
 			// Clean up
 			err = DeleteObjs(ctx, objects)
@@ -257,12 +242,7 @@ var _ = Describe("Test FluentdConfig with namespace-level filter and output sele
 				Name:      fmt.Sprintf("%s-config", fluentd.Name),
 			}
 			config, err := GetCfgFromSecret(ctx, seckey)
-			Expect(err).NotTo(HaveOccurred())
-
-			// Verify grep filter is present
-			Expect(config).To(ContainSubstring("@type grep"))
-			Expect(config).To(ContainSubstring("key level"))
-			Expect(config).To(ContainSubstring("pattern /error/"))
+			Expect(string(utils.ExpectedFluentdNamespacedCfgFilterSelector)).To(Equal(config))
 
 			// Clean up
 			err = DeleteObjs(ctx, objects)

tests/scripts/fluentd_e2e.sh

@@ -13,7 +13,6 @@ E2E_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 LOGGING_NAMESPACE="fluent"
 IMAGE_TAG="$(date "+%Y-%m-%d-%H-%M-%S")"
 VERSION="$(tr -d " \t\n\r" < VERSION)"
-LOG_FILE="$(mktemp)"
 IMAGE_NAME="ghcr.io/fluent/fluent-operator/fluent-operator"
 
 GINKGO_BIN="ginkgo"
@@ -42,7 +41,6 @@ function cleanup() {
   # kubectl delete ns $LOGGING_NAMESPACE
   kind delete cluster --name test || true
   popd >/dev/null || true
-  rm -f "$LOG_FILE"
 }
 
 function prepare_cluster() {
@@ -68,9 +66,6 @@ function start_fluent_operator() {
 }
 
 function run_test() {
-  # inspired by github.com/kubeedge/kubeedge/tests/e2e/scripts/helm_keadm_e2e.sh
-  echo "Logs will be written to $LOG_FILE"
-  
   export ACK_GINKGO_RC=true
   "$GINKGO_BIN" -v "$E2E_DIR/e2e/fluentd/fluentd.test" -- "$debugflag"
 

tests/utils/utils.go

@@ -9,14 +9,16 @@ import (
 var (
 	once sync.Once
 
-	ExpectedFluentdClusterCfgOutputES         []byte
-	ExpectedFluentdClusterCfgOutputKafka      []byte
-	ExpectedFluentdClusterCfgOutputWithBuffer []byte
-	ExpectedFluentdMixedCfgsMultiTenant       []byte
-	ExpectedFluentdMixedCfgsOutputES          []byte
-	ExpectedFluentdNamespacedCfgOutputES      []byte
-	ExpectedDuplicateRemovalCRSPECS           []byte
-	ExpectedFluentdClusterCfgOutputCustom     []byte
+	ExpectedFluentdClusterCfgOutputES                []byte
+	ExpectedFluentdClusterCfgOutputKafka             []byte
+	ExpectedFluentdClusterCfgOutputWithBuffer        []byte
+	ExpectedFluentdMixedCfgsMultiTenant              []byte
+	ExpectedFluentdMixedCfgsOutputES                 []byte
+	ExpectedFluentdNamespacedCfgOutputES             []byte
+	ExpectedDuplicateRemovalCRSPECS                  []byte
+	ExpectedFluentdClusterCfgOutputCustom            []byte
+	ExpectedFluentdNamespacedCfgFilterOutputSelector []byte
+	ExpectedFluentdNamespacedCfgFilterSelector       []byte
 )
 
 func init() {
@@ -37,6 +39,10 @@ func init() {
 			getExpectedCfg("./apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg")
 		ExpectedFluentdClusterCfgOutputCustom =
 			getExpectedCfg("./apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-custom.cfg")
+		ExpectedFluentdNamespacedCfgFilterOutputSelector =
+			getExpectedCfg("./apis/fluentd/v1alpha1/tests/expected/fluentd-namespaced-cfg-filter-output-selector.cfg")
+		ExpectedFluentdNamespacedCfgFilterSelector =
+			getExpectedCfg("./apis/fluentd/v1alpha1/tests/expected/fluentd-namespaced-cfg-filter-selector.cfg")
 	})
 }