upgrade to latest dependencies (#2199)

bumping knative.dev/reconciler-test 1e6de0a...c77185e:
  > c77185e upgrade to latest dependencies (# 842)
bumping knative.dev/serving 090b6ae...0fcf762:
  > 0fcf762 Update net-contour nightly (# 16245)
  > 8f27914 bump min-scale timeout (# 16244)
  > 6b8cc01 upgrade to latest dependencies (# 16243)
bumping knative.dev/pkg 7459906...ab67eb7:
  > ab67eb7 Reduce noisy "object has been modified" logs/events (# 3289)
bumping knative.dev/eventing 7c37b14...7c78c5a:
  > 7c78c5a [main] Upgrade to latest dependencies (# 8795)
bumping knative.dev/caching 60da975...9d5745d:
  > 9d5745d upgrade to latest dependencies (# 976)

Signed-off-by: Knative Automation <[email protected]>

Author: knative-automation

go.mod

@@ -20,12 +20,12 @@ require (
 	k8s.io/apimachinery v0.34.2
 	k8s.io/client-go v0.34.2
 	k8s.io/code-generator v0.34.2
-	knative.dev/caching v0.0.0-20251117013858-60da9753c6da
-	knative.dev/eventing v0.47.1-0.20251118120514-7c37b1462d6e
+	knative.dev/caching v0.0.0-20251119014714-9d5745d71f75
+	knative.dev/eventing v0.47.1-0.20251119024914-7c78c5aaa012
 	knative.dev/hack v0.0.0-20251117013754-67a5b048bc27
-	knative.dev/pkg v0.0.0-20251118173915-745990698d3c
-	knative.dev/reconciler-test v0.0.0-20251117013655-1e6de0a87d9a
-	knative.dev/serving v0.47.1-0.20251118201414-090b6ae3ac3a
+	knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660
+	knative.dev/reconciler-test v0.0.0-20251119021616-c77185e753a3
+	knative.dev/serving v0.47.1-0.20251119122515-0fcf7624a4ff
 	sigs.k8s.io/yaml v1.6.0
 )
 

go.sum

@@ -1703,20 +1703,20 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/caching v0.0.0-20251117013858-60da9753c6da h1:Cq7FHFesNZ823UiqkDmVVz07pUTmPWkVilrBQmiO4es=
-knative.dev/caching v0.0.0-20251117013858-60da9753c6da/go.mod h1:nZhi8uwzKUUFSKBCAxEihwFm2LdrRotufqJj6NYaIPE=
-knative.dev/eventing v0.47.1-0.20251118120514-7c37b1462d6e h1:nanBZhKdKxVXrsvtKkIXmFMHVWduNST76uOX/aN/0tQ=
-knative.dev/eventing v0.47.1-0.20251118120514-7c37b1462d6e/go.mod h1:y2ah9JhILLaQDOeh4IQcLd2uYaVBU6ErGe5b53BLV1s=
+knative.dev/caching v0.0.0-20251119014714-9d5745d71f75 h1:ta0r2Tlcruo4T2sNSzWQTBw3VnzbcuCOeSEnFjIiUQ4=
+knative.dev/caching v0.0.0-20251119014714-9d5745d71f75/go.mod h1:bDsraD7o+RkT0ncnSXDwuJjQP90YF9r5wuFsaRyp/Gk=
+knative.dev/eventing v0.47.1-0.20251119024914-7c78c5aaa012 h1:CNVrGoBVuejgz4abu3PaaSF0wiDvjWrMmM/ISX+EH7c=
+knative.dev/eventing v0.47.1-0.20251119024914-7c78c5aaa012/go.mod h1:dIgwvtgR8LG3IsVw7CbORLi9LeYElNf3zJm4ZPyKFuI=
 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/networking v0.0.0-20251117014740-e8506646d57f h1:EcibemIof19GqPPdtRLKcboOd2lwReiaB1xQLBVwuRc=
 knative.dev/networking v0.0.0-20251117014740-e8506646d57f/go.mod h1:bE6vGaXAX9J5hbll4fg99EVv4ke9AGzzJk0Pr0pdT8c=
-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/reconciler-test v0.0.0-20251117013655-1e6de0a87d9a h1:F7BVAA4jO1WoMufJJzrpzxMp+ZP6llJCGcO0M40RhYk=
-knative.dev/reconciler-test v0.0.0-20251117013655-1e6de0a87d9a/go.mod h1:F5QJ23fZUKPctfsIwtXVjNz8C33vEdh04cbQNe8WzX8=
-knative.dev/serving v0.47.1-0.20251118201414-090b6ae3ac3a h1:VuNfbR6vMFx5irFotnjtA56xuXLqQN6q0GNFz5j+00c=
-knative.dev/serving v0.47.1-0.20251118201414-090b6ae3ac3a/go.mod h1:5kffRM3AN6+jTKRFX+aYo7GCCpEk/cY0RrlSw0LkQz4=
+knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660 h1:4lJPD8CTsOZ6cXFYkm3LtZ8bruSY9OQpyIFS6S5NPGQ=
+knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660/go.mod h1:iVOYfi7BiB0jQEEiW3NUfBHVOjc0QIbdOqdNs47YEoI=
+knative.dev/reconciler-test v0.0.0-20251119021616-c77185e753a3 h1:dRYvtAZ3x4J90yDRcPNdffhtWyNCetKzooGH2qf5GME=
+knative.dev/reconciler-test v0.0.0-20251119021616-c77185e753a3/go.mod h1:ipzxgpWoZ2MjUMdxiRnsUm4FnQrVeq+w/k2cNv3OXNk=
+knative.dev/serving v0.47.1-0.20251119122515-0fcf7624a4ff h1:2Jmtd3K2sW+07yaNAtKcCoggldUtp0BXFIv9bYk75GE=
+knative.dev/serving v0.47.1-0.20251119122515-0fcf7624a4ff/go.mod h1:eamzrgi+6LSfkKJSv2tFze8zE4VClo2O2BsFPFJlFCY=
 nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
 pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=

pkg/client/injection/reconciler/operator/v1beta1/knativeeventing/reconciler.go

@@ -134,6 +134,10 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
 			Package: "k8s.io/apimachinery/pkg/api/errors",
 			Name:    "IsNotFound",
 		}),
+		"apierrsIsConflict": c.Universe.Function(types.Name{
+			Package: "k8s.io/apimachinery/pkg/api/errors",
+			Name:    "IsConflict",
+		}),
 		"metav1GetOptions": c.Universe.Function(types.Name{
 			Package: "k8s.io/apimachinery/pkg/apis/meta/v1",
 			Name:    "GetOptions",
@@ -573,6 +577,8 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
 			// This is a wrapped error, don't emit an event.
 		} else if ok, _ := {{ .controllerIsRequeueKey|raw }}(reconcileEvent); ok {
 			// This is a wrapped error, don't emit an event.
+		} else if {{ .apierrsIsConflict|raw }}(reconcileEvent) {
+			// Conflict errors are expected, don't emit an event.
 		} else {
 			logger.Errorw("Returned an error", zap.Error(reconcileEvent))
 			r.Recorder.Event(resource, {{.corev1EventTypeWarning|raw}}, "InternalError", reconcileEvent.Error())
@@ -698,8 +704,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredServerSideApply(ctx {{.contextC
 
 	updated, err := patcher.Patch(ctx, resource.Name, {{.typesApplyPatchType|raw}}, patch, patchOpts)
 	if err != nil {
-		r.Recorder.Eventf(resource, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
-			"Failed to update finalizers for %q via server-side apply: %v", resource.Name, err)
+		if !{{ .apierrsIsConflict|raw }}(err) {
+			r.Recorder.Eventf(resource, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
+				"Failed to update finalizers for %q via server-side apply: %v", resource.Name, err)
+		}
 	} else {
 		r.Recorder.Eventf(updated, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
 			"Updated finalizers for %q via server-side apply", resource.GetName())
@@ -754,8 +762,10 @@ func (r *reconcilerImpl) updateFinalizersFilteredMergePatch(ctx {{.contextContex
 	resourceName := resource.Name
 	updated, err := patcher.Patch(ctx, resourceName, {{.typesMergePatchType|raw}}, patch, {{.metav1PatchOptions|raw}}{})
 	if err != nil {
-		r.Recorder.Eventf(existing, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
-			"Failed to update finalizers for %q: %v", resourceName, err)
+		if !{{ .apierrsIsConflict|raw }}(err) {
+			r.Recorder.Eventf(existing, {{.corev1EventTypeWarning|raw}}, "FinalizerUpdateFailed",
+				"Failed to update finalizers for %q: %v", resourceName, err)
+		}
 	} else {
 		r.Recorder.Eventf(updated, {{.corev1EventTypeNormal|raw}}, "FinalizerUpdate",
 			"Updated %q finalizers", resource.GetName())

pkg/client/injection/reconciler/operator/v1beta1/knativeserving/reconciler.go

@@ -28,6 +28,7 @@ import (
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
@@ -532,23 +533,31 @@ func (c *Impl) processNextWorkItem() bool {
 }
 
 func (c *Impl) handleErr(logger *zap.SugaredLogger, err error, key types.NamespacedName, startTime time.Time) {
-	if IsSkipKey(err) {
+	// Check if we should skip this key or if the queue is shutting down.
+	// We check shutdown here since controller Run might have exited by now
+	// (since while this item was being processed, queue.Len==0).
+	if IsSkipKey(err) || c.workQueue.ShuttingDown() {
 		c.workQueue.Forget(key)
 		return
 	}
+
 	if ok, delay := IsRequeueKey(err); ok {
 		c.workQueue.AddAfter(key, delay)
 		logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len())
 		return
 	}
 
+	// Conflict errors are expected, requeue to retry
+	if apierrors.IsConflict(err) {
+		logger.Debugw("Reconcile conflict", zap.Duration("duration", time.Since(startTime)))
+		c.workQueue.AddRateLimited(key)
+		return
+	}
+
 	logger.Errorw("Reconcile error", zap.Duration("duration", time.Since(startTime)), zap.Error(err))
 
 	// Re-queue the key if it's a transient error.
-	// We want to check that the queue is shutting down here
-	// since controller Run might have exited by now (since while this item was
-	// being processed, queue.Len==0).
-	if !IsPermanentError(err) && !c.workQueue.ShuttingDown() {
+	if !IsPermanentError(err) {
 		c.workQueue.AddRateLimited(key)
 		logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len())
 		return

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

@@ -1489,11 +1489,11 @@ k8s.io/utils/net
 k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/trace
-# knative.dev/caching v0.0.0-20251117013858-60da9753c6da
+# knative.dev/caching v0.0.0-20251119014714-9d5745d71f75
 ## explicit; go 1.24.0
 knative.dev/caching/pkg/apis/caching
 knative.dev/caching/pkg/apis/caching/v1alpha1
-# knative.dev/eventing v0.47.1-0.20251118120514-7c37b1462d6e
+# knative.dev/eventing v0.47.1-0.20251119024914-7c78c5aaa012
 ## explicit; go 1.24.0
 knative.dev/eventing/cmd/heartbeats
 knative.dev/eventing/pkg/apis
@@ -1606,7 +1606,7 @@ knative.dev/networking/pkg/http/proxy
 knative.dev/networking/pkg/http/stats
 knative.dev/networking/pkg/ingress
 knative.dev/networking/pkg/k8s
-# knative.dev/pkg v0.0.0-20251118173915-745990698d3c
+# knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660
 ## explicit; go 1.24.0
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1697,7 +1697,7 @@ knative.dev/pkg/webhook
 knative.dev/pkg/webhook/certificates
 knative.dev/pkg/webhook/certificates/resources
 knative.dev/pkg/webhook/resourcesemantics/conversion
-# knative.dev/reconciler-test v0.0.0-20251117013655-1e6de0a87d9a
+# knative.dev/reconciler-test v0.0.0-20251119021616-c77185e753a3
 ## explicit; go 1.24.0
 knative.dev/reconciler-test/cmd/eventshub
 knative.dev/reconciler-test/pkg/environment
@@ -1726,7 +1726,7 @@ knative.dev/reconciler-test/pkg/resources/service
 knative.dev/reconciler-test/pkg/resources/serviceaccount
 knative.dev/reconciler-test/pkg/state
 knative.dev/reconciler-test/resources/certificate
-# knative.dev/serving v0.47.1-0.20251118201414-090b6ae3ac3a
+# knative.dev/serving v0.47.1-0.20251119122515-0fcf7624a4ff
 ## explicit; go 1.24.0
 knative.dev/serving/pkg/apis/autoscaling
 knative.dev/serving/pkg/apis/autoscaling/v1alpha1