From 6c0a434db0b0adb96c19d77cbc03dd85d2f4d008 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Wed, 20 Jul 2022 12:46:41 -0400
Subject: [PATCH] Try disabling logcheck for golang 1.19rc2

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 .golangci.yaml               | 16 +++++++++-------
 hack/verify-golangci-lint.sh | 27 +++++++++++++++------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index e6a6ff9e17b..a37eb5abdd8 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -21,18 +21,20 @@ linters:
   # - structcheck
   # - varcheck
     - ineffassign
-    - logcheck
+  # TODO(golang): Need to fix this to work with golang 1.19
+  #  - logcheck
     - staticcheck
     - stylecheck
     - unused
 
 linters-settings: # please keep this alphabetized
-  custom:
-    logcheck:
-      # Installed there by hack/verify-golangci-lint.sh.
-      path: _output/local/bin/logcheck.so
-      description: structured logging checker
-      original-url: k8s.io/klog/hack/tools
+# TODO(golang): Need to fix this to work with golang 1.19
+#  custom:
+#    logcheck:
+#      # Installed there by hack/verify-golangci-lint.sh.
+#      path: _output/local/bin/logcheck.so
+#      description: structured logging checker
+#      original-url: k8s.io/klog/hack/tools
   staticcheck:
     go: "1.18"
     checks: [
diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh
index 9306cce8b92..abc99b307c0 100755
--- a/hack/verify-golangci-lint.sh
+++ b/hack/verify-golangci-lint.sh
@@ -39,22 +39,25 @@ export GO111MODULE=on
 echo "installing golangci-lint and logcheck plugin from hack/tools into ${GOBIN}"
 pushd "${KUBE_ROOT}/hack/tools" >/dev/null
   go install github.com/golangci/golangci-lint/cmd/golangci-lint
-  go build -o "${GOBIN}/logcheck.so" -buildmode=plugin sigs.k8s.io/logtools/logcheck/plugin
+# TODO(golang): Need to fix this to work with golang 1.19
+#  go build -o "${GOBIN}/logcheck.so" -buildmode=plugin sigs.k8s.io/logtools/logcheck/plugin
 popd >/dev/null
 
 cd "${KUBE_ROOT}"
 
-# The config is in ${KUBE_ROOT}/.golangci.yaml where it will be found
-# even when golangci-lint is invoked in a sub-directory.
-#
-# The logcheck plugin currently has to be configured via env variables
-# (https://github.com/golangci/golangci-lint/issues/1512).
-#
-# Remember to clean the golangci-lint cache when changing
-# the configuration and running this script multiple times,
-# otherwise golangci-lint will report stale results:
-# _output/local/bin/golangci-lint cache clean
-export LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf"
+## The config is in ${KUBE_ROOT}/.golangci.yaml where it will be found
+## even when golangci-lint is invoked in a sub-directory.
+##
+## The logcheck plugin currently has to be configured via env variables
+## (https://github.com/golangci/golangci-lint/issues/1512).
+##
+## Remember to clean the golangci-lint cache when changing
+## the configuration and running this script multiple times,
+## otherwise golangci-lint will report stale results:
+## _output/local/bin/golangci-lint cache clean
+# TODO(golang): Need to fix this to work with golang 1.19
+#export LOGCHECK_CONFIG="${KUBE_ROOT}/hack/logcheck.conf"
+
 echo 'running golangci-lint ' >&2
 res=0
 if [[ "$#" -gt 0 ]]; then