From aa270fa269545ab54aa28114b820d2e128cb8008 Mon Sep 17 00:00:00 2001
From: Mikhail Fedosin <mfedosin@newrelic.com>
Date: Wed, 14 Jun 2023 13:38:02 +0200
Subject: [PATCH 1/3] increase golangci-lint timeout to 10 minutes

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c9af01e31..2b6ed26f3 100644
--- a/Makefile
+++ b/Makefile
@@ -245,7 +245,7 @@ operator: ## Build operator binary
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) ## Lint the codebase
-	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS)
+	$(GOLANGCI_LINT) run -v $(GOLANGCI_LINT_EXTRA_ARGS) --timeout=10m
 
 .PHONY: lint-fix
 lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter

From ab4fabb93a0a874fb9052b672a7ff49fa0a90bc3 Mon Sep 17 00:00:00 2001
From: Mikhail Fedosin <mfedosin@newrelic.com>
Date: Wed, 14 Jun 2023 13:38:46 +0200
Subject: [PATCH 2/3] bump golangci-lint version to v1.53.2

---
 .github/workflows/golangci-lint.yml | 2 +-
 Makefile                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index f57f5856c..0bbd99e95 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -18,5 +18,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.53.2
           args: --timeout 15m 
diff --git a/Makefile b/Makefile
index 2b6ed26f3..15da5f906 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ CONTROLLER_GEN_VER := v0.11.4
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-GOLANGCI_LINT_VER := v1.52.2
+GOLANGCI_LINT_VER := v1.53.2
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

From 8c9cabfc27fa26a92ebae9e1c423c958c4340b1e Mon Sep 17 00:00:00 2001
From: Mikhail Fedosin <mfedosin@newrelic.com>
Date: Wed, 14 Jun 2023 14:15:24 +0200
Subject: [PATCH 3/3] Exclude lint from ci-make.sh

We have a separate github action for linting, so running it again
is not necessary.
---
 scripts/ci-make.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci-make.sh b/scripts/ci-make.sh
index 2751e54a3..62e1aa599 100755
--- a/scripts/ci-make.sh
+++ b/scripts/ci-make.sh
@@ -20,4 +20,4 @@ set -o pipefail
 
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
-cd "${REPO_ROOT}" && make lint docker-build
+cd "${REPO_ROOT}" && make docker-build