From ae385ee874a81cd01ee4fef98efc1bd5c219c9b7 Mon Sep 17 00:00:00 2001 From: twilight0620 Date: Thu, 21 Apr 2022 16:47:22 +0800 Subject: [PATCH] code check modify: receiver name obj should be consistent with previous receiver name s for SimpleStream error var hookNotFinished should have name of the form errFoo --- staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go | 4 ++-- staging/src/k8s.io/apiserver/pkg/server/hooks.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go index 6cb17dfdb03..4f33cebd2d2 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go @@ -405,8 +405,8 @@ func (s *SimpleStream) Close() error { return nil } -func (obj *SimpleStream) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } -func (obj *SimpleStream) DeepCopyObject() runtime.Object { +func (s *SimpleStream) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } +func (s *SimpleStream) DeepCopyObject() runtime.Object { panic("SimpleStream does not support DeepCopy") } diff --git a/staging/src/k8s.io/apiserver/pkg/server/hooks.go b/staging/src/k8s.io/apiserver/pkg/server/hooks.go index 999ad36000c..f52fab850b9 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/hooks.go +++ b/staging/src/k8s.io/apiserver/pkg/server/hooks.go @@ -232,13 +232,13 @@ func (h postStartHookHealthz) Name() string { return h.name } -var hookNotFinished = errors.New("not finished") +var errHookNotFinished = errors.New("not finished") func (h postStartHookHealthz) Check(req *http.Request) error { select { case <-h.done: return nil default: - return hookNotFinished + return errHookNotFinished } }