From 9c0829407b5ae0505dd53efe247d9b0756a41869 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Tue, 25 May 2021 06:38:38 -0700 Subject: [PATCH] upgrade to latest dependencies (#472) bumping knative.dev/pkg 4564797...e2947db: > e2947db update the multiple label selector implemention to avoid clobber in filtered factory (# 2120) > e749d6a Update community files (# 2129) > 67897f4 Replace golint with revive (# 2126) > 1442287 Add knative-release-leads to OWNERS (# 2125) > 9b837a7 Update actions (# 2123) > 525c625 Update actions (# 2121) > 620e8d2 Allow disable via regex in chaosduck (# 2117) > 1f5a45b Update knative/community files (# 2119) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- .../factory/filtered/fake/fake_filtered_factory.go | 12 ++++++------ .../informers/factory/filtered/filtered_factory.go | 12 ++++++------ .../generators/fake_filtered_factory.go | 12 ++++++------ .../cmd/injection-gen/generators/filtered_factory.go | 12 ++++++------ vendor/modules.txt | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index d293cf26..9bd166d0 100644 --- a/go.mod +++ b/go.mod @@ -19,5 +19,5 @@ require ( k8s.io/code-generator v0.19.7 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 knative.dev/hack v0.0.0-20210428122153-93ad9129c268 - knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 + knative.dev/pkg v0.0.0-20210525071438-e2947dba201a ) diff --git a/go.sum b/go.sum index d1aa7024..19389639 100644 --- a/go.sum +++ b/go.sum @@ -1108,8 +1108,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= knative.dev/hack v0.0.0-20210428122153-93ad9129c268 h1:lBIj9Epd9UQ55NEaHzAdY/UZbuaegCdGPKVC2+Z68Q0= knative.dev/hack v0.0.0-20210428122153-93ad9129c268/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 h1:i4P8emOPrLctmbaPHp5eRIOqz+XTOkit7KgZeS+onKs= -knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7/go.mod h1:fIl4l4OmZodkElyaHoT0LCF5wT+3+P/kinawQ4XlLtE= +knative.dev/pkg v0.0.0-20210525071438-e2947dba201a h1:YDaIL+uCZG3+QAXYrnI2F3QOfq5MSQcBA6lyduwXr28= +knative.dev/pkg v0.0.0-20210525071438-e2947dba201a/go.mod h1:fIl4l4OmZodkElyaHoT0LCF5wT+3+P/kinawQ4XlLtE= 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/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go b/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go index 025aa3b7..44fa869d 100644 --- a/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go +++ b/pkg/client/injection/informers/factory/filtered/fake/fake_filtered_factory.go @@ -38,10 +38,6 @@ func init() { func withInformerFactory(ctx context.Context) context.Context { c := fake.Get(ctx) - opts := []externalversions.SharedInformerOption{} - if injection.HasNamespaceScope(ctx) { - opts = append(opts, externalversions.WithNamespace(injection.GetNamespaceScope(ctx))) - } untyped := ctx.Value(filtered.LabelKey{}) if untyped == nil { logging.FromContext(ctx).Panic( @@ -49,11 +45,15 @@ func withInformerFactory(ctx context.Context) context.Context { } labelSelectors := untyped.([]string) for _, selector := range labelSelectors { - thisOpts := append(opts, externalversions.WithTweakListOptions(func(l *v1.ListOptions) { + opts := []externalversions.SharedInformerOption{} + if injection.HasNamespaceScope(ctx) { + opts = append(opts, externalversions.WithNamespace(injection.GetNamespaceScope(ctx))) + } + opts = append(opts, externalversions.WithTweakListOptions(func(l *v1.ListOptions) { l.LabelSelector = selector })) ctx = context.WithValue(ctx, filtered.Key{Selector: selector}, - externalversions.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), thisOpts...)) + externalversions.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), opts...)) } return ctx } diff --git a/pkg/client/injection/informers/factory/filtered/filtered_factory.go b/pkg/client/injection/informers/factory/filtered/filtered_factory.go index de8b505b..a07c44e3 100644 --- a/pkg/client/injection/informers/factory/filtered/filtered_factory.go +++ b/pkg/client/injection/informers/factory/filtered/filtered_factory.go @@ -46,10 +46,6 @@ func WithSelectors(ctx context.Context, selector ...string) context.Context { func withInformerFactory(ctx context.Context) context.Context { c := client.Get(ctx) - opts := []externalversions.SharedInformerOption{} - if injection.HasNamespaceScope(ctx) { - opts = append(opts, externalversions.WithNamespace(injection.GetNamespaceScope(ctx))) - } untyped := ctx.Value(LabelKey{}) if untyped == nil { logging.FromContext(ctx).Panic( @@ -57,11 +53,15 @@ func withInformerFactory(ctx context.Context) context.Context { } labelSelectors := untyped.([]string) for _, selector := range labelSelectors { - thisOpts := append(opts, externalversions.WithTweakListOptions(func(l *v1.ListOptions) { + opts := []externalversions.SharedInformerOption{} + if injection.HasNamespaceScope(ctx) { + opts = append(opts, externalversions.WithNamespace(injection.GetNamespaceScope(ctx))) + } + opts = append(opts, externalversions.WithTweakListOptions(func(l *v1.ListOptions) { l.LabelSelector = selector })) ctx = context.WithValue(ctx, Key{Selector: selector}, - externalversions.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), thisOpts...)) + externalversions.NewSharedInformerFactoryWithOptions(c, controller.GetResyncPeriod(ctx), opts...)) } return ctx } diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fake_filtered_factory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fake_filtered_factory.go index 153261dc..1e747f4b 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fake_filtered_factory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/fake_filtered_factory.go @@ -109,10 +109,6 @@ func init() { func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { c := {{.clientGet|raw}}(ctx) - opts := []{{.informersSharedInformerOption|raw}}{} - if {{.injectionHasNamespace|raw}}(ctx) { - opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx))) - } untyped := ctx.Value({{.factoryLabelKey|raw}}{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( @@ -120,11 +116,15 @@ func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { } labelSelectors := untyped.([]string) for _, selector := range labelSelectors { - thisOpts := append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) { + opts := []{{.informersSharedInformerOption|raw}}{} + if {{.injectionHasNamespace|raw}}(ctx) { + opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx))) + } + opts = append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) { l.LabelSelector = selector })) ctx = context.WithValue(ctx, {{.factoryKey|raw}}{Selector: selector}, - {{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), thisOpts...)) + {{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), opts...)) } return ctx } diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_factory.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_factory.go index b036cf1c..58e65432 100644 --- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_factory.go +++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/filtered_factory.go @@ -111,10 +111,6 @@ func WithSelectors(ctx {{.contextContext|raw}}, selector ...string) context.Cont func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { c := {{.cachingClientGet|raw}}(ctx) - opts := []{{.informersSharedInformerOption|raw}}{} - if {{.injectionHasNamespace|raw}}(ctx) { - opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx))) - } untyped := ctx.Value(LabelKey{}) if untyped == nil { {{.loggingFromContext|raw}}(ctx).Panic( @@ -122,11 +118,15 @@ func withInformerFactory(ctx {{.contextContext|raw}}) {{.contextContext|raw}} { } labelSelectors := untyped.([]string) for _, selector := range labelSelectors { - thisOpts := append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) { + opts := []{{.informersSharedInformerOption|raw}}{} + if {{.injectionHasNamespace|raw}}(ctx) { + opts = append(opts, {{.informersWithNamespace|raw}}({{.injectionGetNamespace|raw}}(ctx))) + } + opts = append(opts, {{.informersWithTweakListOptions|raw}}(func(l *{{.metav1ListOptions|raw}}) { l.LabelSelector = selector })) ctx = context.WithValue(ctx, Key{Selector: selector}, - {{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), thisOpts...)) + {{.informersNewSharedInformerFactoryWithOptions|raw}}(c, {{.controllerGetResyncPeriod|raw}}(ctx), opts...)) } return ctx } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4780feb8..fcd591d9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -665,7 +665,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20210428122153-93ad9129c268 ## explicit knative.dev/hack -# knative.dev/pkg v0.0.0-20210510175900-4564797bf3b7 +# knative.dev/pkg v0.0.0-20210525071438-e2947dba201a ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck