From a109aaea94983d334f559462fdbe2a614249e66c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 18:50:29 +0000
Subject: [PATCH 1/2] Update dependency golangci/golangci-lint to v2.7.2

| datasource  | package                | from   | to     |
| ----------- | ---------------------- | ------ | ------ |
| github-tags | golangci/golangci-lint | v2.6.2 | v2.7.2 |


Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/lint.yml | 2 +-
 .pre-commit-config.yaml    | 2 +-
 Makefile                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3559178b2c..20a1864ff2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -50,7 +50,7 @@ jobs:
         uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
         with:
           working-directory: ${{ matrix.directory }}
-          version: v2.6.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.7.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
 
   njs-lint:
     name: NJS Lint
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 79245cb903..84d774a553 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.6.2
+    rev: v2.7.2
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root
diff --git a/Makefile b/Makefile
index 17b20f4094..a3f9dc1a75 100644
--- a/Makefile
+++ b/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.2
+GOLANGCI_LINT_VERSION = v2.7.2
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.34.0
 # renovate: datasource=github-tags depName=norwoodj/helm-docs

From 65fc071173bb53139d4bc708a03bdef80ee721da Mon Sep 17 00:00:00 2001
From: Saylor Berman <s.berman@f5.com>
Date: Tue, 9 Dec 2025 12:07:11 -0700
Subject: [PATCH 2/2] Linting fixes

---
 internal/controller/ngfsort/doc.go                  | 2 ++
 internal/controller/{sort => ngfsort}/sort.go       | 2 +-
 internal/controller/{sort => ngfsort}/sort_test.go  | 2 +-
 internal/controller/nginx/agent/grpc/context/doc.go | 2 +-
 internal/controller/nginx/config/http/config.go     | 2 +-
 internal/controller/nginx/config/shared/config.go   | 2 +-
 internal/controller/sort/doc.go                     | 2 --
 internal/controller/state/dataplane/sort.go         | 2 +-
 internal/controller/state/graph/backend_refs.go     | 2 +-
 internal/controller/state/graph/policies.go         | 2 +-
 internal/controller/state/graph/route_common.go     | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 internal/controller/ngfsort/doc.go
 rename internal/controller/{sort => ngfsort}/sort.go (98%)
 rename internal/controller/{sort => ngfsort}/sort_test.go (99%)
 delete mode 100644 internal/controller/sort/doc.go

diff --git a/internal/controller/ngfsort/doc.go b/internal/controller/ngfsort/doc.go
new file mode 100644
index 0000000000..8f28132acb
--- /dev/null
+++ b/internal/controller/ngfsort/doc.go
@@ -0,0 +1,2 @@
+// Package ngfsort provides utilities for sorting Kubernetes resources.
+package ngfsort
diff --git a/internal/controller/sort/sort.go b/internal/controller/ngfsort/sort.go
similarity index 98%
rename from internal/controller/sort/sort.go
rename to internal/controller/ngfsort/sort.go
index 6f25f13870..06302590e3 100644
--- a/internal/controller/sort/sort.go
+++ b/internal/controller/ngfsort/sort.go
@@ -1,4 +1,4 @@
-package sort
+package ngfsort
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/controller/sort/sort_test.go b/internal/controller/ngfsort/sort_test.go
similarity index 99%
rename from internal/controller/sort/sort_test.go
rename to internal/controller/ngfsort/sort_test.go
index d608fa8f40..4f8fcb8f1a 100644
--- a/internal/controller/sort/sort_test.go
+++ b/internal/controller/ngfsort/sort_test.go
@@ -1,4 +1,4 @@
-package sort
+package ngfsort
 
 import (
 	"testing"
diff --git a/internal/controller/nginx/agent/grpc/context/doc.go b/internal/controller/nginx/agent/grpc/context/doc.go
index 689a126cf7..4091b10d69 100644
--- a/internal/controller/nginx/agent/grpc/context/doc.go
+++ b/internal/controller/nginx/agent/grpc/context/doc.go
@@ -1,4 +1,4 @@
 /*
 Package context contains the functions for storing extra information in the gRPC context.
 */
-package context
+package context //nolint:revive // ignoring conflicting package name
diff --git a/internal/controller/nginx/config/http/config.go b/internal/controller/nginx/config/http/config.go
index dedfd04349..355e45fe1b 100644
--- a/internal/controller/nginx/config/http/config.go
+++ b/internal/controller/nginx/config/http/config.go
@@ -1,4 +1,4 @@
-package http
+package http //nolint:revive // ignoring conflicting package name
 
 import (
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/shared"
diff --git a/internal/controller/nginx/config/shared/config.go b/internal/controller/nginx/config/shared/config.go
index c38acb7e75..2652b79bc8 100644
--- a/internal/controller/nginx/config/shared/config.go
+++ b/internal/controller/nginx/config/shared/config.go
@@ -1,4 +1,4 @@
-package shared
+package shared //nolint:revive // ignoring meaningless package name
 
 // Map defines an NGINX map.
 type Map struct {
diff --git a/internal/controller/sort/doc.go b/internal/controller/sort/doc.go
deleted file mode 100644
index aa748e1bd6..0000000000
--- a/internal/controller/sort/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package sort provides utilities for sorting Kubernetes resources.
-package sort
diff --git a/internal/controller/state/dataplane/sort.go b/internal/controller/state/dataplane/sort.go
index fbc788e835..f972591725 100644
--- a/internal/controller/state/dataplane/sort.go
+++ b/internal/controller/state/dataplane/sort.go
@@ -3,7 +3,7 @@ package dataplane
 import (
 	"sort"
 
-	ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 )
 
 func sortMatchRules(matchRules []MatchRule) {
diff --git a/internal/controller/state/graph/backend_refs.go b/internal/controller/state/graph/backend_refs.go
index 495b9cc2ef..fbfbdec550 100644
--- a/internal/controller/state/graph/backend_refs.go
+++ b/internal/controller/state/graph/backend_refs.go
@@ -12,7 +12,7 @@ import (
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
 	ngfAPIv1alpha2 "github.com/nginx/nginx-gateway-fabric/v2/apis/v1alpha2"
-	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	sort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/helpers"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
diff --git a/internal/controller/state/graph/policies.go b/internal/controller/state/graph/policies.go
index 30e44fb014..2f1d8ffd47 100644
--- a/internal/controller/state/graph/policies.go
+++ b/internal/controller/state/graph/policies.go
@@ -10,8 +10,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/nginx/config/policies"
-	ngfsort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
diff --git a/internal/controller/state/graph/route_common.go b/internal/controller/state/graph/route_common.go
index f91c7b7a81..531b516eb1 100644
--- a/internal/controller/state/graph/route_common.go
+++ b/internal/controller/state/graph/route_common.go
@@ -14,7 +14,7 @@ import (
 	v1 "sigs.k8s.io/gateway-api/apis/v1"
 	v1alpha "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
-	ngfSort "github.com/nginx/nginx-gateway-fabric/v2/internal/controller/sort"
+	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/ngfsort"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/conditions"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/controller/state/validation"
 	"github.com/nginx/nginx-gateway-fabric/v2/internal/framework/kinds"
@@ -438,7 +438,7 @@ func bindRoutesToListeners(
 
 		// Sort the slice by timestamp and name so that we process the routes in the priority order
 		sort.Slice(l4RouteSlice, func(i, j int) bool {
-			return ngfSort.LessClientObject(l4RouteSlice[i].Source, l4RouteSlice[j].Source)
+			return ngfsort.LessClientObject(l4RouteSlice[i].Source, l4RouteSlice[j].Source)
 		})
 
 		// portHostnamesMap exists to detect duplicate hostnames on the same port