From c1f8b2ed967632c15d4bc688b668029f19f5e4a3 Mon Sep 17 00:00:00 2001 From: Vishal Choudhary Date: Fri, 15 Nov 2024 15:07:31 +0530 Subject: [PATCH] fix: use generate name for background scan reports (#11586) Signed-off-by: Vishal Choudhary Co-authored-by: shuting --- pkg/background/generate/controller.go | 2 +- pkg/background/mutate/mutate.go | 2 +- pkg/utils/report/new.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/background/generate/controller.go b/pkg/background/generate/controller.go index 8cecc25eb5..8d24b7fe85 100644 --- a/pkg/background/generate/controller.go +++ b/pkg/background/generate/controller.go @@ -411,7 +411,7 @@ func (c *GenerateController) createReports( resource unstructured.Unstructured, engineResponses ...engineapi.EngineResponse, ) error { - report := reportutils.BuildGenerateReport(resource.GetNamespace(), resource.GetName(), resource.GroupVersionKind(), resource.GetName(), resource.GetUID(), engineResponses...) + report := reportutils.BuildGenerateReport(resource.GetNamespace(), resource.GroupVersionKind(), resource.GetName(), resource.GetUID(), engineResponses...) if len(report.GetResults()) > 0 { err := c.reportsBreaker.Do(ctx, func(ctx context.Context) error { _, err := reportutils.CreateReport(ctx, report, c.kyvernoClient) diff --git a/pkg/background/mutate/mutate.go b/pkg/background/mutate/mutate.go index 6933bbd9e6..74a6e0732f 100644 --- a/pkg/background/mutate/mutate.go +++ b/pkg/background/mutate/mutate.go @@ -275,7 +275,7 @@ func (c *mutateExistingController) createReports( resource unstructured.Unstructured, engineResponses ...engineapi.EngineResponse, ) error { - report := reportutils.BuildMutateExistingReport(resource.GetNamespace(), resource.GetName(), resource.GroupVersionKind(), resource.GetName(), resource.GetUID(), engineResponses...) + report := reportutils.BuildMutateExistingReport(resource.GetNamespace(), resource.GroupVersionKind(), resource.GetName(), resource.GetUID(), engineResponses...) if len(report.GetResults()) > 0 { err := c.reportsBreaker.Do(ctx, func(ctx context.Context) error { _, err := reportutils.CreateReport(ctx, report, c.kyvernoClient) diff --git a/pkg/utils/report/new.go b/pkg/utils/report/new.go index e8888aa1cb..36540dab0d 100644 --- a/pkg/utils/report/new.go +++ b/pkg/utils/report/new.go @@ -43,7 +43,7 @@ func NewBackgroundScanReport(namespace, name string, gvk schema.GroupVersionKind } else { report = &reportsv1.EphemeralReport{} } - report.SetName(name) + report.SetGenerateName(name + "-") report.SetNamespace(namespace) controllerutils.SetOwner(report, gvk.GroupVersion().String(), gvk.Kind, owner, uid) SetResourceUid(report, uid) @@ -60,14 +60,14 @@ func BuildMutationReport(resource unstructured.Unstructured, request admissionv1 return report } -func BuildMutateExistingReport(namespace, name string, gvk schema.GroupVersionKind, owner string, uid types.UID, responses ...engineapi.EngineResponse) reportsv1.ReportInterface { - report := NewBackgroundScanReport(namespace, name, gvk, owner, uid) +func BuildMutateExistingReport(namespace string, gvk schema.GroupVersionKind, owner string, uid types.UID, responses ...engineapi.EngineResponse) reportsv1.ReportInterface { + report := NewBackgroundScanReport(namespace, string(uid), gvk, owner, uid) SetMutationResponses(report, responses...) return report } -func BuildGenerateReport(namespace, name string, gvk schema.GroupVersionKind, owner string, uid types.UID, responses ...engineapi.EngineResponse) reportsv1.ReportInterface { - report := NewBackgroundScanReport(namespace, name, gvk, owner, uid) +func BuildGenerateReport(namespace string, gvk schema.GroupVersionKind, owner string, uid types.UID, responses ...engineapi.EngineResponse) reportsv1.ReportInterface { + report := NewBackgroundScanReport(namespace, string(uid), gvk, owner, uid) SetGenerationResponses(report, responses...) return report }