Merge pull request kubernetes#129875 from pohly/golangci-lint-strict-removal

golangci-lint: remove "strict" checking

Author: k8s-ci-robot

hack/golangci-hints.yaml

@@ -2,8 +2,6 @@
 # enable an increasing amount of checks:
 # - golangci.yaml is the most permissive configuration. All existing code
 #   passed.
-# - golangci-strict.yaml adds checks that all new code in pull requests
-#   must pass.
 # - golangci-hints.yaml adds checks for code patterns where developer
 #   and reviewer may decide whether findings should get addressed before
 #   merging. Beware that the golangci-lint output includes also the

hack/golangci-strict.yaml

@@ -2,8 +2,6 @@
 # enable an increasing amount of checks:
 # - golangci.yaml is the most permissive configuration. All existing code
 #   passed.
-# - golangci-strict.yaml adds checks that all new code in pull requests
-#   must pass.
 # - golangci-hints.yaml adds checks for code patterns where developer
 #   and reviewer may decide whether findings should get addressed before
 #   merging. Beware that the golangci-lint output includes also the

hack/golangci.yaml

@@ -2,8 +2,6 @@
 # enable an increasing amount of checks:
 # - golangci.yaml is the most permissive configuration. All existing code
 #   passed.
-# - golangci-strict.yaml adds checks that all new code in pull requests
-#   must pass.
 # - golangci-hints.yaml adds checks for code patterns where developer
 #   and reviewer may decide whether findings should get addressed before
 #   merging. Beware that the golangci-lint output includes also the
@@ -171,11 +169,6 @@ linters:
   {{- if not .Base }}
     - usestdlibvars
   {{- end}}
-  {{- if .Strict}}
-  disable:
-    # https://github.com/kubernetes/kubernetes/issues/117288#issuecomment-1507008359
-    - errcheck
-  {{- end}}
 
 linters-settings: # please keep this alphabetized
   custom:

hack/golangci.yaml.in

@@ -40,5 +40,4 @@ generate () {
 
 # Regenerate.
 generate hack/golangci.yaml Base=1
-generate hack/golangci-strict.yaml Strict=1
 generate hack/golangci-hints.yaml Hints=1

hack/update-golangci-lint-config.sh

@@ -25,7 +25,6 @@ Usage: $0 [-r <revision>|-a] [-s] [-c none|<config>] [-- <golangci-lint run flag
    -r <revision>: only report issues in code added since that revision
    -a: automatically select the common base of origin/master and HEAD
        as revision
-   -s: select a strict configuration for new code
    -n: in addition to strict checking, also enable hints (aka nits) that may or may not
        be useful
    -g <github action file>: also write results with --out-format=github-actions
@@ -53,7 +52,6 @@ invocation=(./hack/verify-golangci-lint.sh "$@")
 golangci=("${GOBIN}/golangci-lint" run)
 golangci_config="${KUBE_ROOT}/hack/golangci.yaml"
 base=
-strict=
 hints=
 githubactions=
 while getopts "ar:sng:c:" o; do
@@ -69,10 +67,6 @@ while getopts "ar:sng:c:" o; do
         usage
       fi
       ;;
-    s)
-      golangci_config="${KUBE_ROOT}/hack/golangci-strict.yaml"
-      strict=1
-      ;;
     n)
       golangci_config="${KUBE_ROOT}/hack/golangci-hints.yaml"
       hints=1
@@ -185,18 +179,12 @@ else
     echo "Please review the above warnings. You can test via \"${invocation[*]}\""
     echo 'If the above warnings do not make sense, you can exempt this warning with a comment'
     echo ' (if your reviewer is okay with it).'
-    if [ "$strict" ]; then
-        echo
-        echo 'golangci-strict.yaml was used as configuration. Warnings must be fixed in'
-        echo 'new or modified code.'
-    elif [ "$hints" ]; then
+    if [ "$hints" ]; then
         echo
         echo 'golangci-hints.yaml was used as configuration. Some of the reported issues may'
         echo 'have to be fixed while others can be ignored, depending on the circumstances'
         echo 'and/or personal preferences. To determine which issues have to be fixed, check'
-        echo 'the report that uses golangci-strict.yaml (= pull-kubernetes-verify-lint).'
-    fi
-    if [ "$strict" ] || [ "$hints" ]; then
+        echo 'the report that uses golangci.yaml (= pull-kubernetes-verify).'
         echo
         echo 'If you feel that this warns about issues that should be ignored by default,'
         echo 'then please discuss with your reviewer and propose'
@@ -208,12 +196,13 @@ else
         echo 'Instead, propose to fix certain linter issues in an issue first and'
         echo 'discuss there with maintainers. PRs are welcome if they address a real'
         echo 'problem, which then needs to be explained in the PR.'
+    else
+        echo
+        echo 'In general please prefer to fix the error, we have already disabled specific lints'
+        echo ' that the project chooses to ignore.'
+        echo 'See: https://golangci-lint.run/usage/false-positives/'
     fi
     echo
-    echo 'In general please prefer to fix the error, we have already disabled specific lints'
-    echo ' that the project chooses to ignore.'
-    echo 'See: https://golangci-lint.run/usage/false-positives/'
-    echo
   } >&2
   exit 1
 fi