From 5d478a400186ae62960b028bb2f373176903caee Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twieczorek@mirantis.com>
Date: Tue, 20 Feb 2024 15:41:43 +0100
Subject: [PATCH 1/3] Bump golangci-lint to v1.56.2

https://github.com/golangci/golangci-lint/releases/tag/v1.56.0
https://github.com/golangci/golangci-lint/releases/tag/v1.56.1
https://github.com/golangci/golangci-lint/releases/tag/v1.56.2

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 90acacc6379a0ddd3f0adfc23a261ec60b28fcf7)
---
 hack/tools/Makefile.variables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/tools/Makefile.variables b/hack/tools/Makefile.variables
index 35076e553b99..03405079bebd 100644
--- a/hack/tools/Makefile.variables
+++ b/hack/tools/Makefile.variables
@@ -1,3 +1,3 @@
 controller-gen_version = 0.14.0
 go-bindata_version = 3.23.0+incompatible
-golangci-lint_version = 1.55.2
+golangci-lint_version = 1.56.2

From 89a0bae8f61be654309b726faf3938da0aa04c77 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twieczorek@mirantis.com>
Date: Wed, 27 Mar 2024 12:06:46 +0100
Subject: [PATCH 2/3] Bump golangci-lint to v1.57.1

https://golangci-lint.run/product/changelog/#v1571

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 49b196b0525bc6cc917dc6dd03e59cd99361dbbc)
---
 hack/tools/Makefile.variables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/tools/Makefile.variables b/hack/tools/Makefile.variables
index 03405079bebd..be38da1c6e00 100644
--- a/hack/tools/Makefile.variables
+++ b/hack/tools/Makefile.variables
@@ -1,3 +1,3 @@
 controller-gen_version = 0.14.0
 go-bindata_version = 3.23.0+incompatible
-golangci-lint_version = 1.56.2
+golangci-lint_version = 1.57.1

From 01054cff787b2443c7013dff0316a307cb18ca04 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twieczorek@mirantis.com>
Date: Thu, 11 Apr 2024 11:20:00 +0200
Subject: [PATCH 3/3] Cleanup golangci-lint config

The skip* settings have been moved from the run section to the issues
section and renamed to exclude*. The golint linter has long been
deprecated and removed.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
(cherry picked from commit 43b1652e97943375de3c78e3535755e317561cbc)
---
 .golangci.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index f3b5b346d52c..b18e11845731 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -4,14 +4,6 @@ run:
 
   build-tags:
     - hack
-  skip-dirs-use-default: false
-  skip-dirs:
-    - build
-    - docs
-    - embedded-bins
-    - examples
-  skip-files:
-    - "zz_*"
   tests: true
   modules-download-mode: readonly
   allow-parallel-runners: true
@@ -43,8 +35,6 @@ linters-settings:
               Usages of the k8s cloud provider are only allowed from within the
               k0s cloud provider package. This is to ensure that it's not
               leaking global flags into k0s.
-  golint:
-    min-confidence: 0
   goheader:
     template-path: .go-header.txt
     values:
@@ -60,6 +50,14 @@ linters-settings:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-dirs-use-default: false
+  exclude-dirs:
+    - build
+    - docs
+    - embedded-bins
+    - examples
+  exclude-files:
+    - "zz_*"
   exclude-rules:
     # https://github.com/denis-tingaikin/go-header/issues/18
     # This means that the header checks are ineffective for all files with build tags.