fix: fix the e2e test script for fluentd (#1791)

* fix the scripts

Signed-off-by: Chengwei Guo <[email protected]>

* change version back to latest for master

Signed-off-by: Chengwei Guo <[email protected]>

* fix the outdated syntax

Signed-off-by: Chengwei Guo <[email protected]>

* directly run ginkgo

Signed-off-by: Chengwei Guo <[email protected]>

* fix e2e tests

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

* fix main workflow

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

* refactor fix lint issue

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

* Apply suggestions from code review

Signed-off-by: Marco Franssen <[email protected]>

* use defer to always run cleanup

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

* Makefile: Improve e2e-tests by utilizing make tasks

* fix: Helm e2e

Signed-off-by: Marco Franssen <[email protected]>

---------

Signed-off-by: Chengwei Guo <[email protected]>
Signed-off-by: chengweiguo <[email protected]>
Signed-off-by: Marco Franssen <[email protected]>
Co-authored-by: Marco Franssen <[email protected]>

Author: cw-Guo

.github/workflows/helm-ci.yaml

@@ -50,7 +50,7 @@ jobs:
           version: ${{ env.HELM_VERSION }}
 
       - name: Install dependences
-        run: make ginkgo kind
+        run: make kind ginkgo setup-test-e2e
 
       - name: Run helm e2e tests
-        run: make helm-e2e
+        run: make fluentd_helm-e2e

.github/workflows/main.yaml

@@ -114,7 +114,7 @@ jobs:
         run: make ginkgo kind
 
       - name: Run e2e tests
-        run:  make e2e
+        run:  make test-e2e
 
   build:
     runs-on: ubuntu-22.04

.github/workflows/test-e2e.yml

@@ -16,12 +16,10 @@ jobs:
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version-file: go.mod
+          cache-dependency-path: go.sum
 
-      - name: Install the latest version of kind
-        run: |
-          curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
-          chmod +x ./kind
-          sudo mv ./kind /usr/local/bin/kind
+      - name: Install dependences
+        run: make kind ginkgo setup-test-e2e
 
       - name: Verify kind installation
         run: kind version

Makefile

@@ -76,10 +76,27 @@ vet: ## Run go vet against code.
 test: manifests generate fmt vet setup-envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
 
-# 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
+KIND_CLUSTER ?= fluent-operator-test-e2e
+
+.PHONY: setup-test-e2e
+setup-test-e2e: kind ## Set up a Kind cluster for e2e tests if it does not exist
+	@case "$$($(KIND) get clusters)" in \
+		*"$(KIND_CLUSTER)"*) \
+		echo "Kind cluster '$(KIND_CLUSTER)' already exists. Skipping creation." ;; \
+		*) \
+		echo "Creating Kind cluster '$(KIND_CLUSTER)'…"; \
+		$(KIND) create cluster --name $(KIND_CLUSTER) ;; \
+	esac
+
+.PHONY: cleanup-test-e2e
+cleanup-test-e2e:
+	$(KIND) delete cluster --name $(KIND_CLUSTER)
+
+.PHONY: test-e2e
+test-e2e: setup-test-e2e fluentd-e2e ## Run the e2e tests against a Kind k8s instance that is spun up.
+
+%-e2e: ginkgo
+	@export KIND_CLUSTER=$(KIND_CLUSTER); export PATH="$$PWD/bin:$$PATH"; tests/scripts/$*_e2e.sh
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
@@ -231,7 +248,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 
 .PHONY: setup-envtest
 setup-envtest: envtest ## Download the binaries required for ENVTEST in the local bin directory.
-	@echo "Setting up envtest binaries for Kubernetes version $(ENVTEST_K8S_VERSION)..."
+	@echo "Setting up envtest binaries for Kubernetes version $(ENVTEST_K8S_VERSION)…"
 	@$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path || { \
 		echo "Error: Failed to set up envtest binaries for version $(ENVTEST_K8S_VERSION)."; \
 		exit 1; \
@@ -257,28 +274,8 @@ code-generator: $(CODE_GENERATOR) ## Download code-generator locally if necessar
 $(CODE_GENERATOR): $(LOCALBIN)
 	$(call go-install-tool,$(CODE_GENERATOR),k8s.io/code-generator,$(CODE_GENERATOR_VERSION))
 
-KIND_CLUSTER ?= fluent-operator-test-e2e
-
-.PHONY: setup-test-e2e
-setup-test-e2e: ## Set up a Kind cluster for e2e tests if it does not exist
-	@command -v $(KIND) >/dev/null 2>&1 || { \
-		echo "Kind is not installed. Please install Kind manually."; \
-		exit 1; \
-	}
-	@case "$$($(KIND) get clusters)" in \
-		*"$(KIND_CLUSTER)"*) \
-		echo "Kind cluster '$(KIND_CLUSTER)' already exists. Skipping creation." ;; \
-		*) \
-		echo "Creating Kind cluster '$(KIND_CLUSTER)'..."; \
-		$(KIND) create cluster --name $(KIND_CLUSTER) ;; \
-	esac
-
-.PHONY: cleanup-test-e2e
-cleanup-test-e2e:
-	$(KIND) delete cluster --name $(KIND_CLUSTER)
-
 .PHONY: kind
-kind: $(KIND) ## Download code-generator locally if necessary.
+kind: $(KIND) ## Install kind locally if necessary.
 $(KIND): $(LOCALBIN)
 	$(call go-install-tool,$(KIND),sigs.k8s.io/kind,$(KIND_VERSION))
 
@@ -376,12 +373,6 @@ go-deps: # download go dependencies
 docs-update: # update api docs
 	go run ./cmd/doc-gen/main.go
 
-e2e: ginkgo # make e2e tests
-	tests/scripts/fluentd_e2e.sh
-
-helm-e2e: ginkgo # make helm e2e tests
-	tests/scripts/fluentd_helm_e2e.sh
-
 update-helm-package: # update helm repo
 	./hack/update-helm-package.sh
 

VERSION

@@ -1 +1 @@
-v3.5.0
+latest

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/cfgrender_suite_test.go

@@ -1,6 +1,7 @@
 package fluentd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"testing"
@@ -22,7 +23,7 @@ var k8sClient client.Client
 func TestCompareFluentdMainAppConfig(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	BeforeSuite(func() {
+	BeforeSuite(func(ctx context.Context) {
 		path := os.Getenv("TESTCONFIG")
 		if path == "" {
 			path = fmt.Sprintf("%s/.kube/config", os.Getenv("HOME"))
@@ -46,7 +47,7 @@ func TestCompareFluentdMainAppConfig(t *testing.T) {
 		Expect(k8sClient).NotTo(BeNil())
 
 		_, _ = fmt.Fprintf(GinkgoWriter, "%s: Info: Setup Suite Execution\n", time.Now().Format(time.StampMilli))
-	}, 60)
+	}, NodeTimeout(60*time.Second))
 
 	AfterSuite(func() {
 		By("After Suite Execution")