From dda90124983d6670681976d129d4a3ed4ae8599b Mon Sep 17 00:00:00 2001
From: Volker Theile <vtheile@suse.com>
Date: Mon, 25 Mar 2024 12:36:56 +0100
Subject: [PATCH] Bump golang to v1.21

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 5dc08da5facb8559d06b28afdbf4f2b0e02bc9ae)

Conflicts:
	go.mod
	pkg/controller/blockdevice/controller.go
          - remove redundant changes
---
 .golangci.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 0afea8c2..6c5d550f 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -7,13 +7,14 @@ linters:
     - revive
     - gosec
     - prealloc
-run:
-  skip-files:
+issues:
+  exclude-files:
     - /zz_generated_
     - _generated
-  skip-dirs:
+  exclude-dirs:
     - generated
-  deadline: 5m
+run:
+  timeout: 5m
   tests: true
   build-tags:
     - test