Skip to content

Commit

Permalink
Revert "build: Temporary lint config fix until next golangci-lint rel…
Browse files Browse the repository at this point in the history
…ease (#629)"

This reverts commit 4d0fa65.
  • Loading branch information
jimmidyson committed May 22, 2024
1 parent 0ce44c2 commit 1eaa069
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
4 changes: 0 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ issues:
- source: "// \\+kubebuilder:"
linters:
- lll
# Temporary workaround until https://github.com/golangci/golangci-lint/pull/4698 is
# available in released version of golangci-lint
- path: "(test/e2e/e2e_suite_test.go|v1alpha1)"
text: "don't use `init` function"
# Idiomatic to use pass holderRef by value
- text: "hugeParam: holderRef is heavy"
linters:
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/clusterconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ type AESConfiguration struct{}

type SecretboxConfiguration struct{}

//nolint:gochecknoinits // Idiomatic to use init functions to register APIs with scheme.
func init() {
SchemeBuilder.Register(
&AWSClusterConfig{},
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/nodeconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ type NutanixNodeConfigSpec struct {
Nutanix *NutanixNodeSpec `json:"nutanix,omitempty"`
}

//nolint:gochecknoinits // Idiomatic to use init functions to register APIs with scheme.
func init() {
SchemeBuilder.Register(&AWSWorkerNodeConfig{}, &DockerNodeConfig{}, &NutanixNodeConfig{})
}
1 change: 1 addition & 0 deletions test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
clusterctltemp "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/framework/clusterctl"
)

//nolint:gochecknoinits // Idiomatically used to set up flags.
func init() {
flag.StringVar(&configPath, "e2e.config", "", "path to the e2e config file")
flag.StringVar(
Expand Down

0 comments on commit 1eaa069

Please sign in to comment.