Merge pull request #2825 from Nordix/lentzi90/golangci-lint

k8s-ci-robot · web-flow · commit e0b5c96dd13b · 2025-11-19T02:54:00.000-08:00
🌱 Bump golangci-lint to v2.6.1
diff --git a/hack/tools/Makefile b/hack/tools/Makefile
@@ -15,7 +15,7 @@
 ROOT_DIR_RELATIVE := ../..
 include $(ROOT_DIR_RELATIVE)/common.mk
 
-GOLANGCI_LINT_VERSION ?= v2.5.0
+GOLANGCI_LINT_VERSION ?= v2.6.1
 
 # GOTESTSUM version without the leading 'v'
 GOTESTSUM_VERSION ?= 1.12.0
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -65,8 +65,7 @@ func (s *Service) createInstanceImpl(eventObject runtime.Object, instanceSpec *I
 		})
 	}
 
-	instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", timeoutInstanceCreate)
-	instanceCreateTimeout *= time.Minute
+	instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", timeoutInstanceCreate, time.Minute)
 
 	// Don't set ImageRef on the server if we're booting from volume
 	var serverImageRef string
@@ -606,14 +605,14 @@ func (s *Service) GetInstanceStatusByName(eventObject runtime.Object, name strin
 	return nil, nil
 }
 
-func getTimeout(name string, timeout int) time.Duration {
+func getTimeout(name string, timeout int, unit time.Duration) time.Duration {
 	if v := os.Getenv(name); v != "" {
 		timeout, err := strconv.Atoi(v)
 		if err == nil {
-			return time.Duration(timeout)
+			return time.Duration(timeout) * unit
 		}
 	}
-	return time.Duration(timeout)
+	return time.Duration(timeout) * unit
 }
 
 // requiresTagging checks if the instanceSpec requires tagging,
diff --git a/test/e2e/shared/cluster.go b/test/e2e/shared/cluster.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/common.go b/test/e2e/shared/common.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/context.go b/test/e2e/shared/context.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/defaults.go b/test/e2e/shared/defaults.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/exec.go b/test/e2e/shared/exec.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/exec_test.go b/test/e2e/shared/exec_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/images.go b/test/e2e/shared/images.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2024 The Kubernetes Authors.
diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/openstack_test.go b/test/e2e/shared/openstack_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/shared/suite.go b/test/e2e/shared/suite.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/conformance/conformance_suite_test.go b/test/e2e/suites/conformance/conformance_suite_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/conformance/conformance_test.go b/test/e2e/suites/conformance/conformance_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/clusterctl_upgrade_test.go b/test/e2e/suites/e2e/clusterctl_upgrade_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/e2e_suite_test.go b/test/e2e/suites/e2e/e2e_suite_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/quick_start_test.go b/test/e2e/suites/e2e/quick_start_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2024 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/remediations_test.go b/test/e2e/suites/e2e/remediations_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2021 The Kubernetes Authors.
diff --git a/test/e2e/suites/e2e/self_hosted_test.go b/test/e2e/suites/e2e/self_hosted_test.go
@@ -1,5 +1,4 @@
 //go:build e2e
-// +build e2e
 
 /*
 Copyright 2022 The Kubernetes Authors.

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ func (s Service) createInstanceImpl(eventObject runtime.Object, instanceSpec I`
`65`	`65`	`})`
`66`	`66`	`}`
`67`	`67`
`68`		`- instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", timeoutInstanceCreate)`
`69`		`- instanceCreateTimeout *= time.Minute`
	`68`	`+ instanceCreateTimeout := getTimeout("CLUSTER_API_OPENSTACK_INSTANCE_CREATE_TIMEOUT", timeoutInstanceCreate, time.Minute)`
`70`	`69`
`71`	`70`	`// Don't set ImageRef on the server if we're booting from volume`
`72`	`71`	`var serverImageRef string`
`@@ -606,14 +605,14 @@ func (s *Service) GetInstanceStatusByName(eventObject runtime.Object, name strin`
`606`	`605`	`return nil, nil`
`607`	`606`	`}`
`608`	`607`
`609`		`-func getTimeout(name string, timeout int) time.Duration {`
	`608`	`+func getTimeout(name string, timeout int, unit time.Duration) time.Duration {`
`610`	`609`	`if v := os.Getenv(name); v != "" {`
`611`	`610`	`timeout, err := strconv.Atoi(v)`
`612`	`611`	`if err == nil {`
`613`		`- return time.Duration(timeout)`
	`612`	`+ return time.Duration(timeout) * unit`
`614`	`613`	`}`
`615`	`614`	`}`
`616`		`- return time.Duration(timeout)`
	`615`	`+ return time.Duration(timeout) * unit`
`617`	`616`	`}`
`618`	`617`
`619`	`618`	`// requiresTagging checks if the instanceSpec requires tagging,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build e2e`
`2`		`-// +build e2e`
`3`	`2`
`4`	`3`	`/*`
`5`	`4`	`Copyright 2021 The Kubernetes Authors.`