3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-09 23:27:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

zero: group funcs that need run within a lease (#4862)

Browse source
This commit is contained in:
Denis Mishin 2023-12-21 11:41:41 -05:00 • committed by GitHub
parent faa2a8652b
commit 07d608792f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 135 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/zero/controller/controller.go
View file

@ -14,6 +14,7 @@ import (
"github.com/pomerium/pomerium/internal/zero/analytics"
sdk "github.com/pomerium/pomerium/internal/zero/api"
"github.com/pomerium/pomerium/internal/zero/bootstrap"
"github.com/pomerium/pomerium/internal/zero/leaser"
"github.com/pomerium/pomerium/internal/zero/reconciler"
"github.com/pomerium/pomerium/internal/zero/reporter"
"github.com/pomerium/pomerium/pkg/cmd/pomerium"
@ -42,12 +43,10 @@ func Run(ctx context.Context, opts ...Option) error {
}
eg.Go(func() error { return run(ctx, "connect", c.runConnect, nil) })
eg.Go(func() error { return run(ctx, "connect-log", c.RunConnectLog, nil) })
eg.Go(func() error { return run(ctx, "zero-bootstrap", c.runBootstrap, nil) })
eg.Go(func() error { return run(ctx, "pomerium-core", c.runPomeriumCore, src.WaitReady) })
eg.Go(func() error { return run(ctx, "zero-reconciler", c.runReconciler, src.WaitReady) })
eg.Go(func() error { return run(ctx, "connect-log", c.RunConnectLog, nil) })
eg.Go(func() error { return run(ctx, "zero-analytics", c.runAnalytics, src.WaitReady) })
eg.Go(func() error { return run(ctx, "zero-reporter", c.runReporter, src.WaitReady) })
eg.Go(func() error { return c.runZeroControlLoop(ctx, src.WaitReady) })
return eg.Wait()
}
@ -113,6 +112,19 @@ func (c *controller) runConnect(ctx context.Context) error {
return c.api.Connect(ctx)
}
func (c *controller) runZeroControlLoop(ctx context.Context, waitFn func(context.Context) error) error {
err := waitFn(ctx)
if err != nil {
return fmt.Errorf("error waiting for initial configuration: %w", err)
}
return leaser.Run(ctx, c.databrokerClient,
c.runReconciler,
c.runAnalytics,
c.runReporter,
)
}
func (c *controller) runReconciler(ctx context.Context) error {
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("service", "zero-reconciler")