Merge remote-tracking branch 'upstream/master' into driver-name-update

Author: y1r

.github/dependabot.yaml

@@ -17,42 +17,46 @@ enable-beta-ecosystems: true
 updates:
   - package-ecosystem: gomod
     directories: ["/", "/tests/e2e/"]
-    allow:
-      - dependency-type: "all"
+    groups:
+      all:
+        patterns:
+          - "*"
     schedule:
       interval: weekly
       day: "wednesday"
       time: "06:00"
       timezone: "America/New_York"
-    groups:
-      k8s-dependencies:
-        patterns:
-          - "k8s.io*"
-          - "sigs.k8s.io*"
-          - "github.com/kubernetes-csi*"
-      misc-dependencies:
-        patterns:
-          - "*"
-        exclude-patterns:
-          - "k8s.io*"
-          - "sigs.k8s.io*"
-          - "github.com/kubernetes-csi*"
     labels:
       - "area/dependency"
       - "ok-to-test"
       - "release-note-none"
   - package-ecosystem: "github-actions"
     directory: "/"
+    groups:
+      all:
+        patterns:
+          - "*"
     schedule:
       interval: weekly
       # Wednesday chosen to minimize time after Windows Patch Tuesdays
       day: "wednesday"
       time: "06:00"
       timezone: "America/New_York"
+    labels:
+      - "area/dependency"
+      - "ok-to-test"
+      - "release-note-none"
+  - package-ecosystem: docker
+    directory: "/"
     groups:
-      actions:
+      all:
         patterns:
           - "*"
+    schedule:
+      interval: weekly
+      day: "wednesday"
+      time: "06:00"
+      timezone: "America/New_York"
     labels:
       - "area/dependency"
       - "ok-to-test"

.github/workflows/dependency-review.yaml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/generate-code-coverage.yaml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.base.ref }}
 
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
         uses: actions/setup-go@v5

.github/workflows/helm-chart-release.yaml

@@ -17,7 +17,7 @@ name: Release Helm Charts
 on:
   push:
     branches:
-      - master
+      - 'release-*'
     paths:
       - "charts/**/Chart.yaml"
 
@@ -31,7 +31,7 @@ jobs:
     permissions: write-all
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Configure Git

.github/workflows/trivy-containers.yaml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - id: set-matrix
         uses: mikefarah/yq@v4
@@ -65,7 +65,7 @@ jobs:
         run: docker pull ${{ matrix.image }}
 
       - name: Scan container image
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
         with:

.github/workflows/trivy.yaml

@@ -28,10 +28,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         env:
           TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db
         with:

.github/workflows/unit-tests.yaml

@@ -30,7 +30,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
         uses: actions/setup-go@v5

.golangci.yml

@@ -1,4 +1,4 @@
-# Copyright 2024 The Kubernetes Authors.
+# Copyright 2025 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -12,36 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+version: "2"
 run:
   modules-download-mode: readonly
-issues:
-  exclude-rules:
-    # gosec recommends ignoring test files
-    - path: (.+)_test.go
-      linters:
-        - gosec
-    - path: tests/e2e
-      linters:
-        - gosec
-    - path: tests/sanity
-      linters:
-        - gosec
-linters-settings:
-  revive:
-    rules:
-      # Using += 1 instead of ++ is fine
-      - name: increment-decrement
-        disabled: true
-  stylecheck:
-    # Dot importing ginkgo and gomega is standard practice
-    dot-import-whitelist:
-      - "github.com/onsi/gomega"
-      - "github.com/onsi/ginkgo/v2"
-  usetesting:
-    # Turning check for os.MkdirTemp() off as t.TempDir() is not sufficient for mounter and sanity tests in their current state.
-    os-mkdir-temp: false 
 linters:
-  enable-all: true
+  default: all
   disable:
     - govet # We already run with `make verify/govet`
     # We do not use
@@ -52,7 +27,6 @@ linters:
     - funlen # Long func names happen
     - gocognit # Cognitive complexity
     - gocyclo # Cyclomatic complexity
-    - gofumpt # We don't rely on gofumpt
     - gomoddirectives # We need `replace` in `go.mod`
     - interfacebloat # No more than 10 interface methods
     - ireturn # Accept interfaces return concrete types
@@ -64,10 +38,53 @@ linters:
     - testpackage # Require separate test package to catch leaky unexported dependencies
     - varnamelen # Long var names happen
     - wsl # Too strict of a whitespace linter
+    - wsl_v5 # Too strict
     # Consider adding in future
     - err113 # Do not create errors dynamically from scratch. Instead, wrap static (package-level) error.
     - wrapcheck # Same as err113
     - gochecknoglobals  # Do not allow global variables
     - godox # Do not allow TODOs
     - nonamedreturns # Need to nolint/refactor a few places our code
     - paralleltest # There are many tests that aren't parallelized
+    - funcorder # Many of our existing files are out of order
+    - noinlineerr # We use inline errors
+    - embeddedstructfieldcheck # We have a few instances of this
+  settings:
+    revive:
+      rules:
+        # Using += 1 instead of ++ is fine
+        - name: increment-decrement
+          disabled: true
+    staticcheck:
+      # Dot importing ginkgo and gomega is standard practice
+      dot-import-whitelist:
+        - github.com/onsi/gomega
+        - github.com/onsi/ginkgo/v2
+    usetesting:
+      # Turning check for os.MkdirTemp() off as t.TempDir() is not sufficient for mounter and sanity tests in their current state.
+      os-mkdir-temp: false
+  exclusions:
+    # Exclude files that look auto-generated
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+    rules:
+      # gosec recommends ignoring test files
+      - linters:
+          - gosec
+        path: (.+)_test.go
+      - linters:
+          - gosec
+        path: tests/e2e
+      - linters:
+          - gosec
+        path: tests/sanity
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax