From bc46e3d9b3f5c38a1046baff2d49337a61030618 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Thu, 19 Dec 2024 09:23:24 +0200 Subject: [PATCH 1/2] apiextensions: replace panic with error handling in DiscoveryController Signed-off-by: Omer Aplatony --- .../pkg/apiserver/customresource_discovery_controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go index 865d9389b3c..51b7ac4627e 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go @@ -320,7 +320,8 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync")) return } - panic(fmt.Errorf("unexpected error: %v", err)) + utilruntime.HandleError(fmt.Errorf("unexpected error: %v", err)) + return } close(synchedCh) From 4411a3f3be8c1664819d2a899d831eb42a0f85b6 Mon Sep 17 00:00:00 2001 From: Omer Aplatony Date: Thu, 19 Dec 2024 09:48:55 +0200 Subject: [PATCH 2/2] lint Signed-off-by: Omer Aplatony --- .../pkg/apiserver/customresource_discovery_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go index 51b7ac4627e..1e8ffbc69ca 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go @@ -320,7 +320,7 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync")) return } - utilruntime.HandleError(fmt.Errorf("unexpected error: %v", err)) + utilruntime.HandleError(fmt.Errorf("unexpected error: %w", err)) return } close(synchedCh)