From f9ae3e774d03f03b3db94b044bee90014e4dd71e Mon Sep 17 00:00:00 2001 From: ZhangYu Date: Tue, 22 Nov 2022 15:56:40 +0800 Subject: [PATCH] testutil: use contextual logging --- hack/logcheck.conf | 1 - pkg/controller/testutil/test_utils.go | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hack/logcheck.conf b/hack/logcheck.conf index eecb9b18616..631dfcafda0 100644 --- a/hack/logcheck.conf +++ b/hack/logcheck.conf @@ -50,7 +50,6 @@ contextual k8s.io/kubernetes/test/e2e/dra/.* -contextual k8s.io/kubernetes/pkg/controller/nodeipam/.* -contextual k8s.io/kubernetes/pkg/controller/podgc/.* -contextual k8s.io/kubernetes/pkg/controller/replicaset/.* --contextual k8s.io/kubernetes/pkg/controller/testutil/.* -contextual k8s.io/kubernetes/pkg/controller/util/.* -contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go -contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing/testvolumespec.go diff --git a/pkg/controller/testutil/test_utils.go b/pkg/controller/testutil/test_utils.go index 44dfda59719..bcb9dd84d20 100644 --- a/pkg/controller/testutil/test_utils.go +++ b/pkg/controller/testutil/test_utils.go @@ -287,7 +287,7 @@ func (m *FakeNodeHandler) Watch(_ context.Context, opts metav1.ListOptions) (wat } // Patch patches a Node in the fake store. -func (m *FakeNodeHandler) Patch(_ context.Context, name string, pt types.PatchType, data []byte, _ metav1.PatchOptions, subresources ...string) (*v1.Node, error) { +func (m *FakeNodeHandler) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, _ metav1.PatchOptions, subresources ...string) (*v1.Node, error) { m.lock.Lock() defer func() { m.RequestCount++ @@ -312,12 +312,12 @@ func (m *FakeNodeHandler) Patch(_ context.Context, name string, pt types.PatchTy originalObjJS, err := json.Marshal(nodeCopy) if err != nil { - klog.Errorf("Failed to marshal %v", nodeCopy) + klog.FromContext(ctx).Error(nil, "Failed to marshal", "node", klog.KObj(&nodeCopy)) return nil, nil } var originalNode v1.Node if err = json.Unmarshal(originalObjJS, &originalNode); err != nil { - klog.Errorf("Failed to unmarshal original object: %v", err) + klog.FromContext(ctx).Error(err, "Failed to unmarshal original object") return nil, nil } @@ -326,31 +326,31 @@ func (m *FakeNodeHandler) Patch(_ context.Context, name string, pt types.PatchTy case types.JSONPatchType: patchObj, err := jsonpatch.DecodePatch(data) if err != nil { - klog.Error(err.Error()) + klog.FromContext(ctx).Error(err, "") return nil, nil } if patchedObjJS, err = patchObj.Apply(originalObjJS); err != nil { - klog.Error(err.Error()) + klog.FromContext(ctx).Error(err, "") return nil, nil } case types.MergePatchType: if patchedObjJS, err = jsonpatch.MergePatch(originalObjJS, data); err != nil { - klog.Error(err.Error()) + klog.FromContext(ctx).Error(err, "") return nil, nil } case types.StrategicMergePatchType: if patchedObjJS, err = strategicpatch.StrategicMergePatch(originalObjJS, data, originalNode); err != nil { - klog.Error(err.Error()) + klog.FromContext(ctx).Error(err, "") return nil, nil } default: - klog.Errorf("unknown Content-Type header for patch: %v", pt) + klog.FromContext(ctx).Error(nil, "Unknown Content-Type header", "patch", pt) return nil, nil } var updatedNode v1.Node if err = json.Unmarshal(patchedObjJS, &updatedNode); err != nil { - klog.Errorf("Failed to unmarshal patched object: %v", err) + klog.FromContext(ctx).Error(err, "Failed to unmarshal patched object") return nil, nil } @@ -422,9 +422,10 @@ func (f *FakeRecorder) AnnotatedEventf(obj runtime.Object, annotations map[strin func (f *FakeRecorder) generateEvent(obj runtime.Object, timestamp metav1.Time, eventtype, reason, message string) { f.Lock() defer f.Unlock() + ctx := context.TODO() ref, err := ref.GetReference(legacyscheme.Scheme, obj) if err != nil { - klog.Errorf("Encountered error while getting reference: %v", err) + klog.FromContext(ctx).Error(err, "Encountered error while getting reference") return } event := f.makeEvent(ref, eventtype, reason, message)