mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-28 02:18:15 +00:00
Code Activity

fix: do not update reports when they are identical (#5056)

Browse source 
* fix: do not update reports when they are identical

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

* fix linter

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-10-19 11:32:43 +02:00 • committed by GitHub
parent c4b3301ab0
commit 749c1bab3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkg/controllers/report/background/controller.go
View file

@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
corev1informers "k8s.io/client-go/informers/core/v1"
corev1listers "k8s.io/client-go/listers/core/v1"
metadatainformers "k8s.io/client-go/metadata/metadatainformer"
@ -187,6 +188,36 @@ func (c *controller) fetchPolicies(logger logr.Logger, namespace string) ([]kyve
return policies, nil
}
// reportsAreIdentical we expect reports are sorted before comparing them
func reportsAreIdentical(before, after kyvernov1alpha2.ReportInterface) bool {
bLabels := sets.NewString()
aLabels := sets.NewString()
for key := range before.GetLabels() {
bLabels.Insert(key)
}
for key := range after.GetLabels() {
aLabels.Insert(key)
}
if !aLabels.Equal(bLabels) {
return false
}
b := before.GetResults()
a := after.GetResults()
if len(a) != len(b) {
return false
}
for i := range a {
a := a[i]
b := b[i]
a.Timestamp = metav1.Timestamp{}
b.Timestamp = metav1.Timestamp{}
if !reflect.DeepEqual(&a, &b) {
return false
}
}
return true
}
func (c *controller) updateReport(ctx context.Context, meta metav1.Object, gvk schema.GroupVersionKind, resource resource.Resource) error {
namespace := meta.GetNamespace()
labels := meta.GetLabels()
@ -240,7 +271,7 @@ func (c *controller) updateReport(ctx context.Context, meta metav1.Object, gvk s
}
}
reportutils.SetResponses(report, responses...)
if reflect.DeepEqual(before, report) {
if reportsAreIdentical(before, report) {
return nil
}
_, err = reportutils.UpdateReport(ctx, report, c.kyvernoClient)
@ -319,7 +350,7 @@ func (c *controller) updateReport(ctx context.Context, meta metav1.Object, gvk s
}
}
reportutils.SetResults(report, ruleResults...)
if reflect.DeepEqual(before, report) {
if reportsAreIdentical(before, report) {
return nil
}
_, err = reportutils.UpdateReport(ctx, report, c.kyvernoClient)