From 86ca5628f72acda0df53aa0538f5d5572c16eb5a Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 3 May 2021 15:38:46 -0700 Subject: [PATCH] Make aggregation start explicitly or on Listen --- pkg/server/server.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/server/server.go b/pkg/server/server.go index 7e63963..e8615d8 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -167,9 +167,6 @@ func setup(ctx context.Context, server *Server) error { return err } - aggregation.Watch(ctx, server.controllers.Core.Secret(), server.aggregationSecretNamespace, - server.aggregationSecretName, handler) - server.APIServer = apiServer server.Handler = handler server.SchemaFactory = sf @@ -185,6 +182,11 @@ func (c *Server) start(ctx context.Context) error { return nil } +func (c *Server) StartAggregation(ctx context.Context) { + aggregation.Watch(ctx, c.controllers.Core.Secret(), c.aggregationSecretNamespace, + c.aggregationSecretName, c) +} + func (c *Server) ListenAndServe(ctx context.Context, httpsPort, httpPort int, opts *server.ListenOpts) error { if opts == nil { opts = &server.ListenOpts{} @@ -192,6 +194,9 @@ func (c *Server) ListenAndServe(ctx context.Context, httpsPort, httpPort int, op if opts.Storage == nil && opts.Secrets == nil { opts.Secrets = c.controllers.Core.Secret() } + + c.StartAggregation(ctx) + if err := server.ListenAndServe(ctx, httpsPort, httpPort, c, opts); err != nil { return err }