From 760892f7e03e1d11db59317b286a410699c08ea4 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 19 Nov 2025 13:30:00 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/pkg 7459906...ab67eb7: > ab67eb7 Reduce noisy "object has been modified" logs/events (# 3289) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- .../v1alpha1/addressableservice/reconciler.go | 14 ++++++++++---- .../v1alpha1/simpledeployment/reconciler.go | 14 ++++++++++---- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b063b948b..9b1c2b210 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( k8s.io/code-generator v0.34.2 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b knative.dev/hack v0.0.0-20251117013754-67a5b048bc27 - knative.dev/pkg v0.0.0-20251118173915-745990698d3c + knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660 ) require ( diff --git a/go.sum b/go.sum index 53dbb40cc..41751957a 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20251117013754-67a5b048bc27 h1:yPzDTKOFtSYHxgXB2N7+nWT/3doNqPNCbCf7Bf9PeAE= knative.dev/hack v0.0.0-20251117013754-67a5b048bc27/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= -knative.dev/pkg v0.0.0-20251118173915-745990698d3c h1:khjCe035kZgoJqE9HwQTEjS/WZCKRpNPlNkbh6Yr+Gc= -knative.dev/pkg v0.0.0-20251118173915-745990698d3c/go.mod h1:iVOYfi7BiB0jQEEiW3NUfBHVOjc0QIbdOqdNs47YEoI= +knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660 h1:4lJPD8CTsOZ6cXFYkm3LtZ8bruSY9OQpyIFS6S5NPGQ= +knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660/go.mod h1:iVOYfi7BiB0jQEEiW3NUfBHVOjc0QIbdOqdNs47YEoI= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= diff --git a/pkg/client/injection/reconciler/samples/v1alpha1/addressableservice/reconciler.go b/pkg/client/injection/reconciler/samples/v1alpha1/addressableservice/reconciler.go index c7884432e..3a641f6ad 100644 --- a/pkg/client/injection/reconciler/samples/v1alpha1/addressableservice/reconciler.go +++ b/pkg/client/injection/reconciler/samples/v1alpha1/addressableservice/reconciler.go @@ -317,6 +317,8 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error { // This is a wrapped error, don't emit an event. } else if ok, _ := controller.IsRequeueKey(reconcileEvent); ok { // This is a wrapped error, don't emit an event. + } else if errors.IsConflict(reconcileEvent) { + // Conflict errors are expected, don't emit an event. } else { logger.Errorw("Returned an error", zap.Error(reconcileEvent)) r.Recorder.Event(resource, v1.EventTypeWarning, "InternalError", reconcileEvent.Error()) @@ -428,8 +430,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredServerSideApply(ctx context.Con updated, err := patcher.Patch(ctx, resource.Name, types.ApplyPatchType, patch, patchOpts) if err != nil { - r.Recorder.Eventf(resource, v1.EventTypeWarning, "FinalizerUpdateFailed", - "Failed to update finalizers for %q via server-side apply: %v", resource.Name, err) + if !errors.IsConflict(err) { + r.Recorder.Eventf(resource, v1.EventTypeWarning, "FinalizerUpdateFailed", + "Failed to update finalizers for %q via server-side apply: %v", resource.Name, err) + } } else { r.Recorder.Eventf(updated, v1.EventTypeNormal, "FinalizerUpdate", "Updated finalizers for %q via server-side apply", resource.GetName()) @@ -481,8 +485,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredMergePatch(ctx context.Context, resourceName := resource.Name updated, err := patcher.Patch(ctx, resourceName, types.MergePatchType, patch, metav1.PatchOptions{}) if err != nil { - r.Recorder.Eventf(existing, v1.EventTypeWarning, "FinalizerUpdateFailed", - "Failed to update finalizers for %q: %v", resourceName, err) + if !errors.IsConflict(err) { + r.Recorder.Eventf(existing, v1.EventTypeWarning, "FinalizerUpdateFailed", + "Failed to update finalizers for %q: %v", resourceName, err) + } } else { r.Recorder.Eventf(updated, v1.EventTypeNormal, "FinalizerUpdate", "Updated %q finalizers", resource.GetName()) diff --git a/pkg/client/injection/reconciler/samples/v1alpha1/simpledeployment/reconciler.go b/pkg/client/injection/reconciler/samples/v1alpha1/simpledeployment/reconciler.go index 2890731cc..cab52fbf8 100644 --- a/pkg/client/injection/reconciler/samples/v1alpha1/simpledeployment/reconciler.go +++ b/pkg/client/injection/reconciler/samples/v1alpha1/simpledeployment/reconciler.go @@ -317,6 +317,8 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error { // This is a wrapped error, don't emit an event. } else if ok, _ := controller.IsRequeueKey(reconcileEvent); ok { // This is a wrapped error, don't emit an event. + } else if errors.IsConflict(reconcileEvent) { + // Conflict errors are expected, don't emit an event. } else { logger.Errorw("Returned an error", zap.Error(reconcileEvent)) r.Recorder.Event(resource, v1.EventTypeWarning, "InternalError", reconcileEvent.Error()) @@ -428,8 +430,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredServerSideApply(ctx context.Con updated, err := patcher.Patch(ctx, resource.Name, types.ApplyPatchType, patch, patchOpts) if err != nil { - r.Recorder.Eventf(resource, v1.EventTypeWarning, "FinalizerUpdateFailed", - "Failed to update finalizers for %q via server-side apply: %v", resource.Name, err) + if !errors.IsConflict(err) { + r.Recorder.Eventf(resource, v1.EventTypeWarning, "FinalizerUpdateFailed", + "Failed to update finalizers for %q via server-side apply: %v", resource.Name, err) + } } else { r.Recorder.Eventf(updated, v1.EventTypeNormal, "FinalizerUpdate", "Updated finalizers for %q via server-side apply", resource.GetName()) @@ -481,8 +485,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredMergePatch(ctx context.Context, resourceName := resource.Name updated, err := patcher.Patch(ctx, resourceName, types.MergePatchType, patch, metav1.PatchOptions{}) if err != nil { - r.Recorder.Eventf(existing, v1.EventTypeWarning, "FinalizerUpdateFailed", - "Failed to update finalizers for %q: %v", resourceName, err) + if !errors.IsConflict(err) { + r.Recorder.Eventf(existing, v1.EventTypeWarning, "FinalizerUpdateFailed", + "Failed to update finalizers for %q: %v", resourceName, err) + } } else { r.Recorder.Eventf(updated, v1.EventTypeNormal, "FinalizerUpdate", "Updated %q finalizers", resource.GetName())