3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

zero: fix bootstrap config path (#5035)

Browse source
This commit is contained in:
Denis Mishin 2024-03-21 20:39:52 -04:00 • committed by GitHub
parent 4193583301
commit d20e99ca8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/zero/controller/config.go
View file

@ -12,7 +12,7 @@ type controllerConfig struct {
otelEndpoint string
tmpDir string
bootstrapConfigFileName string
bootstrapConfigFileName *string
reconcilerLeaseDuration time.Duration
databrokerRequestTimeout time.Duration
@ -56,7 +56,7 @@ func WithAPIToken(token string) Option {
// WithBootstrapConfigFileName sets the name of the file to store the bootstrap config in.
func WithBootstrapConfigFileName(name string) Option {
return func(c *controllerConfig) {
c.bootstrapConfigFileName = name
c.bootstrapConfigFileName = &name
}
}

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

@ -31,7 +31,7 @@ func Run(ctx context.Context, opts ...Option) error {
return fmt.Errorf("init api: %w", err)
}
src, err := bootstrap.New([]byte(c.cfg.apiToken))
src, err := bootstrap.New([]byte(c.cfg.apiToken), c.cfg.bootstrapConfigFileName, c.api)
if err != nil {
return fmt.Errorf("error creating bootstrap config: %w", err)
}
@ -82,7 +82,7 @@ func (c *controller) runBootstrap(ctx context.Context) error {
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("service", "zero-bootstrap")
})
return c.bootstrapConfig.Run(ctx, c.api, c.cfg.bootstrapConfigFileName)
return c.bootstrapConfig.Run(ctx)
}
func (c *controller) runPomeriumCore(ctx context.Context) error {