From ac723736545022b7a10d95270edb288cf395206b Mon Sep 17 00:00:00 2001 From: Mykhailo Bobrovskyi Date: Mon, 10 Feb 2025 10:11:16 +0200 Subject: [PATCH 1/2] Truncate admission check error message. --- pkg/controller/admissionchecks/provisioning/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/admissionchecks/provisioning/controller.go b/pkg/controller/admissionchecks/provisioning/controller.go index 047f5c8442..292823c69f 100644 --- a/pkg/controller/admissionchecks/provisioning/controller.go +++ b/pkg/controller/admissionchecks/provisioning/controller.go @@ -341,7 +341,7 @@ func (c *Controller) remainingTimeToRetry(pr *autoscaling.ProvisioningRequest, f } func (c *Controller) handleError(ctx context.Context, wl *kueue.Workload, ac *kueue.AdmissionCheckState, msg string, err error) error { - ac.Message = msg + ac.Message = api.TruncateConditionMessage(msg) wlPatch := workload.BaseSSAWorkload(wl) workload.SetAdmissionCheckState(&wlPatch.Status.AdmissionChecks, *ac) From 822560b74229afb96561ea6d069e57009b9dd693 Mon Sep 17 00:00:00 2001 From: Mykhailo Bobrovskyi Date: Mon, 10 Feb 2025 11:19:11 +0200 Subject: [PATCH 2/2] Send the event from within `handleError`. --- pkg/controller/admissionchecks/provisioning/controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controller/admissionchecks/provisioning/controller.go b/pkg/controller/admissionchecks/provisioning/controller.go index 292823c69f..abeff36f4b 100644 --- a/pkg/controller/admissionchecks/provisioning/controller.go +++ b/pkg/controller/admissionchecks/provisioning/controller.go @@ -307,7 +307,6 @@ func (c *Controller) syncOwnedProvisionRequest( if err := c.client.Create(ctx, req); err != nil { msg := fmt.Sprintf("Error creating ProvisioningRequest %q: %v", requestName, err) - c.record.Eventf(wl, corev1.EventTypeWarning, "FailedCreate", api.TruncateEventMessage(msg)) return nil, c.handleError(ctx, wl, ac, msg, err) } c.record.Eventf(wl, corev1.EventTypeNormal, "ProvisioningRequestCreated", "Created ProvisioningRequest: %q", req.Name) @@ -341,6 +340,8 @@ func (c *Controller) remainingTimeToRetry(pr *autoscaling.ProvisioningRequest, f } func (c *Controller) handleError(ctx context.Context, wl *kueue.Workload, ac *kueue.AdmissionCheckState, msg string, err error) error { + c.record.Eventf(wl, corev1.EventTypeWarning, "FailedCreate", api.TruncateEventMessage(msg)) + ac.Message = api.TruncateConditionMessage(msg) wlPatch := workload.BaseSSAWorkload(wl) workload.SetAdmissionCheckState(&wlPatch.Status.AdmissionChecks, *ac)