Skip to content

Commit f29edf0

Browse files
committed
"revert: Temporary lint config fix until next golangci-lint release (#629)"
This reverts commit 4d0fa65.
1 parent 0ce44c2 commit f29edf0

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ issues:
101101
- source: "// \\+kubebuilder:"
102102
linters:
103103
- lll
104-
# Temporary workaround until https://github.com/golangci/golangci-lint/pull/4698 is
105-
# available in released version of golangci-lint
106-
- path: "(test/e2e/e2e_suite_test.go|v1alpha1)"
107-
text: "don't use `init` function"
108104
# Idiomatic to use pass holderRef by value
109105
- text: "hugeParam: holderRef is heavy"
110106
linters:

api/v1alpha1/clusterconfig_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ type AESConfiguration struct{}
304304

305305
type SecretboxConfiguration struct{}
306306

307+
//nolint:gochecknoinits // Idiomatic to use init functions to register APIs with scheme.
307308
func init() {
308309
SchemeBuilder.Register(
309310
&AWSClusterConfig{},

api/v1alpha1/nodeconfig_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ type NutanixNodeConfigSpec struct {
102102
Nutanix *NutanixNodeSpec `json:"nutanix,omitempty"`
103103
}
104104

105+
//nolint:gochecknoinits // Idiomatic to use init functions to register APIs with scheme.
105106
func init() {
106107
SchemeBuilder.Register(&AWSWorkerNodeConfig{}, &DockerNodeConfig{}, &NutanixNodeConfig{})
107108
}

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
clusterctltemp "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
3434
)
3535

36+
//nolint:gochecknoinits // Idiomatically used to set up flags.
3637
func init() {
3738
flag.StringVar(&configPath, "e2e.config", "", "path to the e2e config file")
3839
flag.StringVar(

0 commit comments

Comments
 (0)