From 9a001eee220c313e65e42ade5733db62d73ba1ad Mon Sep 17 00:00:00 2001
From: Seth Heidkamp <61526534+sheidkamp@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:00:02 -0500
Subject: [PATCH] linter changes (#10625)

---
 .golangci.yaml                                | 21 +++++--------------
 .../v1.19.0-beta9/linter-yaml-changes.yaml    |  7 +++++++
 2 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 changelog/v1.19.0-beta9/linter-yaml-changes.yaml

diff --git a/.golangci.yaml b/.golangci.yaml
index 871f3450d11..0512f9316c4 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -79,24 +79,13 @@ run:
   # If we find that the job is timing out, we can explore ways to make this job run faster, or increase the timeout.
   timeout: 10m
 
-  skip-dirs:
-    # don't lint ruleguard files
-    - test/rules
-
-    # don't lint gomock intermediate files
-    - 'gomock_reflect_\d*'
-
 # output configuration options
 output:
-  # Format: colored-line-number|line-number|json|colored-tab|tab|checkstyle|code-climate|junit-xml|github-actions|teamcity
-  #
-  # Multiple can be specified by separating them by comma, output can be provided
-  # for each of them by separating format name and path by colon symbol.
-  # Output path can be either `stdout`, `stderr` or path to the file to write to.
-  # Example: "checkstyle:report.xml,json:stdout,colored-line-number"
-  #
-  # Default: colored-line-number
-  format: colored-line-number
+  # Use default format
+  # Default:
+  #   formats:
+  #     - format: colored-line-number
+  #       path: stdout
 
   # Print lines of code with issue.
   print-issued-lines: true
diff --git a/changelog/v1.19.0-beta9/linter-yaml-changes.yaml b/changelog/v1.19.0-beta9/linter-yaml-changes.yaml
new file mode 100644
index 00000000000..5fae59c6a32
--- /dev/null
+++ b/changelog/v1.19.0-beta9/linter-yaml-changes.yaml
@@ -0,0 +1,7 @@
+changelog:
+  - type: NON_USER_FACING
+    resolvesIssue: false
+    description: >-
+      Updates for golangci-lint-action  breaking changes in `6.5.0`
+      skipCI-kube-tests:true
+      skipCI-docs-build:true