From cd3c478a7a8e95c0e380401f0f833de17f22c534 Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <matthieu.morel35@gmail.com>
Date: Sun, 26 May 2024 00:27:25 +0200
Subject: [PATCH] ci(lint): create .golangci.yaml (#18410)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 .github/workflows/ci-build.yaml       |  6 +++---
 .golangci.yaml                        | 10 ++++++++++
 Makefile                              |  2 +-
 hack/installers/install-lint-tools.sh |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 .golangci.yaml

diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 0dd4326033b74..5d014b36ccdb6 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -109,8 +109,8 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
         with:
-          version: v1.54.0
-          args: --enable gofmt --timeout 10m --exclude SA5011 --verbose --max-issues-per-linter 0 --max-same-issues 0
+          version: v1.58.2
+          args: --verbose
 
   test-go:
     name: Run unit tests for Go packages
@@ -533,4 +533,4 @@ jobs:
             exit 0
           else
             exit 1
-          fi
\ No newline at end of file
+          fi
diff --git a/.golangci.yaml b/.golangci.yaml
new file mode 100644
index 0000000000000..0c704a41381da
--- /dev/null
+++ b/.golangci.yaml
@@ -0,0 +1,10 @@
+issues:
+  exclude:
+    - SA5011
+  max-issues-per-linter: 0
+  max-same-issues: 0
+linters:
+  enable:
+    - gofmt
+run:
+  timeout: 50m
diff --git a/Makefile b/Makefile
index 19526cf9004ca..a53be342a2cfe 100644
--- a/Makefile
+++ b/Makefile
@@ -357,7 +357,7 @@ lint-local:
 	golangci-lint --version
 	# NOTE: If you get a "Killed" OOM message, try reducing the value of GOGC
 	# See https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
-	GOGC=$(ARGOCD_LINT_GOGC) GOMAXPROCS=2 golangci-lint run --enable gofmt --fix --verbose --timeout 3000s --max-issues-per-linter 0 --max-same-issues 0
+	GOGC=$(ARGOCD_LINT_GOGC) GOMAXPROCS=2 golangci-lint run --fix --verbose
 
 .PHONY: lint-ui
 lint-ui: test-tools-image
diff --git a/hack/installers/install-lint-tools.sh b/hack/installers/install-lint-tools.sh
index b4f68e464b15b..54e7b725478c8 100755
--- a/hack/installers/install-lint-tools.sh
+++ b/hack/installers/install-lint-tools.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -eux -o pipefail
 
-GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0
+GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.58.2