mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-05 15:37:19 +00:00
Code Activity

feat: hold custom labels (#7416)

Browse source 
* feat: hold custom labels

Signed-off-by: Frank Jogeleit <frank.jogeleit@lovoo.com>

* fix: remove unnecessary SetLabels

Signed-off-by: Frank Jogeleit <frank.jogeleit@lovoo.com>

---------

Signed-off-by: Frank Jogeleit <frank.jogeleit@lovoo.com>
This commit is contained in:
Frank Jogeleit 2023-06-05 12:37:28 +02:00 • committed by GitHub
parent 424b98a747
commit 5d5011d5d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/controllers/report/aggregate/controller.go
View file

@ -220,7 +220,8 @@ func (c *controller) reconcileReport(ctx context.Context, policyMap map[string]p
return reportutils.CreateReport(ctx, report, c.client) return reportutils.CreateReport(ctx, report, c.client)
} }
after := reportutils.DeepCopy(report) after := reportutils.DeepCopy(report)
after.SetLabels(nil) // hold custom labels
reportutils.CleanupKyvernoLabels(after)
reportutils.SetManagedByKyvernoLabel(after) reportutils.SetManagedByKyvernoLabel(after)
for _, result := range results { for _, result := range results {
policy := policyMap[result.Policy] policy := policyMap[result.Policy]

10
pkg/utils/report/labels.go
View file

@ -17,6 +17,7 @@ import (
) )
const ( const (
LabelDomain = "kyverno.io"
// resource labels // resource labels
LabelResourceHash = "audit.kyverno.io/resource.hash" LabelResourceHash = "audit.kyverno.io/resource.hash"
LabelResourceUid = "audit.kyverno.io/resource.uid" LabelResourceUid = "audit.kyverno.io/resource.uid"
@ -66,6 +67,15 @@ func PolicyLabel(policy kyvernov1.PolicyInterface) string {
return PolicyLabelPrefix(policy) + policy.GetName() return PolicyLabelPrefix(policy) + policy.GetName()
} }
func CleanupKyvernoLabels(obj metav1.Object) {
labels := obj.GetLabels()
for key := range labels {
if strings.Contains(key, LabelDomain) {
delete(labels, key)
}
}
}
func SetManagedByKyvernoLabel(obj metav1.Object) { func SetManagedByKyvernoLabel(obj metav1.Object) {
controllerutils.SetLabel(obj, kyvernov1.LabelAppManagedBy, kyvernov1.ValueKyvernoApp) controllerutils.SetLabel(obj, kyvernov1.LabelAppManagedBy, kyvernov1.ValueKyvernoApp)
} }