github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #126687 from wedaly/automated-cherry-pick-of-#126532-upstream-release-1.31

Browse Source 
Automated cherry pick of #126532: kube-proxy: initialization wait for service and endpoint
This commit is contained in:
Kubernetes Prow Robot 2024-08-28 18:18:56 +01:00 committed by GitHub
commit 6572754297
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,11 +78,10 @@ type EndpointSliceConfig struct {
// NewEndpointSliceConfig creates a new EndpointSliceConfig. // NewEndpointSliceConfig creates a new EndpointSliceConfig.
func NewEndpointSliceConfig(ctx context.Context, endpointSliceInformer discoveryv1informers.EndpointSliceInformer, resyncPeriod time.Duration) *EndpointSliceConfig { func NewEndpointSliceConfig(ctx context.Context, endpointSliceInformer discoveryv1informers.EndpointSliceInformer, resyncPeriod time.Duration) *EndpointSliceConfig {
result := &EndpointSliceConfig{ result := &EndpointSliceConfig{
listerSynced: endpointSliceInformer.Informer().HasSynced, logger: klog.FromContext(ctx),
logger: klog.FromContext(ctx),
} }
_, _ = endpointSliceInformer.Informer().AddEventHandlerWithResyncPeriod( handlerRegistration, _ := endpointSliceInformer.Informer().AddEventHandlerWithResyncPeriod(
cache.ResourceEventHandlerFuncs{ cache.ResourceEventHandlerFuncs{
AddFunc: result.handleAddEndpointSlice, AddFunc: result.handleAddEndpointSlice,
UpdateFunc: result.handleUpdateEndpointSlice, UpdateFunc: result.handleUpdateEndpointSlice,
@ -91,6 +90,8 @@ func NewEndpointSliceConfig(ctx context.Context, endpointSliceInformer discovery
resyncPeriod, resyncPeriod,
) )
result.listerSynced = handlerRegistration.HasSynced
return result return result
} }
@ -171,11 +172,10 @@ type ServiceConfig struct {
// NewServiceConfig creates a new ServiceConfig. // NewServiceConfig creates a new ServiceConfig.
func NewServiceConfig(ctx context.Context, serviceInformer v1informers.ServiceInformer, resyncPeriod time.Duration) *ServiceConfig { func NewServiceConfig(ctx context.Context, serviceInformer v1informers.ServiceInformer, resyncPeriod time.Duration) *ServiceConfig {
result := &ServiceConfig{ result := &ServiceConfig{
listerSynced: serviceInformer.Informer().HasSynced, logger: klog.FromContext(ctx),
logger: klog.FromContext(ctx),
} }
_, _ = serviceInformer.Informer().AddEventHandlerWithResyncPeriod( handlerRegistration, _ := serviceInformer.Informer().AddEventHandlerWithResyncPeriod(
cache.ResourceEventHandlerFuncs{ cache.ResourceEventHandlerFuncs{
AddFunc: result.handleAddService, AddFunc: result.handleAddService,
UpdateFunc: result.handleUpdateService, UpdateFunc: result.handleUpdateService,
@ -184,6 +184,8 @@ func NewServiceConfig(ctx context.Context, serviceInformer v1informers.ServiceIn
resyncPeriod, resyncPeriod,
) )
result.listerSynced = handlerRegistration.HasSynced
return result return result
} }