Merge branch 'main' into tests/cel-clientsettingspolicies

Author: shaun-nx

.github/workflows/lint.yml

@@ -40,7 +40,7 @@ jobs:
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           working-directory: ${{ matrix.directory }}
-          version: v2.2.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.2.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   njs-lint:
     name: NJS Lint

.pre-commit-config.yaml

@@ -39,7 +39,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.2.1
+    rev: v2.2.2
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root

Makefile

@@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
 
 # tools versions
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION = v2.2.1
+GOLANGCI_LINT_VERSION = v2.2.2
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.33.1
 # renovate: datasource=github-tags depName=norwoodj/helm-docs

tests/framework/request.go

@@ -25,7 +25,6 @@ func Get(
 	if err != nil {
 		return 0, "", err
 	}
-
 	defer resp.Body.Close()
 
 	body := new(bytes.Buffer)

tests/suite/graceful_recovery_test.go

@@ -30,7 +30,7 @@ const (
 
 // Since this test involves restarting of the test node, it is recommended to be run separate from other tests
 // such that any issues in this test do not interfere with other tests.
-var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"), func() {
+var _ = Describe("Graceful Recovery test", Ordered, FlakeAttempts(2), Label("graceful-recovery"), func() {
 	var (
 		files = []string{
 			"graceful-recovery/cafe.yaml",
@@ -120,13 +120,13 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 		return names, nil
 	}
 
-	runNodeDebuggerJob := func(nginxPodName, jobScript string) (*v1.Job, error) {
+	runNodeDebuggerJob := func(nginxPodName string) (*v1.Job, error) {
 		ctx, cancel := context.WithTimeout(context.Background(), timeoutConfig.GetTimeout)
 		defer cancel()
 
 		var nginxPod core.Pod
 		if err := k8sClient.Get(ctx, types.NamespacedName{Namespace: ns.Name, Name: nginxPodName}, &nginxPod); err != nil {
-			return nil, fmt.Errorf("error retrieving NGF Pod: %w", err)
+			return nil, fmt.Errorf("error retrieving nginx Pod: %w", err)
 		}
 
 		b, err := resourceManager.GetFileContents("graceful-recovery/node-debugger-job.yaml")
@@ -146,7 +146,6 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 				len(job.Spec.Template.Spec.Containers),
 			)
 		}
-		job.Spec.Template.Spec.Containers[0].Args = []string{jobScript}
 		job.Namespace = ns.Name
 
 		if err = resourceManager.Apply([]client.Object{job}); err != nil {
@@ -157,13 +156,11 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("graceful-recovery"),
 	}
 
 	restartNginxContainer := func(nginxPodName, namespace, containerName string) {
-		jobScript := "PID=$(pgrep -f \"nginx-agent\") && kill -9 $PID"
-
 		restartCount, err := getContainerRestartCount(nginxPodName, namespace, containerName)
 		Expect(err).ToNot(HaveOccurred())
 
 		cleanUpPortForward()
-		job, err := runNodeDebuggerJob(nginxPodName, jobScript)
+		job, err := runNodeDebuggerJob(nginxPodName)
 		Expect(err).ToNot(HaveOccurred())
 
 		Eventually(
@@ -524,11 +521,11 @@ func expectRequestToSucceed(appURL, address string, responseBodyMessage string)
 	status, body, err := framework.Get(appURL, address, timeoutConfig.RequestTimeout, nil, nil)
 
 	if status != http.StatusOK {
-		return errors.New("http status was not 200")
+		return fmt.Errorf("http status was not 200, got %d: %w", status, err)
 	}
 
 	if !strings.Contains(body, responseBodyMessage) {
-		return errors.New("expected response body to contain correct body message")
+		return fmt.Errorf("expected response body to contain correct body message, got: %s", body)
 	}
 
 	return err

tests/suite/manifests/graceful-recovery/node-debugger-job.yaml

@@ -13,7 +13,7 @@ spec:
         - name: node-debugger-container
           image: ubuntu:24.04
           command: ["/bin/bash", "-c"]
-          args: ["to be replaced by the test"]
+          args: ["pkill -x \"nginx-agent\""]
           securityContext:
             privileged: true
           volumeMounts: