Skip to content

[main] Upgrade to latest dependencies #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2025
Merged

[main] Upgrade to latest dependencies #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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 (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,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=
Expand Down
14 changes: 10 additions & 4 deletions pkg/client/injection/reconciler/caching/v1alpha1/image/reconciler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 14 additions & 4 deletions .../knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler/reconciler_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down
19 changes: 14 additions & 5 deletions vendor/knative.dev/pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ k8s.io/utils/trace
# knative.dev/hack v0.0.0-20251117013754-67a5b048bc27
## explicit; go 1.24
knative.dev/hack
# knative.dev/pkg v0.0.0-20251118173915-745990698d3c
# knative.dev/pkg v0.0.0-20251119125415-ab67eb7f8660
## explicit; go 1.24.0
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down
Loading