Fix some of the NFR tests to reduce error logs and pipeline failures

Makefile

@@ -130,7 +130,7 @@ install-crds: ## Install CRDs
 
 .PHONY: install-gateway-crds
 install-gateway-crds: ## Install Gateway API CRDs
-	kubectl kustomize $(SELF_DIR)config/crd/gateway-api/$(if $(filter true,$(ENABLE_EXPERIMENTAL)),experimental,standard) | kubectl apply -f -
+	kubectl kustomize $(SELF_DIR)config/crd/gateway-api/$(if $(filter true,$(ENABLE_EXPERIMENTAL)),experimental,standard) | kubectl apply --server-side -f -
 
 .PHONY: uninstall-gateway-crds
 uninstall-gateway-crds: ## Uninstall Gateway API CRDs

tests/Makefile

@@ -176,7 +176,7 @@ HELM_PARAMETERS += --set nginxGateway.name=nginx-gateway --set nginx.service.typ
 # it overrides the target in the main Makefile when the GW_API_VERSION is set to main
 ifeq ($(GW_API_VERSION),main)
 install-gateway-crds:
-	kubectl kustomize "https://github.com/kubernetes-sigs/gateway-api/config/crd/$(if $(filter true,$(ENABLE_EXPERIMENTAL)),experimental,)?timeout=120&ref=main" | kubectl apply -f -
+	kubectl kustomize "https://github.com/kubernetes-sigs/gateway-api/config/crd/$(if $(filter true,$(ENABLE_EXPERIMENTAL)),experimental,)?timeout=120&ref=main" | kubectl apply --server-side -f -
 endif
 
 .PHONY: install-ngf-local-no-build

tests/framework/timeout.go

@@ -38,22 +38,26 @@ type TimeoutConfig struct {
 
 	// KubernetesClientTimeout represents the maximum time for Kubernetes client operations.
 	KubernetesClientTimeout time.Duration
+
+	// GatewayListenerUpdateTimeout represents the maximum time for Gateway Listener count to be updated.
+	GatewayListenerUpdateTimeout time.Duration
 }
 
 // DefaultTimeoutConfig populates a TimeoutConfig with the default values.
 func DefaultTimeoutConfig() TimeoutConfig {
 	return TimeoutConfig{
-		CreateTimeout:           60 * time.Second,
-		UpdateTimeout:           60 * time.Second,
-		DeleteTimeout:           10 * time.Second,
-		DeleteNamespaceTimeout:  150 * time.Second,
-		GetTimeout:              10 * time.Second,
-		ManifestFetchTimeout:    10 * time.Second,
-		RequestTimeout:          10 * time.Second,
-		ContainerRestartTimeout: 10 * time.Second,
-		GetLeaderLeaseTimeout:   60 * time.Second,
-		GetStatusTimeout:        60 * time.Second,
-		TestForTrafficTimeout:   60 * time.Second,
-		KubernetesClientTimeout: 10 * time.Second,
+		CreateTimeout:                60 * time.Second,
+		UpdateTimeout:                60 * time.Second,
+		DeleteTimeout:                10 * time.Second,
+		DeleteNamespaceTimeout:       150 * time.Second,
+		GetTimeout:                   10 * time.Second,
+		ManifestFetchTimeout:         10 * time.Second,
+		RequestTimeout:               30 * time.Second,
+		ContainerRestartTimeout:      10 * time.Second,
+		GetLeaderLeaseTimeout:        60 * time.Second,
+		GetStatusTimeout:             60 * time.Second,
+		TestForTrafficTimeout:        60 * time.Second,
+		KubernetesClientTimeout:      10 * time.Second,
+		GatewayListenerUpdateTimeout: 60 * time.Second,
 	}
 }

tests/suite/manifests/scale/httproute.yaml

@@ -0,0 +1,18 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: route
+spec:
+  parentRefs:
+  - name: gateway
+    sectionName: listener
+  hostnames:
+  - "*.example.com"
+  rules:
+  - matches:
+    - path:
+        type: PathPrefix
+        value: /
+    backendRefs:
+    - name: backend
+      port: 80

tests/suite/manifests/scale/upstreams.yaml

@@ -13,25 +13,6 @@ spec:
     port: 80
     protocol: HTTP
 ---
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: route
-spec:
-  parentRefs:
-  - name: gateway
-    sectionName: listener
-  hostnames:
-  - "*.example.com"
-  rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /
-    backendRefs:
-    - name: backend
-      port: 80
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:

tests/suite/scale_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -40,6 +41,10 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
 			"scale/upstreams.yaml",
 		}
 
+		httpRouteManifests = []string{
+			"scale/httproute.yaml",
+		}
+
 		namespace = "scale"
 
 		scrapeInterval = 15 * time.Second
@@ -468,6 +473,10 @@ The logs are attached only if there are errors.
 		Expect(resourceManager.ApplyFromFiles(upstreamsManifests, namespace)).To(Succeed())
 		Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
 
+		// apply HTTPRoute after upstreams are ready
+		Expect(resourceManager.ApplyFromFiles(httpRouteManifests, namespace)).To(Succeed())
+		Expect(resourceManager.WaitForAppsToBeReady(namespace)).To(Succeed())
+
 		var nginxPodNames []string
 		var err error
 		Eventually(
@@ -835,7 +844,16 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 	AfterAll(func() {
 		_, err := fmt.Fprint(outFile)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(outFile.Close()).To(Succeed())
+
+		if outFile != nil {
+			if err := outFile.Close(); err != nil {
+				if errors.Is(err, os.ErrClosed) || strings.Contains(err.Error(), "file already closed") {
+					GinkgoWriter.Printf("Warning: attempted to close already closed file: %v\n", err)
+				} else {
+					Expect(err).ToNot(HaveOccurred())
+				}
+			}
+		}
 
 		// restoring NGF shared among tests in the suite
 		cfg := getDefaultSetupCfg()
@@ -1012,13 +1030,13 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 			checkGatewayListeners := func(num int) {
 				Eventually(
 					func() error {
-						ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.GetTimeout)
+						ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.GetTimeout*2)
 						defer cancel()
 
 						var gw v1.Gateway
 						key := types.NamespacedName{Namespace: ns.Name, Name: "gateway"}
 						if err := resourceManager.K8sClient.Get(ctx, key, &gw); err != nil {
-							return err
+							return fmt.Errorf("failed to get gateway: %w", err)
 						}
 
 						if len(gw.Status.Listeners) != num {
@@ -1028,8 +1046,8 @@ var _ = Describe("Zero downtime scale test", Ordered, Label("nfr", "zero-downtim
 						return nil
 					},
 				).
-					WithTimeout(5 * time.Second).
-					WithPolling(100 * time.Millisecond).
+					WithTimeout(timeoutConfig.GatewayListenerUpdateTimeout).
+					WithPolling(1 * time.Second).
 					Should(Succeed())
 			}