Upgrade golangci-lint to 1.60.3

After upgrading to golang 1.23 golangci-lint 1.57.1 crashes on the first
execution. Upgrade it to the version used in the branches 1.30 and 1.31.

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>

Author: juanluisvaladas

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.57.1
+golangci-lint_version = 1.60.3

inttest/cli/cli_test.go

@@ -62,7 +62,7 @@ func (s *CliSuite) TestK0sCliKubectlAndResetCommand() {
 	s.T().Run("sysinfoSmoketest", func(t *testing.T) {
 		out, err := ssh.ExecWithOutput(s.Context(), fmt.Sprintf("%s sysinfo", s.K0sFullPath))
 		assert.NoError(t, err, "k0s sysinfo has non-zero exit code")
-		t.Logf(out)
+		t.Log(out)
 		assert.Regexp(t, "^Machine ID: ", out)
 		assert.Regexp(t, "\nOperating system: Linux \\(pass\\)\n", out)
 		assert.Regexp(t, "\n  Linux kernel release: ", out)

pkg/apis/k0s/v1beta1/storage.go

@@ -233,7 +233,7 @@ func (e *EtcdConfig) GetKeyFilePath(certDir string) string {
 func validateRequiredProperties(e *ExternalCluster) []error {
 	var errors []error
 
-	if e.Endpoints == nil || len(e.Endpoints) == 0 {
+	if len(e.Endpoints) == 0 {
 		errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot be null or empty"))
 	} else if slices.Contains(e.Endpoints, "") {
 		errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot contain empty strings"))

pkg/cleanup/bridge_linux.go

@@ -18,7 +18,6 @@ package cleanup
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/vishvananda/netlink"
 )
@@ -32,10 +31,6 @@ func (b *bridge) Name() string {
 
 // Run removes found kube-bridge leftovers
 func (b *bridge) Run() error {
-	if runtime.GOOS == "windows" {
-		return nil
-	}
-
 	lnks, err := netlink.LinkList()
 	if err != nil {
 		return fmt.Errorf("failed to get link list from netlink: %v", err)

pkg/install/users.go

@@ -18,7 +18,6 @@ package install
 
 import (
 	"errors"
-	"fmt"
 	"os/exec"
 	"os/user"
 	"reflect"
@@ -46,7 +45,7 @@ func CreateControllerUsers(clusterConfig *v1beta1.ClusterConfig, k0sVars *config
 		}
 	}
 	if len(messages) > 0 {
-		return fmt.Errorf(strings.Join(messages, "\n"))
+		return errors.New(strings.Join(messages, "\n"))
 	}
 	return nil
 }
@@ -66,7 +65,7 @@ func DeleteControllerUsers(clusterConfig *v1beta1.ClusterConfig) error {
 	}
 	if len(messages) > 0 {
 		// don't fail the command, just notify on errors
-		return fmt.Errorf(strings.Join(messages, "\n"))
+		return errors.New(strings.Join(messages, "\n"))
 	}
 	return nil
 }