diff --git a/go.mod b/go.mod index f9799e45..5fe33e25 100644 --- a/go.mod +++ b/go.mod @@ -21,5 +21,5 @@ require ( k8s.io/code-generator v0.21.4 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 knative.dev/hack v0.0.0-20210806075220-815cd312d65c - knative.dev/pkg v0.0.0-20210908202858-9a4b6128207c + knative.dev/pkg v0.0.0-20210909102158-d569db39a812 ) diff --git a/go.sum b/go.sum index fc7630b1..d4aff335 100644 --- a/go.sum +++ b/go.sum @@ -978,8 +978,8 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/hack v0.0.0-20210806075220-815cd312d65c h1:nOXoDWAAItwr4o0dp3nHr6skgpVD4IvME/UX84YNl5k= knative.dev/hack v0.0.0-20210806075220-815cd312d65c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20210908202858-9a4b6128207c h1:Em+aGSEisMG9my6i+arqz5GU+f9GPdbPndtyBIAlOns= -knative.dev/pkg v0.0.0-20210908202858-9a4b6128207c/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8= +knative.dev/pkg v0.0.0-20210909102158-d569db39a812 h1:8EQzOnAxqP1inXNlfeFrjcRUbuwZ7HldgJLqNQnuOxY= +knative.dev/pkg v0.0.0-20210909102158-d569db39a812/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8= pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go index 6d8035fe..3952dbc2 100644 --- a/vendor/knative.dev/pkg/controller/controller.go +++ b/vendor/knative.dev/pkg/controller/controller.go @@ -273,7 +273,7 @@ func (c *Impl) WorkQueue() workqueue.RateLimitingInterface { func (c *Impl) EnqueueAfter(obj interface{}, after time.Duration) { object, err := kmeta.DeletionHandlingAccessor(obj) if err != nil { - c.logger.Errorw("Enqueue", zap.Error(err)) + c.logger.Errorw("EnqueueAfter", zap.Error(err)) return } c.EnqueueKeyAfter(types.NamespacedName{Namespace: object.GetNamespace(), Name: object.GetName()}, after) @@ -540,7 +540,7 @@ func (c *Impl) processNextWorkItem() bool { // Run Reconcile, passing it the namespace/name string of the // resource to be synced. if err = c.Reconciler.Reconcile(ctx, keyStr); err != nil { - c.handleErr(err, key, startTime) + c.handleErr(logger, err, key, startTime) return true } @@ -552,18 +552,18 @@ func (c *Impl) processNextWorkItem() bool { return true } -func (c *Impl) handleErr(err error, key types.NamespacedName, startTime time.Time) { +func (c *Impl) handleErr(logger *zap.SugaredLogger, err error, key types.NamespacedName, startTime time.Time) { if IsSkipKey(err) { c.workQueue.Forget(key) return } if ok, delay := IsRequeueKey(err); ok { c.workQueue.AddAfter(key, delay) - c.logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len()) + logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len()) return } - c.logger.Errorw("Reconcile error", zap.Duration("duration", time.Since(startTime)), zap.Error(err)) + 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 @@ -571,7 +571,7 @@ func (c *Impl) handleErr(err error, key types.NamespacedName, startTime time.Tim // being processed, queue.Len==0). if !IsPermanentError(err) && !c.workQueue.ShuttingDown() { c.workQueue.AddRateLimited(key) - c.logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len()) + logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len()) return } diff --git a/vendor/modules.txt b/vendor/modules.txt index f7c4072f..f208c875 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -612,7 +612,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20210806075220-815cd312d65c ## explicit knative.dev/hack -# knative.dev/pkg v0.0.0-20210908202858-9a4b6128207c +# knative.dev/pkg v0.0.0-20210909102158-d569db39a812 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck