[ upstream commit f4bdd95 ]

If reviews were requested by renovate or the auto-committer it means it
happened on a auto-approve PR and therefore we don't need to request
reviews from anyone.

Signed-off-by: André Martins <andre@cilium.io>
Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>

[ upstream commit c331d94 ]

Currently, the [RunGC] logic does not delete duplicated identities
(i.e., pointing to the same labels), as long as at least one of them
is actually used. Although duplicated identities should never occur
in kvstore mode thanks to locking, this has been observed happening in
the wild, and it is better to be robust in this case as well. Hence,
let's fine tune the GC logic to consider a given identity as used only
if it has any associated secondary key that also matches the actual ID.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>

[ upstream commit 6a4142e ]

It appears that the ciliumidentities.txtar test is affected by two
issues. First, the update performed at line 19 is ineffective, because
none of the security labels contain the 'foo' token. Second, the
namespace labels of the second identity are inconsistent. Let's get
them fixed, and update the namespace labels to be different between
the two identities.

Fixes: 1d8c53f ("test/cmapisrv: add initial battery of script tests")
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Antony Reynaud <antony.reynaud@isovalent.com>