Skip to content

Commit

Permalink
Bugfix: Don't recreate servicemap for catalog sync
Browse files Browse the repository at this point in the history
  • Loading branch information
jukie committed Mar 19, 2024
1 parent 5279204 commit 5208e7b
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions control-plane/catalog/to-consul/resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -878,22 +878,9 @@ func (t *serviceEndpointsResource) Upsert(endptKey string, raw interface{}) erro
svc.serviceLock.Lock()
defer svc.serviceLock.Unlock()

// Extract service name and format key
svcName := endpointSlice.Labels[discoveryv1.LabelServiceName]
// Extract service name and format the service key
svcKey := endpointSlice.Namespace + "/" + endpointSlice.Labels[discoveryv1.LabelServiceName]

if svc.serviceMap == nil {
svc.serviceMap = make(map[string]*corev1.Service)
}
var err error
if svc.serviceMap[svcKey] == nil {
svc.serviceMap[svcKey], err = t.Service.Client.CoreV1().Services(endpointSlice.Namespace).Get(t.Ctx, svcName, metav1.GetOptions{})
if err != nil {
t.Log.Error("issue getting service", "error", err)
return err
}
}

// Check if we care about endpoints for this service
if !svc.shouldTrackEndpoints(svcKey) {
return nil
Expand Down

0 comments on commit 5208e7b

Please sign in to comment.