From 051eca74cfcdf76209bc3564d88142e7d1d4b2ca Mon Sep 17 00:00:00 2001 From: Manfred Liiv Date: Wed, 21 Dec 2022 16:10:31 +0200 Subject: [PATCH] fix: pass error to applyFailed events There was a bug where an error from an apply filter wasn't propagated to the applyFailed event, which leaded to printed events without error message set on them: > {"group":"rbac.authorization.k8s.io","kind":"RoleBinding","name":"redacted","namespace":"redacted","status":"Failed","timestamp":"2022-12-21T12:43:46Z","type":"apply"} --- pkg/apply/task/apply_task.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/apply/task/apply_task.go b/pkg/apply/task/apply_task.go index 5eeb2d74..2a7c3eff 100644 --- a/pkg/apply/task/apply_task.go +++ b/pkg/apply/task/apply_task.go @@ -20,6 +20,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kubectl/pkg/cmd/apply" cmddelete "k8s.io/kubectl/pkg/cmd/delete" + applyerror "sigs.k8s.io/cli-utils/pkg/apply/error" "sigs.k8s.io/cli-utils/pkg/apply/event" "sigs.k8s.io/cli-utils/pkg/apply/filter" @@ -121,7 +122,7 @@ func (a *ApplyTask) Start(taskContext *taskrunner.TaskContext) { // only log event emitted errors if the verbosity > 4 klog.Errorf("apply filter errored (filter: %s, object: %s): %v", applyFilter.Name(), id, fatalErr.Err) } - taskContext.SendEvent(a.createApplyFailedEvent(id, err)) + taskContext.SendEvent(a.createApplyFailedEvent(id, fatalErr)) taskContext.InventoryManager().AddFailedApply(id) break }