github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testutil: use contextual logging

Browse Source
This commit is contained in:
ZhangYu
2022-11-22 15:56:40 +08:00
parent bdf34b3f56
commit f9ae3e774d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/logcheck.conf
View File

@@ -50,7 +50,6 @@ contextual k8s.io/kubernetes/test/e2e/dra/.*
-contextual k8s.io/kubernetes/pkg/controller/nodeipam/.* -contextual k8s.io/kubernetes/pkg/controller/nodeipam/.*
-contextual k8s.io/kubernetes/pkg/controller/podgc/.* -contextual k8s.io/kubernetes/pkg/controller/podgc/.*
-contextual k8s.io/kubernetes/pkg/controller/replicaset/.* -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/util/.*
-contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go -contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/attach_detach_controller.go
-contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing/testvolumespec.go -contextual k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing/testvolumespec.go

21
pkg/controller/testutil/test_utils.go
View File

@@ -287,7 +287,7 @@ func (m *FakeNodeHandler) Watch(_ context.Context, opts metav1.ListOptions) (wat
} }
// Patch patches a Node in the fake store. // 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() m.lock.Lock()
defer func() { defer func() {
m.RequestCount++ m.RequestCount++
@@ -312,12 +312,12 @@ func (m *FakeNodeHandler) Patch(_ context.Context, name string, pt types.PatchTy
originalObjJS, err := json.Marshal(nodeCopy) originalObjJS, err := json.Marshal(nodeCopy)
if err != nil { 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 return nil, nil
} }
var originalNode v1.Node var originalNode v1.Node
if err = json.Unmarshal(originalObjJS, &originalNode); err != nil { 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 return nil, nil
} }
@@ -326,31 +326,31 @@ func (m *FakeNodeHandler) Patch(_ context.Context, name string, pt types.PatchTy
case types.JSONPatchType: case types.JSONPatchType:
patchObj, err := jsonpatch.DecodePatch(data) patchObj, err := jsonpatch.DecodePatch(data)
if err != nil { if err != nil {
klog.Error(err.Error()) klog.FromContext(ctx).Error(err, "")
return nil, nil return nil, nil
} }
if patchedObjJS, err = patchObj.Apply(originalObjJS); err != nil { if patchedObjJS, err = patchObj.Apply(originalObjJS); err != nil {
klog.Error(err.Error()) klog.FromContext(ctx).Error(err, "")
return nil, nil return nil, nil
} }
case types.MergePatchType: case types.MergePatchType:
if patchedObjJS, err = jsonpatch.MergePatch(originalObjJS, data); err != nil { if patchedObjJS, err = jsonpatch.MergePatch(originalObjJS, data); err != nil {
klog.Error(err.Error()) klog.FromContext(ctx).Error(err, "")
return nil, nil return nil, nil
} }
case types.StrategicMergePatchType: case types.StrategicMergePatchType:
if patchedObjJS, err = strategicpatch.StrategicMergePatch(originalObjJS, data, originalNode); err != nil { if patchedObjJS, err = strategicpatch.StrategicMergePatch(originalObjJS, data, originalNode); err != nil {
klog.Error(err.Error()) klog.FromContext(ctx).Error(err, "")
return nil, nil return nil, nil
} }
default: 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 return nil, nil
} }
var updatedNode v1.Node var updatedNode v1.Node
if err = json.Unmarshal(patchedObjJS, &updatedNode); err != nil { 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 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) { func (f *FakeRecorder) generateEvent(obj runtime.Object, timestamp metav1.Time, eventtype, reason, message string) {
f.Lock() f.Lock()
defer f.Unlock() defer f.Unlock()
ctx := context.TODO()
ref, err := ref.GetReference(legacyscheme.Scheme, obj) ref, err := ref.GetReference(legacyscheme.Scheme, obj)
if err != nil { if err != nil {
klog.Errorf("Encountered error while getting reference: %v", err) klog.FromContext(ctx).Error(err, "Encountered error while getting reference")
return return
} }
event := f.makeEvent(ref, eventtype, reason, message) event := f.makeEvent(ref, eventtype, reason, message)