Skip to content

Commit 088ea3c

Browse files
upgrade to latest dependencies (#977)
bumping knative.dev/pkg 7459906...ab67eb7: > ab67eb7 Reduce noisy "object has been modified" logs/events (# 3289) Signed-off-by: Knative Automation <[email protected]>
1 parent 9d5745d commit 088ea3c

File tree

6 files changed

+42
-17
lines changed

6 files changed

+42
-17
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
k8s.io/code-generator v0.34.2
1212
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
1313
knative.dev/hack v0.0.0-20251117013754-67a5b048bc27
14-
knative.dev/pkg v0.0.0-20251118173915-745990698d3c
14+
knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660
1515
)
1616

1717
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
186186
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
187187
knative.dev/hack v0.0.0-20251117013754-67a5b048bc27 h1:yPzDTKOFtSYHxgXB2N7+nWT/3doNqPNCbCf7Bf9PeAE=
188188
knative.dev/hack v0.0.0-20251117013754-67a5b048bc27/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
189-
knative.dev/pkg v0.0.0-20251118173915-745990698d3c h1:khjCe035kZgoJqE9HwQTEjS/WZCKRpNPlNkbh6Yr+Gc=
190-
knative.dev/pkg v0.0.0-20251118173915-745990698d3c/go.mod h1:iVOYfi7BiB0jQEEiW3NUfBHVOjc0QIbdOqdNs47YEoI=
189+
knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660 h1:4lJPD8CTsOZ6cXFYkm3LtZ8bruSY9OQpyIFS6S5NPGQ=
190+
knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660/go.mod h1:iVOYfi7BiB0jQEEiW3NUfBHVOjc0QIbdOqdNs47YEoI=
191191
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
192192
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
193193
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler/reconciler_reconciler.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
134134
Package: "k8s.io/apimachinery/pkg/api/errors",
135135
Name: "IsNotFound",
136136
}),
137+
"apierrsIsConflict": c.Universe.Function(types.Name{
138+
Package: "k8s.io/apimachinery/pkg/api/errors",
139+
Name: "IsConflict",
140+
}),
137141
"metav1GetOptions": c.Universe.Function(types.Name{
138142
Package: "k8s.io/apimachinery/pkg/apis/meta/v1",
139143
Name: "GetOptions",
@@ -573,6 +577,8 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
573577
// This is a wrapped error, don't emit an event.
574578
} else if ok, _ := {{ .controllerIsRequeueKey|raw }}(reconcileEvent); ok {
575579
// This is a wrapped error, don't emit an event.
580+
} else if {{ .apierrsIsConflict|raw }}(reconcileEvent) {
581+
// Conflict errors are expected, don't emit an event.
576582
} else {
577583
logger.Errorw("Returned an error", zap.Error(reconcileEvent))
578584
r.Recorder.Event(resource, {{.corev1EventTypeWarning|raw}}, "InternalError", reconcileEvent.Error())
@@ -698,8 +704,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredServerSideApply(ctx {{.contextC
698704
699705
updated, err := patcher.Patch(ctx, resource.Name, {{.typesApplyPatchType|raw}}, patch, patchOpts)
700706
if err != nil {
701-
r.Recorder.Eventf(resource, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
702-
"Failed to update finalizers for %q via server-side apply: %v", resource.Name, err)
707+
if !{{ .apierrsIsConflict|raw }}(err) {
708+
r.Recorder.Eventf(resource, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
709+
"Failed to update finalizers for %q via server-side apply: %v", resource.Name, err)
710+
}
703711
} else {
704712
r.Recorder.Eventf(updated, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
705713
"Updated finalizers for %q via server-side apply", resource.GetName())
@@ -754,8 +762,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredMergePatch(ctx {{.contextContex
754762
resourceName := resource.Name
755763
updated, err := patcher.Patch(ctx, resourceName, {{.typesMergePatchType|raw}}, patch, {{.metav1PatchOptions|raw}}{})
756764
if err != nil {
757-
r.Recorder.Eventf(existing, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
758-
"Failed to update finalizers for %q: %v", resourceName, err)
765+
if !{{ .apierrsIsConflict|raw }}(err) {
766+
r.Recorder.Eventf(existing, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
767+
"Failed to update finalizers for %q: %v", resourceName, err)
768+
}
759769
} else {
760770
r.Recorder.Eventf(updated, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
761771
"Updated %q finalizers", resource.GetName())

vendor/knative.dev/pkg/controller/controller.go

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828

2929
"go.uber.org/zap"
3030
"go.uber.org/zap/zapcore"
31+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3132
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3233
"k8s.io/apimachinery/pkg/runtime/schema"
3334
"k8s.io/apimachinery/pkg/types"
@@ -532,23 +533,31 @@ func (c *Impl) processNextWorkItem() bool {
532533
}
533534

534535
func (c *Impl) handleErr(logger *zap.SugaredLogger, err error, key types.NamespacedName, startTime time.Time) {
535-
if IsSkipKey(err) {
536+
// Check if we should skip this key or if the queue is shutting down.
537+
// We check shutdown here since controller Run might have exited by now
538+
// (since while this item was being processed, queue.Len==0).
539+
if IsSkipKey(err) || c.workQueue.ShuttingDown() {
536540
c.workQueue.Forget(key)
537541
return
538542
}
543+
539544
if ok, delay := IsRequeueKey(err); ok {
540545
c.workQueue.AddAfter(key, delay)
541546
logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len())
542547
return
543548
}
544549

550+
// Conflict errors are expected, requeue to retry
551+
if apierrors.IsConflict(err) {
552+
logger.Debugw("Reconcile conflict", zap.Duration("duration", time.Since(startTime)))
553+
c.workQueue.AddRateLimited(key)
554+
return
555+
}
556+
545557
logger.Errorw("Reconcile error", zap.Duration("duration", time.Since(startTime)), zap.Error(err))
546558

547559
// Re-queue the key if it's a transient error.
548-
// We want to check that the queue is shutting down here
549-
// since controller Run might have exited by now (since while this item was
550-
// being processed, queue.Len==0).
551-
if !IsPermanentError(err) && !c.workQueue.ShuttingDown() {
560+
if !IsPermanentError(err) {
552561
c.workQueue.AddRateLimited(key)
553562
logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len())
554563
return

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ k8s.io/utils/trace
733733
# knative.dev/hack v0.0.0-20251117013754-67a5b048bc27
734734
## explicit; go 1.24
735735
knative.dev/hack
736-
# knative.dev/pkg v0.0.0-20251118173915-745990698d3c
736+
# knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660
737737
## explicit; go 1.24.0
738738
knative.dev/pkg/apis
739739
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)