diff --git a/pkg/client/endpoint.go b/pkg/client/endpoint.go index f5b381030ed3..5b6492d0dad6 100644 --- a/pkg/client/endpoint.go +++ b/pkg/client/endpoint.go @@ -143,9 +143,7 @@ func (c *Client) EndpointLabelsPatch(id string, toAdd, toDelete models.Labels) e } for _, lbl := range toDelete { lblParsed := labels.ParseLabel(lbl) - if _, found := userLbl[lblParsed.Key]; found { - delete(userLbl, lblParsed.Key) - } + delete(userLbl, lblParsed.Key) } currentCfg.Spec.User = userLbl.GetModel() diff --git a/pkg/identity/cache/cache.go b/pkg/identity/cache/cache.go index e1dd2a202524..10512e1b0029 100644 --- a/pkg/identity/cache/cache.go +++ b/pkg/identity/cache/cache.go @@ -116,9 +116,7 @@ func collectEvent(event allocator.AllocatorEvent, added, deleted IdentityCache) // Un-delete the added ID if previously // 'deleted' so that collected events can be // processed in any order. - if _, exists := deleted[id]; exists { - delete(deleted, id) - } + delete(deleted, id) added[id] = gi.LabelArray return true } @@ -127,9 +125,7 @@ func collectEvent(event allocator.AllocatorEvent, added, deleted IdentityCache) return false } // Reverse an add when subsequently deleted - if _, exists := added[id]; exists { - delete(added, id) - } + delete(added, id) // record the id deleted even if an add was reversed, as the // id may also have previously existed, in which case the // result is not no-op!