Skip to content

🌱 Bump golangci-lint to v2.6.1 #2825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
+5 −24
Merged

🌱 Bump golangci-lint to v2.6.1 #2825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions pkg/cloud/services/compute/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2024 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/openstack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/openstack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/shared/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/conformance/conformance_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/conformance/conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/clusterctl_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/quick_start_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2024 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/remediations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2021 The Kubernetes Authors.
Expand Down
1 change: 0 additions & 1 deletion test/e2e/suites/e2e/self_hosted_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//go:build e2e
// +build e2e

/*
Copyright 2022 The Kubernetes Authors.
Expand Down