From 6bccc051ebee1123675f6ba862858918a674f4ef Mon Sep 17 00:00:00 2001 From: hoteye Date: Fri, 13 Feb 2026 09:54:54 +0800 Subject: [PATCH] hack: add temporary kubelet contextual logcheck carve-outs Keep broad kubelet contextual logcheck coverage while excluding a small set of legacy files that still use non-contextual logging patterns. These carve-outs are temporary and will be removed in follow-up kubelet contextual logging PRs. --- hack/golangci-hints.yaml | 6 ++++++ hack/golangci.yaml | 6 ++++++ hack/logcheck.conf | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml index f0292cb0732..47ca7baa9f7 100644 --- a/hack/golangci-hints.yaml +++ b/hack/golangci-hints.yaml @@ -323,6 +323,12 @@ linters: contextual k8s.io/kubernetes/test/e2e/dra/.* contextual k8s.io/kubernetes/test/images/sample-device-plugin/.* contextual k8s.io/kubernetes/pkg/kubelet/.* + # Temporary carve-outs for PR1 split safety: these files still have legacy global klog calls. + # TODO: remove each exclusion as follow-up PRs migrate the file to contextual logging. + -contextual k8s.io/kubernetes/pkg/kubelet/kubelet_resources.go + -contextual k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go + -contextual k8s.io/kubernetes/pkg/kubelet/pod_container_deletor.go + -contextual k8s.io/kubernetes/pkg/kubelet/volume_host.go # As long as contextual logging is alpha or beta, all WithName, WithValues, # NewContext calls have to go through klog. Once it is GA, we can lift diff --git a/hack/golangci.yaml b/hack/golangci.yaml index 0a1bf73b109..e75c535ea02 100644 --- a/hack/golangci.yaml +++ b/hack/golangci.yaml @@ -332,6 +332,12 @@ linters: contextual k8s.io/kubernetes/test/e2e/dra/.* contextual k8s.io/kubernetes/test/images/sample-device-plugin/.* contextual k8s.io/kubernetes/pkg/kubelet/.* + # Temporary carve-outs for PR1 split safety: these files still have legacy global klog calls. + # TODO: remove each exclusion as follow-up PRs migrate the file to contextual logging. + -contextual k8s.io/kubernetes/pkg/kubelet/kubelet_resources.go + -contextual k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go + -contextual k8s.io/kubernetes/pkg/kubelet/pod_container_deletor.go + -contextual k8s.io/kubernetes/pkg/kubelet/volume_host.go # As long as contextual logging is alpha or beta, all WithName, WithValues, # NewContext calls have to go through klog. Once it is GA, we can lift diff --git a/hack/logcheck.conf b/hack/logcheck.conf index 930c039659d..ba4194e06ac 100644 --- a/hack/logcheck.conf +++ b/hack/logcheck.conf @@ -65,6 +65,12 @@ contextual k8s.io/kubernetes/pkg/securitycontext/.* contextual k8s.io/kubernetes/test/e2e/dra/.* contextual k8s.io/kubernetes/test/images/sample-device-plugin/.* contextual k8s.io/kubernetes/pkg/kubelet/.* +# Temporary carve-outs for PR1 split safety: these files still have legacy global klog calls. +# TODO: remove each exclusion as follow-up PRs migrate the file to contextual logging. +-contextual k8s.io/kubernetes/pkg/kubelet/kubelet_resources.go +-contextual k8s.io/kubernetes/pkg/kubelet/kubelet_volumes.go +-contextual k8s.io/kubernetes/pkg/kubelet/pod_container_deletor.go +-contextual k8s.io/kubernetes/pkg/kubelet/volume_host.go # As long as contextual logging is alpha or beta, all WithName, WithValues, # NewContext calls have to go through klog. Once it is GA, we can lift