From cf2e6291d1564a2885ebee37d8253856723342fc Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 3 May 2022 13:22:47 +0200
Subject: [PATCH] hack: move golangci-lint config files

Because the script now explicitly selects the configuration file, the files no
longer have to be in the root directory. Having them in hack without the
leading dot is better because they then have the same owners as the script and
are more visible.

The downside is that manual invocations of golangci-lint without the parameter
no longer work.
---
 .golangci.yaml => hack/golangci.yaml | 2 +-
 hack/verify-golangci-lint.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename .golangci.yaml => hack/golangci.yaml (97%)

diff --git a/.golangci.yaml b/hack/golangci.yaml
similarity index 97%
rename from .golangci.yaml
rename to hack/golangci.yaml
index 29de7f79162..c79fd1cd1ed 100644
--- a/.golangci.yaml
+++ b/hack/golangci.yaml
@@ -32,7 +32,7 @@ linters-settings: # please keep this alphabetized
   custom:
     logcheck:
       # Installed there by hack/verify-golangci-lint.sh.
-      path: _output/local/bin/logcheck.so
+      path: ../_output/local/bin/logcheck.so
       description: structured logging checker
       original-url: k8s.io/klog/hack/tools
   gocritic:
diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh
index d143a89ed1f..11ab9ec53d7 100755
--- a/hack/verify-golangci-lint.sh
+++ b/hack/verify-golangci-lint.sh
@@ -40,7 +40,7 @@ invocation=(./hack/verify-golangci-lint.sh "$@")
 # otherwise golangci-lint will report stale results:
 # _output/local/bin/golangci-lint cache clean
 golangci=(env LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf" "${GOBIN}/golangci-lint" run)
-golangci_config="${KUBE_ROOT}/.golangci.yaml"
+golangci_config="${KUBE_ROOT}/hack/golangci.yaml"
 golangci+=(--config="${golangci_config}")
 
 kube::golang::verify_go_version