github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 14:23:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix 120739 - Prevent AddUpdateAPIService from blocking on updating spec

Browse Source
This commit is contained in:
Jefftree 2023-09-25 12:38:58 -04:00
parent cdcf49ea12
commit 61603d36d7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/aggregator/aggregator.go
View File

@ -228,7 +228,7 @@ func (s *specAggregator) AddUpdateAPIService(apiService *v1.APIService, handler
s.openAPIVersionedService.UpdateSpecLazy(s.buildMergeSpecLocked()) s.openAPIVersionedService.UpdateSpecLazy(s.buildMergeSpecLocked())
} }
return s.updateServiceLocked(apiService.Name) return nil
} }
// RemoveAPIService removes an api service from OpenAPI aggregation. If it does not exist, no error is returned. // RemoveAPIService removes an api service from OpenAPI aggregation. If it does not exist, no error is returned.

5
staging/src/k8s.io/kube-aggregator/pkg/controllers/openapi/controller.go
View File

@ -139,7 +139,10 @@ func (c *AggregationController) AddAPIService(handler http.Handler, apiService *
// UpdateAPIService updates API Service's info and handler. // UpdateAPIService updates API Service's info and handler.
func (c *AggregationController) UpdateAPIService(handler http.Handler, apiService *v1.APIService) { func (c *AggregationController) UpdateAPIService(handler http.Handler, apiService *v1.APIService) {
if err := c.openAPIAggregationManager.AddUpdateAPIService(apiService, handler); err != nil { if apiService.Spec.Service == nil {
return
}
if err := c.openAPIAggregationManager.UpdateAPIServiceSpec(apiService.Name); err != nil {
utilruntime.HandleError(fmt.Errorf("Error updating APIService %q with err: %v", apiService.Name, err)) utilruntime.HandleError(fmt.Errorf("Error updating APIService %q with err: %v", apiService.Name, err))
} }
key := apiService.Name key := apiService.Name