From 318ea033d50e7686afbd481aed10ac9b7ee4fc0d Mon Sep 17 00:00:00 2001 From: bells17 Date: Tue, 7 May 2024 20:35:33 +0900 Subject: [PATCH] Include k8s.io components with contextual logging in logcheck.conf --- hack/golangci-hints.yaml | 12 ++++++++++++ hack/golangci-strict.yaml | 12 ++++++++++++ hack/golangci.yaml | 12 ++++++++++++ hack/logcheck.conf | 12 ++++++++++++ 4 files changed, 48 insertions(+) diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml index 792c9b60245..8ee932459ec 100644 --- a/hack/golangci-hints.yaml +++ b/hack/golangci-hints.yaml @@ -127,12 +127,24 @@ linters-settings: # please keep this alphabetized # The following packages have been migrated to contextual logging. # Packages matched here do not have to be listed above because # "contextual" implies "structured". + contextual k8s.io/api/.* contextual k8s.io/apimachinery/pkg/util/runtime/.* contextual k8s.io/client-go/metadata/.* contextual k8s.io/client-go/tools/events/.* contextual k8s.io/client-go/tools/record/.* contextual k8s.io/component-helpers/.* + contextual k8s.io/cri-api/.* + contextual k8s.io/cri-client/.* contextual k8s.io/dynamic-resource-allocation/.* + contextual k8s.io/endpointslice/.* + contextual k8s.io/kms/.* + contextual k8s.io/kube-controller-manager/.* + contextual k8s.io/kube-proxy/.* + contextual k8s.io/kube-scheduler/.* + contextual k8s.io/legacy-cloud-providers/.* + contextual k8s.io/sample-apiserver/.* + contextual k8s.io/sample-cli-plugin/.* + contextual k8s.io/sample-controller/.* contextual k8s.io/kubernetes/cmd/kube-proxy/.* contextual k8s.io/kubernetes/cmd/kube-scheduler/.* contextual k8s.io/kubernetes/pkg/controller/.* diff --git a/hack/golangci-strict.yaml b/hack/golangci-strict.yaml index b72ea312593..d5a884bdd3d 100644 --- a/hack/golangci-strict.yaml +++ b/hack/golangci-strict.yaml @@ -173,12 +173,24 @@ linters-settings: # please keep this alphabetized # The following packages have been migrated to contextual logging. # Packages matched here do not have to be listed above because # "contextual" implies "structured". + contextual k8s.io/api/.* contextual k8s.io/apimachinery/pkg/util/runtime/.* contextual k8s.io/client-go/metadata/.* contextual k8s.io/client-go/tools/events/.* contextual k8s.io/client-go/tools/record/.* contextual k8s.io/component-helpers/.* + contextual k8s.io/cri-api/.* + contextual k8s.io/cri-client/.* contextual k8s.io/dynamic-resource-allocation/.* + contextual k8s.io/endpointslice/.* + contextual k8s.io/kms/.* + contextual k8s.io/kube-controller-manager/.* + contextual k8s.io/kube-proxy/.* + contextual k8s.io/kube-scheduler/.* + contextual k8s.io/legacy-cloud-providers/.* + contextual k8s.io/sample-apiserver/.* + contextual k8s.io/sample-cli-plugin/.* + contextual k8s.io/sample-controller/.* contextual k8s.io/kubernetes/cmd/kube-proxy/.* contextual k8s.io/kubernetes/cmd/kube-scheduler/.* contextual k8s.io/kubernetes/pkg/controller/.* diff --git a/hack/golangci.yaml b/hack/golangci.yaml index 5f96b17f2e4..ee1f212871e 100644 --- a/hack/golangci.yaml +++ b/hack/golangci.yaml @@ -176,12 +176,24 @@ linters-settings: # please keep this alphabetized # The following packages have been migrated to contextual logging. # Packages matched here do not have to be listed above because # "contextual" implies "structured". + contextual k8s.io/api/.* contextual k8s.io/apimachinery/pkg/util/runtime/.* contextual k8s.io/client-go/metadata/.* contextual k8s.io/client-go/tools/events/.* contextual k8s.io/client-go/tools/record/.* contextual k8s.io/component-helpers/.* + contextual k8s.io/cri-api/.* + contextual k8s.io/cri-client/.* contextual k8s.io/dynamic-resource-allocation/.* + contextual k8s.io/endpointslice/.* + contextual k8s.io/kms/.* + contextual k8s.io/kube-controller-manager/.* + contextual k8s.io/kube-proxy/.* + contextual k8s.io/kube-scheduler/.* + contextual k8s.io/legacy-cloud-providers/.* + contextual k8s.io/sample-apiserver/.* + contextual k8s.io/sample-cli-plugin/.* + contextual k8s.io/sample-controller/.* contextual k8s.io/kubernetes/cmd/kube-proxy/.* contextual k8s.io/kubernetes/cmd/kube-scheduler/.* contextual k8s.io/kubernetes/pkg/controller/.* diff --git a/hack/logcheck.conf b/hack/logcheck.conf index d8e835dea0e..c7a55153595 100644 --- a/hack/logcheck.conf +++ b/hack/logcheck.conf @@ -24,12 +24,24 @@ structured k8s.io/apiserver/pkg/server/options/encryptionconfig/.* # The following packages have been migrated to contextual logging. # Packages matched here do not have to be listed above because # "contextual" implies "structured". +contextual k8s.io/api/.* contextual k8s.io/apimachinery/pkg/util/runtime/.* contextual k8s.io/client-go/metadata/.* contextual k8s.io/client-go/tools/events/.* contextual k8s.io/client-go/tools/record/.* contextual k8s.io/component-helpers/.* +contextual k8s.io/cri-api/.* +contextual k8s.io/cri-client/.* contextual k8s.io/dynamic-resource-allocation/.* +contextual k8s.io/endpointslice/.* +contextual k8s.io/kms/.* +contextual k8s.io/kube-controller-manager/.* +contextual k8s.io/kube-proxy/.* +contextual k8s.io/kube-scheduler/.* +contextual k8s.io/legacy-cloud-providers/.* +contextual k8s.io/sample-apiserver/.* +contextual k8s.io/sample-cli-plugin/.* +contextual k8s.io/sample-controller/.* contextual k8s.io/kubernetes/cmd/kube-proxy/.* contextual k8s.io/kubernetes/cmd/kube-scheduler/.* contextual k8s.io/kubernetes/pkg/controller/.*