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

Merge pull request #125650 from mjudeikis/mjudeikis/generic-controlplane

Browse Source 
Generic Control Plane: Add Extra.DisableAvailableConditionController for kube-aggregator
This commit is contained in:
Kubernetes Prow Robot
2024-06-26 10:59:10 -07:00
committed by GitHub
parent 437f6e92ec 539eb53c9a
commit 2b122bc5fa
1 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
View File

@@ -95,6 +95,13 @@ type ExtraConfig struct {
ServiceResolver ServiceResolver
RejectForwardingRedirects bool
// DisableAvailableConditionController disables the controller that updates the Available conditions for
// APIServices, Endpoints and Services. This controller runs in kube-aggregator and can interfere with
// Generic Control Plane components when certain apis are not available.
// TODO: We should find a better way to handle this. For now it will be for Generic Control Plane authors to
// disable this controller if they see issues.
DisableAvailableConditionController bool
}
// Config represents the configuration needed to create an APIAggregator.
@@ -307,6 +314,9 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
})
}
// If the AvailableConditionController is disabled, we don't need to start the informers
// and the controller.
if !c.ExtraConfig.DisableAvailableConditionController {
availableController, err := statuscontrollers.NewAvailableConditionController(
informerFactory.Apiregistration().V1().APIServices(),
c.GenericConfig.SharedInformerFactory.Core().V1().Services(),
@@ -321,10 +331,18 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
}
s.GenericAPIServer.AddPostStartHookOrDie("start-kube-aggregator-informers", func(context genericapiserver.PostStartHookContext) error {
informerFactory.Start(context.StopCh)
c.GenericConfig.SharedInformerFactory.Start(context.StopCh)
informerFactory.Start(context.Done())
c.GenericConfig.SharedInformerFactory.Start(context.Done())
return nil
})
s.GenericAPIServer.AddPostStartHookOrDie("apiservice-status-available-controller", func(context genericapiserver.PostStartHookContext) error {
// if we end up blocking for long periods of time, we may need to increase workers.
go availableController.Run(5, context.Done())
return nil
})
}
s.GenericAPIServer.AddPostStartHookOrDie("apiservice-registration-controller", func(context genericapiserver.PostStartHookContext) error {
go apiserviceRegistrationController.Run(context.StopCh, apiServiceRegistrationControllerInitiated)
select {
@@ -334,11 +352,6 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
return nil
})
s.GenericAPIServer.AddPostStartHookOrDie("apiservice-status-available-controller", func(context genericapiserver.PostStartHookContext) error {
// if we end up blocking for long periods of time, we may need to increase workers.
go availableController.Run(5, context.StopCh)
return nil
})
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.AggregatedDiscoveryEndpoint) {
s.discoveryAggregationController = NewDiscoveryManager(