diff --git a/hack/golangci-hints.yaml b/hack/golangci-hints.yaml index 8a2cccda283..ad81b9c482e 100644 --- a/hack/golangci-hints.yaml +++ b/hack/golangci-hints.yaml @@ -350,8 +350,6 @@ 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. sorted: # Installed there by hack/verify-golangci-lint.sh. path: _output/local/bin/sorted.so diff --git a/hack/golangci.yaml b/hack/golangci.yaml index 391b47e8581..a75e44e42e0 100644 --- a/hack/golangci.yaml +++ b/hack/golangci.yaml @@ -363,8 +363,6 @@ 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. sorted: # Installed there by hack/verify-golangci-lint.sh. path: _output/local/bin/sorted.so diff --git a/hack/logcheck.conf b/hack/logcheck.conf index bc6ab4b645d..e3ec8e3c467 100644 --- a/hack/logcheck.conf +++ b/hack/logcheck.conf @@ -65,5 +65,3 @@ 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. diff --git a/pkg/kubelet/kubelet_volumes.go b/pkg/kubelet/kubelet_volumes.go index 2239d632f90..38a03360764 100644 --- a/pkg/kubelet/kubelet_volumes.go +++ b/pkg/kubelet/kubelet_volumes.go @@ -245,10 +245,10 @@ func (kl *Kubelet) cleanupOrphanedPodDirs(logger klog.Logger, pods []*v1.Pod, ru } // Rmdir the pod dir, which should be empty if everything above was successful - logger.V(3).Info("Orphaned pod found, removing", "podUID", uid, "path", podDir) + logger.V(3).Info("Orphaned pod found, removing", "podUID", uid) if err := syscall.Rmdir(podDir); err != nil { cleanupFailed = true - logger.Error(err, "Failed to remove orphaned pod dir", "podUID", uid, "path", podDir) + logger.Error(err, "Failed to remove orphaned pod dir", "podUID", uid) orphanRemovalErrors = append(orphanRemovalErrors, fmt.Errorf("orphaned pod %q found, but error occurred when trying to remove the pod directory: %v", uid, err)) } if cleanupFailed {