Skip to content

Commit f39d5c8

Browse files
committed
BUG/MINOR: fix logic for detecting updates on namespace events
Logic to detect if a namespace was updated on K8s update event was wrong and done the opposite way of what it should be
1 parent 857d0f8 commit f39d5c8

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

pkg/store/events.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ func (k *K8s) EventNamespace(ns *Namespace, data *Namespace) (updateRequired boo
3131
updateRequired = true
3232
case MODIFIED:
3333
nsStore := k.GetNamespace(data.Name)
34-
if updateRequired = nsStore.Equal(data); !updateRequired {
35-
return updateRequired
34+
updateRequired = !EqualMap(nsStore.Labels, data.Labels)
35+
if updateRequired {
36+
nsStore.Labels = utils.CopyMap(data.Labels)
3637
}
37-
nsStore.Labels = utils.CopyMap(data.Labels)
3838
case DELETED:
3939
_, ok := k.Namespaces[data.Name]
4040
if ok {
@@ -334,11 +334,13 @@ func (k *K8s) EventPublishService(ns *Namespace, data *Service) (updateRequired
334334
oldService.Addresses = newService.Addresses
335335
k.PublishServiceAddresses = newService.Addresses
336336
k.UpdateAllIngresses = true
337+
updateRequired = true
337338
case ADDED:
338339
if service, ok := ns.Services[data.Name]; ok {
339340
k.PublishServiceAddresses = data.Addresses
340341
service.Addresses = data.Addresses
341342
k.UpdateAllIngresses = true
343+
updateRequired = true
342344
return
343345
}
344346
logger.Errorf("Publish service '%s/%s' not found", data.Namespace, data.Name)
@@ -348,6 +350,7 @@ func (k *K8s) EventPublishService(ns *Namespace, data *Service) (updateRequired
348350
k.PublishServiceAddresses = nil
349351
service.Addresses = nil
350352
k.UpdateAllIngresses = true
353+
updateRequired = true
351354
} else {
352355
logger.Warningf("Publish service '%s/%s' not registered with controller, cannot delete !", data.Namespace, data.Name)
353356
}

0 commit comments

Comments
 (0)