Run pipeline

Author: bjee19

internal/mode/static/provisioner/handler.go

@@ -62,6 +62,7 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 				if h.labelSelector.Matches(objLabels) {
 					gatewayName := objLabels.Get(controller.GatewayLabel)
 					gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
+
 					if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
 						logger.Error(err, "error handling resource update")
 					}
@@ -71,6 +72,7 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 				if h.labelSelector.Matches(objLabels) {
 					gatewayName := objLabels.Get(controller.GatewayLabel)
 					gatewayNSName := types.NamespacedName{Namespace: obj.GetNamespace(), Name: gatewayName}
+
 					if err := h.updateOrDeleteResources(ctx, obj, gatewayNSName); err != nil {
 						logger.Error(err, "error handling resource update")
 					}

tests/suite/graceful_recovery_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"os/exec"
+	"slices"
 	"strings"
 	"time"
 
@@ -318,9 +319,16 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 		setUpPortForward(nginxPodName, ns.Name)
 
 		checkNGFFunctionality(teaURL, coffeeURL, "", files, ns)
-		// if errorLogs := getUnexpectedNginxErrorLogs(ngfPodName, ns.Name); errorLogs != "" {
-		//	Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
-		//}
+
+		checkNGFContainerLogsForErrors(ngfPodName)
+
+		nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(nginxPodNames).To(HaveLen(1))
+
+		if errorLogs := getUnexpectedNginxErrorLogs(nginxPodNames[0], ns.Name); errorLogs != "" {
+			Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
+		}
 	}
 
 	runRestartNodeWithDrainingTest := func(teaURL, coffeeURL string, files []string, ns *core.Namespace) {
@@ -433,9 +441,20 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 		setUpPortForward(nginxPodNames[0], ns.Name)
 
 		checkNGFFunctionality(teaURL, coffeeURL, nginxContainerName, files, &ns)
-		// if errorLogs := getUnexpectedNginxErrorLogs(nginxPodName, ns.Name); errorLogs != "" {
-		//	Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
-		//}
+
+		ngfPodNames, err := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetTimeout)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(ngfPodNames).To(HaveLen(1))
+
+		nginxPodNames, err = framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(nginxPodNames).To(HaveLen(1))
+
+		checkNGFContainerLogsForErrors(ngfPodNames[0])
+
+		if errorLogs := getUnexpectedNginxErrorLogs(nginxPodNames[0], ns.Name); errorLogs != "" {
+			Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
+		}
 	})
 
 	It("recovers when NGF Pod is restarted", func() {
@@ -489,6 +508,16 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 			Should(Succeed())
 
 		checkNGFFunctionality(teaURL, coffeeURL, "", files, &ns)
+
+		checkNGFContainerLogsForErrors(newNGFPodName)
+
+		nginxPodNames, err := framework.GetReadyNginxPodNames(k8sClient, ns.Name, timeoutConfig.GetTimeout)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(nginxPodNames).To(HaveLen(1))
+
+		if errorLogs := getUnexpectedNginxErrorLogs(nginxPodNames[0], ns.Name); errorLogs != "" {
+			Skip(fmt.Sprintf("NGINX has unexpected error logs: \n%s", errorLogs))
+		}
 	})
 
 	It("recovers when drained node is restarted", func() {
@@ -593,30 +622,30 @@ func getNginxErrorLogs(nginxPodName, namespace string) string {
 	return errorLogs
 }
 
-// func getUnexpectedNginxErrorLogs(nginxPodName, namespace string) string {
-//	expectedErrStrings := []string{
-//		"connect() failed (111: Connection refused)",
-//		"could not be resolved (host not found) during usage report",
-//		"server returned 429",
-//		// FIXME(salonichf5) remove this error message check
-//		// when https://github.com/nginx/nginx-gateway-fabric/issues/2090 is completed.
-//		"no live upstreams while connecting to upstream",
-//	}
-//
-//	unexpectedErrors := ""
-//
-//	errorLogs := getNginxErrorLogs(nginxPodName, namespace)
-//
-//	for _, line := range strings.Split(errorLogs, "\n") {
-//		if !slices.ContainsFunc(expectedErrStrings, func(s string) bool {
-//			return strings.Contains(line, s)
-//		}) {
-//			unexpectedErrors += line
-//		}
-//	}
-//
-//	return unexpectedErrors
-//}
+func getUnexpectedNginxErrorLogs(nginxPodName, namespace string) string {
+	expectedErrStrings := []string{
+		"connect() failed (111: Connection refused)",
+		"could not be resolved (host not found) during usage report",
+		"server returned 429",
+		// FIXME(salonichf5) remove this error message check
+		// when https://github.com/nginx/nginx-gateway-fabric/issues/2090 is completed.
+		"no live upstreams while connecting to upstream",
+	}
+
+	unexpectedErrors := ""
+
+	errorLogs := getNginxErrorLogs(nginxPodName, namespace)
+
+	for _, line := range strings.Split(errorLogs, "\n") {
+		if !slices.ContainsFunc(expectedErrStrings, func(s string) bool {
+			return strings.Contains(line, s)
+		}) {
+			unexpectedErrors += line
+		}
+	}
+
+	return unexpectedErrors
+}
 
 // checkNGFContainerLogsForErrors checks NGF container's logs for any possible errors.
 func checkNGFContainerLogsForErrors(ngfPodName string) {