Merge pull request #8203 from jklaw90/julian/golangci-lint-v2

chore: bump golangci lint to v2

Author: k8s-ci-robot

.github/workflows/ci.yaml

@@ -44,7 +44,7 @@ jobs:
           GO111MODULE: auto
 
       - name: golangci-lint - vertical-pod-autoscaler
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           args: --timeout=30m
           working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/vertical-pod-autoscaler

vertical-pod-autoscaler/.golangci.yaml

@@ -1,14 +1,26 @@
+version: "2"
 linters:
   enable:
     - forbidigo
+  settings:
+    forbidigo:
+      forbid:
+        # Forbid use of archived package "github.com/pkg/errors". Context: https://github.com/kubernetes/autoscaler/pull/7845
+        - pkg: github.com/pkg/errors
+      analyze-types: true
+formatters:
+  enable:
     - goimports
-
-linters-settings:
-  forbidigo:
-    forbid:
-      # Forbid use of archived package "github.com/pkg/errors". Context: https://github.com/kubernetes/autoscaler/pull/7845
-      - pkg: github.com/pkg/errors
-    analyze-types: true
-
-  goimports:
-    local-prefixes: "k8s.io/autoscaler/vertical-pod-autoscaler"
+    - gci
+  settings:
+    goimports:
+      local-prefixes:
+        - k8s.io/autoscaler/vertical-pod-autoscaler
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(k8s.io/autoscaler/vertical-pod-autoscaler)
+        - dot
+        - blank
+      custom-order: true

vertical-pod-autoscaler/pkg/admission-controller/certs.go

@@ -24,10 +24,9 @@ import (
 	"os"
 	"sync"
 
+	"github.com/fsnotify/fsnotify"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-
-	"github.com/fsnotify/fsnotify"
 	admissionregistrationv1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1"
 	"k8s.io/klog/v2"
 )
@@ -76,7 +75,7 @@ func (cr *certReloader) start(stop <-chan struct{}) error {
 	}
 
 	go func() {
-		defer watcher.Close()
+		defer watcher.Close() // nolint:errcheck
 		for {
 			select {
 			case event := <-watcher.Events:

vertical-pod-autoscaler/pkg/admission-controller/certs_test.go

@@ -35,7 +35,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	k8stesting "k8s.io/client-go/testing"
@@ -260,10 +259,8 @@ func TestChangedCAReloader(t *testing.T) {
 	}
 
 	oldCAEncodedString := base64.StdEncoding.EncodeToString(oldWebhookCABundle)
-	for {
-		if patchCalled.Load() {
-			break
-		}
+	for !patchCalled.Load() {
+
 		time.Sleep(1 * time.Second)
 	}
 	newWebhookConfig, err := webhookConfigInterface.Get(context.TODO(), webhookConfigName, metav1.GetOptions{})

vertical-pod-autoscaler/pkg/admission-controller/config.go

@@ -62,7 +62,7 @@ func configTLS(cfg certsConfig, minTlsVersion, ciphers string, stop <-chan struc
 	case "tls1_3":
 		tlsVersion = tls.VersionTLS13
 	default:
-		klog.Fatal(fmt.Errorf("Unable to determine value for --min-tls-version (%s), must be either tls1_2 or tls1_3", minTlsVersion))
+		klog.Fatal(fmt.Errorf("unable to determine value for --min-tls-version (%s), must be either tls1_2 or tls1_3", minTlsVersion))
 	}
 
 	config := &tls.Config{

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/observed_containers_test.go

@@ -20,13 +20,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	core "k8s.io/api/core/v1"
 
 	resource_admission "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/annotations"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func addVpaObservedContainersPatch(containerNames []string) resource_admission.PatchRecord {

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/resource_updates.go

@@ -56,7 +56,7 @@ func (c *resourcesUpdatesPatchCalculator) CalculatePatches(pod *core.Pod, vpa *v
 
 	containersResources, annotationsPerContainer, err := c.recommendationProvider.GetContainersResourcesForPod(pod, vpa)
 	if err != nil {
-		return []resource_admission.PatchRecord{}, fmt.Errorf("Failed to calculate resource patch for pod %s/%s: %v", pod.Namespace, pod.Name, err)
+		return []resource_admission.PatchRecord{}, fmt.Errorf("failed to calculate resource patch for pod %s/%s: %v", pod.Namespace, pod.Name, err)
 	}
 
 	if annotationsPerContainer == nil {

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/resource_updates_test.go

@@ -21,15 +21,14 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	resource_admission "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource"
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test"
 	vpa_api_util "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/vpa"
-
-	"github.com/stretchr/testify/assert"
 )
 
 const (

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/patch/test_util.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"testing"
 
-	resource_admission "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource"
-
 	"github.com/stretchr/testify/assert"
+
+	resource_admission "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/admission-controller/resource"
 )
 
 // EqPatch returns true if patches are equal by comparing their

vertical-pod-autoscaler/pkg/admission-controller/resource/pod/recommendation/recommendation_provider_test.go

@@ -21,15 +21,14 @@ import (
 	"math"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/limitrange"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/test"
 	vpa_api_util "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/utils/vpa"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func mustParseResourcePointer(val string) *resource.Quantity {