From a18219c0fd8992545ed88afe615d83cf97412cf0 Mon Sep 17 00:00:00 2001
From: Brandon Palm <bpalm@redhat.com>
Date: Fri, 16 Jan 2026 13:11:06 -0600
Subject: [PATCH] Upgrade golangci-lint from v1 to v2

- Update GOLANGCI_LINT_VERSION from v1.54.2 to v2.0.2
- Update module path to use /v2/ prefix
- Add .golangci.yml with version: "2" declaration for v2 compatibility

Tracking: https://github.com/redhat-best-practices-for-k8s/telco-bot/issues/49
---
 .golangci.yml | 3 +++
 Makefile      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .golangci.yml

diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 000000000..027dc975a
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,3 @@
+version: "2"
+run:
+  timeout: 5m
diff --git a/Makefile b/Makefile
index 628b17588..7fc3524bf 100644
--- a/Makefile
+++ b/Makefile
@@ -420,7 +420,7 @@ catalog-push: ## Push a catalog image.
 	$(MAKE) docker-push IMG=$(CATALOG_IMG)
 
 CILIUM_EBPF_VERSION := v0.18.0
-GOLANGCI_LINT_VERSION = v1.54.2
+GOLANGCI_LINT_VERSION = v2.0.2
 CLANG ?= clang
 CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
 GOOS ?= linux
@@ -429,7 +429,7 @@ LOCAL_GENERATOR_IMAGE ?= ebpf-generator:latest
 ##@ eBPF development
 .PHONY: prereqs
 prereqs: ## Check if prerequisites are met, and installing missing dependencies
-	test -f $(shell go env GOPATH)/bin/golangci-lint || GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
+	test -f $(shell go env GOPATH)/bin/golangci-lint || GOFLAGS="" go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
 	test -f $(shell go env GOPATH)/bin/bpf2go || go install github.com/cilium/ebpf/cmd/bpf2go@${CILIUM_EBPF_VERSION}
 	test -f $(shell go env GOPATH)/bin/kind || go install sigs.k8s.io/kind@latest