upgrade to latest dependencies (#1735)

bumping knative.dev/pkg 5f66ecf...d1d5c84:
  > d1d5c84 Define a global for `reconciler.DefaultTimeout`. (# 2597)
  > df29e2a Avoid second lister fetch during finalizer reconciliation. (# 2596)
bumping knative.dev/serving dadd0b6...2332731:
  > 2332731 upgrade to latest dependencies (# 13326)
  > 3f03f22 upgrade to latest dependencies (# 13324)
bumping knative.dev/eventing 645fd88...54174e3:
  > 54174e3 Remove strict check in scorer plugins and respect maxskew, requeue when no pods available rather than fail Scheduler (# 6524)

Signed-off-by: Knative Automation <automation@knative.team>

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2022-09-22 06:02:11 -04:00 committed by GitHub
parent 58f686bf92
commit 73d48f7ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 31 deletions

6
go.mod
View File

@ -21,11 +21,11 @@ require (
k8s.io/cli-runtime v0.24.4
k8s.io/client-go v0.24.4
k8s.io/code-generator v0.24.4
knative.dev/eventing v0.34.1-0.20220919143309-645fd887ce0c
knative.dev/eventing v0.34.1-0.20220921104109-54174e3cb963
knative.dev/hack v0.0.0-20220914183605-d1317b08c0c3
knative.dev/networking v0.0.0-20220914020748-cefed20d561c
knative.dev/pkg v0.0.0-20220914154704-5f66ecf267fe
knative.dev/serving v0.34.1-0.20220919222015-dadd0b6ced6e
knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b
knative.dev/serving v0.34.1-0.20220921150110-2332731db1b9
sigs.k8s.io/yaml v1.3.0
)

12
go.sum
View File

@ -1227,16 +1227,16 @@ k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdi
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/eventing v0.34.1-0.20220919143309-645fd887ce0c h1:/7BLIv8VLnzTWvwFHUcEMfq3eU2sd4euoYgTa95wCIo=
knative.dev/eventing v0.34.1-0.20220919143309-645fd887ce0c/go.mod h1:8u0uAkG22m9JWfhsO5a8Fk8+67KKlJvBrv7/SzeORiI=
knative.dev/eventing v0.34.1-0.20220921104109-54174e3cb963 h1:DCz3QAiL/8CV4dfX/bmuUWcOh/R1qDzH1Ncc7wjYptQ=
knative.dev/eventing v0.34.1-0.20220921104109-54174e3cb963/go.mod h1:8u0uAkG22m9JWfhsO5a8Fk8+67KKlJvBrv7/SzeORiI=
knative.dev/hack v0.0.0-20220914183605-d1317b08c0c3 h1:5s3/9VZuTfdVGFIF/+7FUju9nHKyIOg6jsFXw7rhdIM=
knative.dev/hack v0.0.0-20220914183605-d1317b08c0c3/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20220914020748-cefed20d561c h1:KTVyYjUsxn23Ot9oTBCFj4tfUug5H3PO7lDCF/3H25k=
knative.dev/networking v0.0.0-20220914020748-cefed20d561c/go.mod h1:U5WmvAm/sFvqXz6uodddTrYBgXGFB9VlbGO/CnxZ/eU=
knative.dev/pkg v0.0.0-20220914154704-5f66ecf267fe h1:kj9wOguanW1/4EaSpApiUM2fbGP6amPT7jA23J8wP18=
knative.dev/pkg v0.0.0-20220914154704-5f66ecf267fe/go.mod h1:v7MjUh7DVDGOFkiLfDTUt4hG75RwNJRyeQmlBz3wUAc=
knative.dev/serving v0.34.1-0.20220919222015-dadd0b6ced6e h1:x7hZCQj6SwUwe3erQtNCVl6n8trezDA0WvCOZbRMxwE=
knative.dev/serving v0.34.1-0.20220919222015-dadd0b6ced6e/go.mod h1:OGP4MOexUEIstWMgrtZ2CMA9nl+F6GiVZ6EoOM/V/SY=
knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b h1:DQn+gWHuXna0DlCYC9Cj/ElhUZlvblZVsgcDO0Gn4fQ=
knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b/go.mod h1:v7MjUh7DVDGOFkiLfDTUt4hG75RwNJRyeQmlBz3wUAc=
knative.dev/serving v0.34.1-0.20220921150110-2332731db1b9 h1:lGx/PjQ9mtrdhDteP7g11WvJ4LGpDKuJMpFLzJHni+4=
knative.dev/serving v0.34.1-0.20220921150110-2332731db1b9/go.mod h1:4N5p1lqIdRADGqfjijwV1v49LlJU1x1hCeUE5FgMPWg=
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=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

View File

@ -154,6 +154,10 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
Package: "k8s.io/apimachinery/pkg/util/sets",
Name: "NewString",
}),
"setsString": c.Universe.Type(types.Name{
Package: "k8s.io/apimachinery/pkg/util/sets",
Name: "String",
}),
"controllerOptions": c.Universe.Type(types.Name{
Package: "knative.dev/pkg/controller",
Name: "Options",
@ -597,25 +601,14 @@ var reconcilerFinalizerFactory = `
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx {{.contextContext|raw}}, resource *{{.type|raw}}) (*{{.type|raw}}, error) {
{{if .nonNamespaced}}
getter := r.Lister
{{else}}
getter := r.Lister.{{.type|apiGroup}}(resource.Namespace)
{{end}}
actual, err := getter.Get(resource.Name)
if err != nil {
return resource, err
}
func (r *reconcilerImpl) updateFinalizersFiltered(ctx {{.contextContext|raw}}, resource *{{.type|raw}}, desiredFinalizers {{.setsString|raw}}) (*{{.type|raw}}, error) {
// Don't modify the informers copy.
existing := actual.DeepCopy()
existing := resource.DeepCopy()
var finalizers []string
// If there's nothing to update, just return.
existingFinalizers := {{.setsNewString|raw}}(existing.Finalizers...)
desiredFinalizers := {{.setsNewString|raw}}(resource.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) {
@ -675,10 +668,8 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx {{.contextContext|raw}}, re
finalizers.Insert(r.finalizerName)
}
resource.Finalizers = finalizers.List()
// Synchronize the finalizers filtered by r.finalizerName.
return r.updateFinalizersFiltered(ctx, resource)
return r.updateFinalizersFiltered(ctx, resource, finalizers)
}
func (r *reconcilerImpl) clearFinalizer(ctx {{.contextContext|raw}}, resource *{{.type|raw}}, reconcileEvent {{.reconcilerEvent|raw}}) (*{{.type|raw}}, error) {
@ -702,10 +693,8 @@ func (r *reconcilerImpl) clearFinalizer(ctx {{.contextContext|raw}}, resource *{
finalizers.Delete(r.finalizerName)
}
resource.Finalizers = finalizers.List()
// Synchronize the finalizers filtered by r.finalizerName.
return r.updateFinalizersFiltered(ctx, resource)
return r.updateFinalizersFiltered(ctx, resource, finalizers)
}
`

View File

@ -30,6 +30,11 @@ import (
const failedGenerationBump = "NewObservedGenFailure"
// DefaultTimeout is used in some downstream reconcilers to put a context
// deadline on reconciliation. It is a variable so that it can be exposed by
// entrypoints as a flag, e.g. via flag.DurationVar
var DefaultTimeout = 30 * time.Second
const (
// DoReconcileKind is the function name for reconciling the resource (as a leader).
DoReconcileKind = "ReconcileKind"

6
vendor/modules.txt vendored
View File

@ -913,7 +913,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/eventing v0.34.1-0.20220919143309-645fd887ce0c
# knative.dev/eventing v0.34.1-0.20220921104109-54174e3cb963
## explicit; go 1.18
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
@ -959,7 +959,7 @@ knative.dev/networking/pkg/http/probe
knative.dev/networking/pkg/http/proxy
knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/k8s
# knative.dev/pkg v0.0.0-20220914154704-5f66ecf267fe
# knative.dev/pkg v0.0.0-20220921024409-d1d5c849073b
## explicit; go 1.18
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
@ -1009,7 +1009,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
# knative.dev/serving v0.34.1-0.20220919222015-dadd0b6ced6e
# knative.dev/serving v0.34.1-0.20220921150110-2332731db1b9
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1