Merge branch 'main' into proposal/authentication-filter

Author: shaun-nx

.github/workflows/build.yml

@@ -193,7 +193,7 @@ jobs:
           fail-build: false
 
       - name: Upload scan result to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
         if: ${{ !inputs.dry_run }}
         continue-on-error: true
         with:

.github/workflows/lint.yml

@@ -50,7 +50,7 @@ jobs:
         uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0
         with:
           working-directory: ${{ matrix.directory }}
-          version: v2.6.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.6.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   njs-lint:
     name: NJS Lint

.github/workflows/scorecards.yml

@@ -60,6 +60,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
         with:
           sarif_file: results.sarif

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.6.1
+    rev: v2.6.2
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root

Makefile

@@ -24,7 +24,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.6.1
+GOLANGCI_LINT_VERSION = v2.6.2
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.34.0
 # renovate: datasource=github-tags depName=norwoodj/helm-docs

internal/controller/nginx/modules/package-lock.json

@@ -10,9 +10,9 @@
     "clean": "rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.8",
+    "@vitest/coverage-v8": "^4.0.10",
     "prettier": "3.6.2",
-    "vitest": "^4.0.8"
+    "vitest": "^4.0.10"
   },
   "type": "module"
 }

internal/controller/nginx/modules/package.json

@@ -102,8 +102,8 @@ make update-firewall-with-local-ip
 
 ### Step 2 - Build and Load Images
 
-Loading the images only applies to a `kind` cluster. If using a cloud provider, you will need to tag and push
-your images to a registry that is accessible from that cloud provider.
+Loading the images only applies to a `kind` cluster. If using GKE, you will need to tag and push
+your images to a registry that is accessible from GKE.
 
 ```makefile
 make build-images load-images TAG=$(whoami)
@@ -115,6 +115,8 @@ Or, to build NGF with NGINX Plus enabled (NGINX Plus cert and key must exist in
 make build-images-with-plus load-images-with-plus TAG=$(whoami)
 ```
 
+When building images to run on GKE, you'll need to specify `GOARCH=amd64` in the build command if your local system doesn't default to that architecture.
+
 For the telemetry test, which requires a OTel collector, build an image with the following variables set:
 
 ```makefile
@@ -314,6 +316,8 @@ incremental changes and copy your local changes to the VM to test, you can run
 make sync-files-to-vm
 ```
 
+> Note: if just running longevity tests, skip to the [Longevity section](#longevity-testing).
+
 To set up the GCP environment with the router and VM and then run the tests, run the following command:
 
 ```makefile

tests/README.md

@@ -488,7 +488,7 @@ func (rm *ResourceManager) WaitForPodsToBeReady(
 			var podsReady int
 			for _, pod := range podList.Items {
 				for _, cond := range pod.Status.Conditions {
-					if cond.Type == core.PodReady && cond.Status == core.ConditionTrue {
+					if cond.Type == core.PodReady && (cond.Status == core.ConditionTrue || cond.Reason == "PodCompleted") {
 						podsReady++
 					}
 				}

tests/framework/resourcemanager.go

@@ -257,6 +257,7 @@ func createNGFInstallConfig(cfg setupConfig, extraInstallArgs ...string) framewo
 		extraInstallArgs = append(
 			extraInstallArgs,
 			"--set", "nginxGateway.config.logging.level=debug",
+			"--set", "nginx.config.logging.agentLevel=debug",
 		)
 	}