Merge pull request kubernetes#129298 from omerap12/fix-discovery-controller-panic

k8s-ci-robot · web-flow · commit e319c541f144 · 2025-01-09T09:04:31.000-08:00
apiextensions: replace panic with error handling in DiscoveryController
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
@@ -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: %w", err))
+		return
 	}
 	close(synchedCh)
 

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,8 @@ func (c *DiscoveryController) Run(stopCh <-chan struct{}, synchedCh chan<- struc`
`320`	`320`	`utilruntime.HandleError(fmt.Errorf("timed out waiting for initial discovery sync"))`
`321`	`321`	`return`
`322`	`322`	`}`
`323`		`- panic(fmt.Errorf("unexpected error: %v", err))`
	`323`	`+ utilruntime.HandleError(fmt.Errorf("unexpected error: %w", err))`
	`324`	`+ return`
`324`	`325`	`}`
`325`	`326`	`close(synchedCh)`
`326`	`327`