diff --git a/go.mod b/go.mod index 98bda60c..208e098e 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-20210830224055-82f3a9f1c5bc + knative.dev/pkg v0.0.0-20210902202457-7a61343b36ca ) diff --git a/go.sum b/go.sum index e279d839..c1af49f5 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-20210830224055-82f3a9f1c5bc h1:cvJR8kJM4dj2YiLpxNLOkr+QXWAFku2X9kO1r9pXWPw= -knative.dev/pkg v0.0.0-20210830224055-82f3a9f1c5bc/go.mod h1:jMSqkNMsrzuy+XR4Yr/BMy7SDVbUOl3KKB6+5MR+ZU8= +knative.dev/pkg v0.0.0-20210902202457-7a61343b36ca h1:1tsBZgj1FheRcDQrIReteUiU/afjTZG8j5hTM3iBkJQ= +knative.dev/pkg v0.0.0-20210902202457-7a61343b36ca/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/leaderelection/context.go b/vendor/knative.dev/pkg/leaderelection/context.go index d30ecd46..4758ccba 100644 --- a/vendor/knative.dev/pkg/leaderelection/context.go +++ b/vendor/knative.dev/pkg/leaderelection/context.go @@ -94,7 +94,11 @@ func BuildElector(ctx context.Context, la reconciler.LeaderAware, queueName stri return &unopposedElector{ la: la, bkt: reconciler.UniversalBucket(), - enq: enq, + // The UniversalBucket owns everything, so there is never a need to + // enqueue things (no possible state change). We pass nil here to + // avoid filling the queue for an extra resynce at startup along + // this path. + enq: nil, }, nil } diff --git a/vendor/knative.dev/pkg/reconciler/leader.go b/vendor/knative.dev/pkg/reconciler/leader.go index 6fece852..ed7254c4 100644 --- a/vendor/knative.dev/pkg/reconciler/leader.go +++ b/vendor/knative.dev/pkg/reconciler/leader.go @@ -97,7 +97,7 @@ func (laf *LeaderAwareFuncs) Promote(b Bucket, enq func(Bucket, types.Namespaced laf.buckets[b.Name()] = b }() - if promote := laf.PromoteFunc; promote != nil { + if promote := laf.PromoteFunc; promote != nil && enq != nil { return promote(b, enq) } return nil diff --git a/vendor/modules.txt b/vendor/modules.txt index 185b8388..572b0060 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-20210830224055-82f3a9f1c5bc +# knative.dev/pkg v0.0.0-20210902202457-7a61343b36ca ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck