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

zero: refactor controller (#5134)

Browse source
This commit is contained in:
Denis Mishin 2024-06-12 16:31:42 -04:00 • committed by GitHub
parent e12532ba52
commit cc636be707
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 117 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,6 @@ import (
"github.com/pomerium/pomerium/internal/zero/bootstrap"
"github.com/pomerium/pomerium/internal/zero/bootstrap/writers"
"github.com/pomerium/pomerium/internal/zero/healthcheck"
"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"
@ -123,11 +122,25 @@ func (c *controller) runConnect(ctx context.Context) error {
}
func (c *controller) runZeroControlLoop(ctx context.Context) error {
return leaser.Run(ctx, c.bootstrapConfig,
c.runReconcilerLeased,
c.runAnalyticsLeased,
c.runMetricsReporterLeased,
c.runHealthChecksLeased,
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("control-group", "zero-cluster")
})
err := c.bootstrapConfig.WaitReady(ctx)
if err != nil {
return fmt.Errorf("waiting for config source to be ready: %w", err)
}
r := c.NewDatabrokerRestartRunner(ctx)
defer r.Close()
return r.Run(ctx,
WithLease(
c.runReconcilerLeased,
c.runAnalyticsLeased,
c.runMetricsReporterLeased,
c.runHealthChecksLeased,
),
)
}