Skip to content

Commit c9454c7

Browse files
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 branch 1.31 Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
1 parent e595d16 commit c9454c7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

hack/tools/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
controller-gen_version = 0.14.0
22
go-bindata_version = 3.23.0+incompatible
3-
golangci-lint_version = 1.57.1
3+
golangci-lint_version = 1.60.3

inttest/cli/cli_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (s *CliSuite) TestK0sCliKubectlAndResetCommand() {
6262
s.T().Run("sysinfoSmoketest", func(t *testing.T) {
6363
out, err := ssh.ExecWithOutput(s.Context(), fmt.Sprintf("%s sysinfo", s.K0sFullPath))
6464
assert.NoError(t, err, "k0s sysinfo has non-zero exit code")
65-
t.Logf(out)
65+
t.Log(out)
6666
assert.Regexp(t, "\nOperating system: Linux \\(pass\\)\n", out)
6767
assert.Regexp(t, "\n Linux kernel release: ", out)
6868
assert.Regexp(t, "\n CONFIG_CGROUPS: ", out)

pkg/apis/k0s/v1beta1/storage.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func (e *EtcdConfig) GetKeyFilePath(certDir string) string {
245245
func validateRequiredProperties(e *ExternalCluster) []error {
246246
var errors []error
247247

248-
if e.Endpoints == nil || len(e.Endpoints) == 0 {
248+
if len(e.Endpoints) == 0 {
249249
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot be null or empty"))
250250
} else if slices.Contains(e.Endpoints, "") {
251251
errors = append(errors, fmt.Errorf("spec.storage.etcd.externalCluster.endpoints cannot contain empty strings"))

0 commit comments

Comments
 (0)