github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

kube-proxy: initialization wait for node and serviceCIDR synced

Browse Source 
Follow-on from https://github.com/kubernetes/kubernetes/pull/126532
to wait for pre-sync events delivered for the remaining two informers
in kube-proxy (node and serviceCIDR).
This commit is contained in:
Will Daly 2024-08-06 09:01:42 -07:00
parent 60c4c2b252
commit d59687c367
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/proxy/config/config.go
View File

@ -300,11 +300,10 @@ type NodeConfig struct {
// NewNodeConfig creates a new NodeConfig. // NewNodeConfig creates a new NodeConfig.
func NewNodeConfig(ctx context.Context, nodeInformer v1informers.NodeInformer, resyncPeriod time.Duration) *NodeConfig { func NewNodeConfig(ctx context.Context, nodeInformer v1informers.NodeInformer, resyncPeriod time.Duration) *NodeConfig {
result := &NodeConfig{ result := &NodeConfig{
listerSynced: nodeInformer.Informer().HasSynced, logger: klog.FromContext(ctx),
logger: klog.FromContext(ctx),
} }
_, _ = nodeInformer.Informer().AddEventHandlerWithResyncPeriod( handlerRegistration, _ := nodeInformer.Informer().AddEventHandlerWithResyncPeriod(
cache.ResourceEventHandlerFuncs{ cache.ResourceEventHandlerFuncs{
AddFunc: result.handleAddNode, AddFunc: result.handleAddNode,
UpdateFunc: result.handleUpdateNode, UpdateFunc: result.handleUpdateNode,
@ -313,6 +312,8 @@ func NewNodeConfig(ctx context.Context, nodeInformer v1informers.NodeInformer, r
resyncPeriod, resyncPeriod,
) )
result.listerSynced = handlerRegistration.HasSynced
return result return result
} }
@ -403,12 +404,11 @@ type ServiceCIDRConfig struct {
// NewServiceCIDRConfig creates a new ServiceCIDRConfig. // NewServiceCIDRConfig creates a new ServiceCIDRConfig.
func NewServiceCIDRConfig(ctx context.Context, serviceCIDRInformer networkingv1beta1informers.ServiceCIDRInformer, resyncPeriod time.Duration) *ServiceCIDRConfig { func NewServiceCIDRConfig(ctx context.Context, serviceCIDRInformer networkingv1beta1informers.ServiceCIDRInformer, resyncPeriod time.Duration) *ServiceCIDRConfig {
result := &ServiceCIDRConfig{ result := &ServiceCIDRConfig{
listerSynced: serviceCIDRInformer.Informer().HasSynced, cidrs: sets.New[string](),
cidrs: sets.New[string](), logger: klog.FromContext(ctx),
logger: klog.FromContext(ctx),
} }
_, _ = serviceCIDRInformer.Informer().AddEventHandlerWithResyncPeriod( handlerRegistration, _ := serviceCIDRInformer.Informer().AddEventHandlerWithResyncPeriod(
cache.ResourceEventHandlerFuncs{ cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) { AddFunc: func(obj interface{}) {
result.handleServiceCIDREvent(nil, obj) result.handleServiceCIDREvent(nil, obj)
@ -422,6 +422,9 @@ func NewServiceCIDRConfig(ctx context.Context, serviceCIDRInformer networkingv1b
}, },
resyncPeriod, resyncPeriod,
) )
result.listerSynced = handlerRegistration.HasSynced
return result return result
} }