From b155ea09b8eda7ebef5a966e4c8cff5c6f125a86 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 20:06:46 +0000
Subject: [PATCH 1/2] Update dependency golangci/golangci-lint to v2.2.1

| datasource  | package                | from   | to     |
| ----------- | ---------------------- | ------ | ------ |
| github-tags | golangci/golangci-lint | v2.1.6 | v2.2.1 |


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 f47694f476..2875e3c94c 100644
--- a/.github/workflows/lint.yml
+++ b/.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.1.6 # renovate: datasource=github-tags depName=golangci/golangci-lint
+          version: v2.2.1 # 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 7e109f7aca..f09315c2d8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,7 +39,7 @@ repos:
           - javascript
 
   - repo: https://github.com/golangci/golangci-lint
-    rev: v2.1.6
+    rev: v2.2.1
     hooks:
       - id: golangci-lint-full
         name: golangci-lint-root
diff --git a/Makefile b/Makefile
index 5e888c3a42..7c9140e841 100644
--- a/Makefile
+++ b/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.1.6
+GOLANGCI_LINT_VERSION = v2.2.1
 # renovate: datasource=docker depName=kindest/node
 KIND_K8S_VERSION = v1.33.1
 # renovate: datasource=github-tags depName=norwoodj/helm-docs

From b3457caaef8782d6ff5455229337330b91aaf0d7 Mon Sep 17 00:00:00 2001
From: Saylor Berman <s.berman@f5.com>
Date: Thu, 3 Jul 2025 19:21:05 -0600
Subject: [PATCH 2/2] Add nolint

---
 internal/controller/nginx/types/types.go | 2 +-
 internal/framework/types/types.go        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal/controller/nginx/types/types.go b/internal/controller/nginx/types/types.go
index 7d018dce9f..6883a4314c 100644
--- a/internal/controller/nginx/types/types.go
+++ b/internal/controller/nginx/types/types.go
@@ -1,4 +1,4 @@
-package types
+package types //nolint:revive // ignoring meaningless package name
 
 const (
 	// Nginx503Server is used as a backend for services that cannot be resolved (have no IP address).
diff --git a/internal/framework/types/types.go b/internal/framework/types/types.go
index 78ccc25a8f..890305afbd 100644
--- a/internal/framework/types/types.go
+++ b/internal/framework/types/types.go
@@ -1,4 +1,4 @@
-package types
+package types //nolint:revive // ignoring meaningless package name
 
 import "sigs.k8s.io/controller-runtime/pkg/client"