mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 17:46:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(source/service): disable pod and endpointSlices informers when they are not needed

Browse Source 
Signed-off-by: ivan katliarchuk <ivan.katliarchuk@gmail.com>
This commit is contained in:
ivan katliarchuk 2025-07-29 13:37:33 +01:00
parent e3ad397621
commit 87bd583c34
No known key found for this signature in database
GPG Key ID: 601CDBBBB76E47BE
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/service.go
View File

@ -108,7 +108,7 @@ func NewServiceSource(ctx context.Context, kubeClient kubernetes.Interface, name
var endpointSlicesInformer discoveryinformers.EndpointSliceInformer var endpointSlicesInformer discoveryinformers.EndpointSliceInformer
var podInformer coreinformers.PodInformer var podInformer coreinformers.PodInformer
if sTypesFilter.isAllOrRequired(v1.ServiceTypeNodePort, v1.ServiceTypeClusterIP) { if sTypesFilter.isRequired(v1.ServiceTypeNodePort, v1.ServiceTypeClusterIP) {
endpointSlicesInformer = informerFactory.Discovery().V1().EndpointSlices() endpointSlicesInformer = informerFactory.Discovery().V1().EndpointSlices()
podInformer = informerFactory.Core().V1().Pods() podInformer = informerFactory.Core().V1().Pods()
@ -137,7 +137,7 @@ func NewServiceSource(ctx context.Context, kubeClient kubernetes.Interface, name
} }
var nodeInformer coreinformers.NodeInformer var nodeInformer coreinformers.NodeInformer
if sTypesFilter.isAllOrRequired(v1.ServiceTypeNodePort) { if sTypesFilter.isRequired(v1.ServiceTypeNodePort) {
nodeInformer = informerFactory.Core().V1().Nodes() nodeInformer = informerFactory.Core().V1().Nodes()
_, _ = nodeInformer.Informer().AddEventHandler(informers.DefaultEventHandler()) _, _ = nodeInformer.Informer().AddEventHandler(informers.DefaultEventHandler())
} }
@ -793,10 +793,10 @@ func (sc *serviceSource) AddEventHandler(_ context.Context, handler func()) {
// Right now there is no way to remove event handler from informer, see: // Right now there is no way to remove event handler from informer, see:
// https://github.com/kubernetes/kubernetes/issues/79610 // https://github.com/kubernetes/kubernetes/issues/79610
_, _ = sc.serviceInformer.Informer().AddEventHandler(eventHandlerFunc(handler)) _, _ = sc.serviceInformer.Informer().AddEventHandler(eventHandlerFunc(handler))
if sc.listenEndpointEvents && sc.serviceTypeFilter.isAllOrRequired(v1.ServiceTypeNodePort, v1.ServiceTypeClusterIP) { if sc.listenEndpointEvents && sc.serviceTypeFilter.isRequired(v1.ServiceTypeNodePort, v1.ServiceTypeClusterIP) {
_, _ = sc.endpointSlicesInformer.Informer().AddEventHandler(eventHandlerFunc(handler)) _, _ = sc.endpointSlicesInformer.Informer().AddEventHandler(eventHandlerFunc(handler))
} }
if sc.serviceTypeFilter.isAllOrRequired(v1.ServiceTypeNodePort) { if sc.serviceTypeFilter.isRequired(v1.ServiceTypeNodePort) {
_, _ = sc.nodeInformer.Informer().AddEventHandler(eventHandlerFunc(handler)) _, _ = sc.nodeInformer.Informer().AddEventHandler(eventHandlerFunc(handler))
} }
} }
@ -833,9 +833,9 @@ func (sc *serviceTypes) isProcessed(serviceType v1.ServiceType) bool {
return !sc.enabled || sc.types[serviceType] return !sc.enabled || sc.types[serviceType]
} }
// isAllOrRequired returns true if service type filtering is disabled or if any of the provided service types are present in the filter. // isRequired returns true if service type filtering is disabled or if any of the provided service types are present in the filter.
// If no options are provided, it returns true. // If no options are provided, it returns true.
func (sc *serviceTypes) isAllOrRequired(opts ...v1.ServiceType) bool { func (sc *serviceTypes) isRequired(opts ...v1.ServiceType) bool {
if len(opts) == 0 || !sc.enabled { if len(opts) == 0 || !sc.enabled {
return true return true
} }

2
source/service_test.go
View File

@ -4713,7 +4713,7 @@ func TestServiceTypes_isNodeInformerRequired(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
filter, _ := newServiceTypesFilter(tt.filter) filter, _ := newServiceTypesFilter(tt.filter)
got := filter.isAllOrRequired(tt.required...) got := filter.isRequired(tt.required...)
assert.Equal(t, tt.want, got) assert.Equal(t, tt.want, got)
}) })
} }