fix: upgrade golangci-lint to v2 and fix all lint issues

- Bump golangci-lint v1.54.2 → v2.10.1 (v1.54.2 has dead dependency
  go.tmz.dev/musttag causing install failures)
- Add .golangci.yml with version: "2" config
- Fix revive lints: stutter (BatteriesList→List), receiver-naming,
  unused-parameter, blank-imports (add comments)
- Fix staticcheck QF1008: remove redundant embedded field selectors

Signed-off-by: mjudeikis-bot <mjudeikis-bot@faros.sh>
Co-authored-by: Mangirdas Judeikis <mangirdas@judeikis.lt>

Author: mjudeikis-bot

.golangci.yml

@@ -0,0 +1,26 @@
+version: "2"
+run:
+  allow-parallel-runners: true
+linters:
+  default: none
+  enable:
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    - misspell
+    - gosec
+    - revive
+  exclusions:
+    presets:
+      - comments
+      - common-false-positives
+      - std-error-handling
+    rules:
+      - linters:
+          - gosec
+        path: ".*_test\\.go"
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0

Makefile

@@ -44,7 +44,7 @@ OPENSHIFT_GOIMPORTS_BIN := openshift-goimports
 OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/$(OPENSHIFT_GOIMPORTS_BIN)-$(OPENSHIFT_GOIMPORTS_VER)
 export OPENSHIFT_GOIMPORTS # so hack scripts can use it
 
-GOLANGCI_LINT_VER := v1.64.8
+GOLANGCI_LINT_VER := v2.10.1
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 

server/batteries/battery.go

@@ -44,7 +44,7 @@ import (
 
 type Battery string
 
-type BatteriesList map[Battery]BatterySpec
+type List map[Battery]BatterySpec
 
 type BatterySpec struct {
 	// Enabled indicates whether the battery is enabled.
@@ -114,7 +114,7 @@ func (b Battery) String() string {
 
 func New() Options {
 	b := Options{
-		batteries: make(BatteriesList, len(defaultBatteries)),
+		batteries: make(List, len(defaultBatteries)),
 	}
 	for name, spec := range defaultBatteries {
 		b.batteries[name] = spec

server/batteries/options.go

@@ -31,12 +31,12 @@ import (
 
 // Options holds the configuration for the batteries.
 type Options struct {
-	batteries BatteriesList
+	batteries List
 	Enabled   []string
 }
 
 type completedOptions struct {
-	batteries BatteriesList
+	batteries List
 	Enabled   []string
 }
 
@@ -76,35 +76,35 @@ func (s *Options) AddFlags(fs *pflag.FlagSet) {
 }
 
 // Complete defaults fields that have not set by the consumer of this package.
-func (b Options) Complete() CompletedOptions {
+func (s Options) Complete() CompletedOptions {
 	// Ensure all related configurations are configured
-	for _, name := range b.Enabled {
+	for _, name := range s.Enabled {
 		if len(name) == 0 {
 			continue
 		}
 		switch name[0] {
 		case '-':
-			if _, ok := b.batteries[Battery(name[1:])]; !ok {
+			if _, ok := s.batteries[Battery(name[1:])]; !ok {
 				fmt.Fprintf(os.Stderr, "Warning: unknown battery %q\n", name[1:])
 			}
-			b.Disable(Battery(name[1:]))
+			s.Disable(Battery(name[1:]))
 		case '+':
-			if _, ok := b.batteries[Battery(name[1:])]; !ok {
+			if _, ok := s.batteries[Battery(name[1:])]; !ok {
 				fmt.Fprintf(os.Stderr, "Warning: unknown battery %q\n", name[1:])
 			}
-			b.Enable(Battery(name[1:]))
+			s.Enable(Battery(name[1:]))
 		default:
-			if _, ok := b.batteries[Battery(name[1:])]; !ok {
+			if _, ok := s.batteries[Battery(name[1:])]; !ok {
 				fmt.Fprintf(os.Stderr, "Warning: unknown battery %q\n", name)
 			}
-			b.Enable(Battery(name))
+			s.Enable(Battery(name))
 		}
 	}
 
 	ret := CompletedOptions{
 		&completedOptions{
-			batteries: b.batteries,
-			Enabled:   b.Enabled,
+			batteries: s.batteries,
+			Enabled:   s.Enabled,
 		},
 	}
 

server/cmd/help.go

@@ -40,7 +40,7 @@ func setPartialUsageAndHelpFunc(cmd *cobra.Command, fss cliflag.NamedFlagSets, c
 		fmt.Fprintf(cmd.OutOrStderr(), "\nUse \"%s\" for a list of all flags available.\n", cmd.CommandPath())
 		return nil
 	})
-	cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+	cmd.SetHelpFunc(func(cmd *cobra.Command, _ []string) {
 		fmt.Fprintf(cmd.OutOrStdout(), "%s\n\n"+usageFmt, cmd.Long, cmd.UseLine())
 		printMostImportantFlags(cmd.OutOrStdout(), fss, cols, flags)
 		fmt.Fprintf(cmd.OutOrStderr(), "\nUse \"%s options\" for a list of all flags available.\n", cmd.CommandPath())

server/cmd/options/authentication.go

@@ -106,7 +106,7 @@ func (s *AdminAuthentication) ApplyTo(config *genericapiserver.Config) (volatile
 		Groups: []string{},
 	}
 
-	newAuthenticator := group.NewAuthenticatedGroupAdder(bearertoken.New(authenticator.WrapAudienceAgnosticToken(config.Authentication.APIAudiences, authenticator.TokenFunc(func(ctx context.Context, requestToken string) (*authenticator.Response, bool, error) {
+	newAuthenticator := group.NewAuthenticatedGroupAdder(bearertoken.New(authenticator.WrapAudienceAgnosticToken(config.Authentication.APIAudiences, authenticator.TokenFunc(func(_ context.Context, requestToken string) (*authenticator.Response, bool, error) {
 		if requestToken == volatileGcpAdminToken {
 			return &authenticator.Response{User: gcpAdminUser}, true, nil
 		}

server/cmd/options/config.go

@@ -132,7 +132,7 @@ func NewConfig(opts CompletedOptions) (*Config, error) {
 	}
 	c.APIExtensions = apiExtensions
 
-	aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.Generic, opts.GenericControlPlane, kubeAPIs.VersionedInformers, serviceResolver, kubeAPIs.ProxyTransport, kubeAPIs.Extra.PeerProxy, pluginInitializer)
+	aggregator, err := controlplaneapiserver.CreateAggregatorConfig(*kubeAPIs.Generic, opts.GenericControlPlane, kubeAPIs.VersionedInformers, serviceResolver, kubeAPIs.ProxyTransport, kubeAPIs.PeerProxy, pluginInitializer)
 	if err != nil {
 		return nil, err
 	}

server/cmd/server.go

@@ -28,7 +28,7 @@ import (
 	apiextensionapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	_ "k8s.io/apiserver/pkg/admission"
+	_ "k8s.io/apiserver/pkg/admission" // register admission plugins
 	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -39,14 +39,14 @@ import (
 	"k8s.io/component-base/cli/globalflag"
 	"k8s.io/component-base/logs"
 	logsapi "k8s.io/component-base/logs/api/v1"
-	_ "k8s.io/component-base/metrics/prometheus/workqueue"
+	_ "k8s.io/component-base/metrics/prometheus/workqueue" // register workqueue metrics
 	"k8s.io/component-base/term"
 	"k8s.io/component-base/version"
 	"k8s.io/component-base/version/verflag"
 	"k8s.io/klog/v2"
 	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
 	controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver"
-	_ "k8s.io/kubernetes/pkg/features"
+	_ "k8s.io/kubernetes/pkg/features" // register feature gates
 
 	"github.com/kcp-dev/generic-controlplane/server/batteries"
 	"github.com/kcp-dev/generic-controlplane/server/cmd/help"
@@ -91,7 +91,7 @@ APIs.`,
 			rest.SetDefaultWarningHandler(rest.NoWarnings{})
 			return nil
 		},
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			verflag.PrintAndExitIfRequested()
 			fs := cmd.Flags()
 
@@ -154,7 +154,7 @@ APIs.`,
 			rest.SetDefaultWarningHandler(rest.NoWarnings{})
 			return nil
 		},
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			fmt.Fprintf(cmd.OutOrStderr(), usageFmt, cmdStart.UseLine())
 			cliflag.PrintSections(cmd.OutOrStderr(), namedFlagSets, cols)
 			return nil
@@ -207,7 +207,7 @@ func Run(ctx context.Context, opts options.CompletedOptions) error {
 	}
 
 	// write the kubeconfig file as close to the start of the server as possible
-	err = completed.Options.AdminAuthentication.WriteKubeConfig(completed.ControlPlane.Generic, completed.ExtraConfig.GcpAdminToken, completed.ExtraConfig.UserToken)
+	err = completed.Options.AdminAuthentication.WriteKubeConfig(completed.ControlPlane.Generic, completed.GcpAdminToken, completed.UserToken)
 	if err != nil {
 		return err
 	}

server/tokengetter/tokengetter.go

@@ -40,7 +40,7 @@ func (c clientGetter) GetServiceAccount(namespace, name string) (*v1.ServiceAcco
 	return c.serviceAccountLister.ServiceAccounts(namespace).Get(name)
 }
 
-func (c clientGetter) GetPod(namespace, name string) (*v1.Pod, error) {
+func (c clientGetter) GetPod(_, name string) (*v1.Pod, error) {
 	return nil, apierrors.NewNotFound(v1.Resource("pods"), name)
 }