Bump golang to v1.21

Signed-off-by: Volker Theile <[email protected]> (cherry picked from commit 5dc08da) # Conflicts: # go.mod # pkg/controller/blockdevice/controller.go
harvester · Apr 17, 2024 · 05f83f8 · 05f83f8
1 parent cce2023
commit 05f83f8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"