From 05f83f81f5f486f963272b6da8d93ca4582266e3 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
---
 .golangci.yaml                           |  9 +++++----
 go.mod                                   | 11 +++++++++++
 pkg/controller/blockdevice/controller.go |  5 +++++
 3 files changed, 21 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
diff --git a/go.mod b/go.mod
index fb55d322..f247f2b6 100644
--- a/go.mod
+++ b/go.mod
@@ -45,8 +45,13 @@ require (
 	github.com/sirupsen/logrus v1.9.2
 	github.com/stretchr/testify v1.8.1
 	github.com/urfave/cli/v2 v2.3.0
+<<<<<<< HEAD
 	golang.org/x/crypto v0.14.0
 	k8s.io/api v0.25.4
+=======
+	golang.org/x/crypto v0.17.0
+	k8s.io/api v0.27.1
+>>>>>>> 5dc08da (Bump golang to v1.21)
 	k8s.io/apimachinery v0.27.1
 	k8s.io/client-go v0.25.4
 )
@@ -96,8 +101,14 @@ require (
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+<<<<<<< HEAD
 	golang.org/x/mod v0.13.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
+=======
+	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+>>>>>>> 5dc08da (Bump golang to v1.21)
 	golang.org/x/oauth2 v0.13.0 // indirect
 	golang.org/x/sync v0.4.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
diff --git a/pkg/controller/blockdevice/controller.go b/pkg/controller/blockdevice/controller.go
index a29c3dce..949e3710 100644
--- a/pkg/controller/blockdevice/controller.go
+++ b/pkg/controller/blockdevice/controller.go
@@ -7,6 +7,11 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+<<<<<<< HEAD
+=======
+	"slices"
+	"sync"
+>>>>>>> 5dc08da (Bump golang to v1.21)
 	"time"
 
 	gocommon "github.com/harvester/go-common"