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

Merge branch 'wasaga/zero-resource-bundles-reconciler' into wasaga/zero-controller

Browse source
This commit is contained in:
Denis Mishin 2023-08-16 13:46:54 -04:00
commit b35e564658
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -53,7 +53,7 @@ require (
github.com/pomerium/csrf v1.7.0
github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524
github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b
github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05
github.com/pomerium/zero-sdk v0.0.0-20230816163741-2c7886877a34
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.44.0

4
go.sum
View file

@ -657,8 +657,8 @@ github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524 h1:3YQY1sb5
github.com/pomerium/datasource v0.18.2-0.20221108160055-c6134b5ed524/go.mod h1:7fGbUYJnU8RcxZJvUvhukOIBv1G7LWDAHMfDxAf5+Y0=
github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b h1:oll/aOfJudnqFAwCvoXK9+WN2zVjTzHVPLXCggHQmHk=
github.com/pomerium/webauthn v0.0.0-20221118023040-00a9c430578b/go.mod h1:KswTenBBh4y1pmhU2dpm8VgJQCgSErCg7OOFTeebrNc=
github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05 h1:Rl2df8q+DAd3SsJn9MpXrbo7JRNCDHVaohOyUZ2IJik=
github.com/pomerium/zero-sdk v0.0.0-20230816000855-af1b8165df05/go.mod h1:cAyfEGM8blUzchYhOWrufuj/6lOF277meB4c/TjMS28=
github.com/pomerium/zero-sdk v0.0.0-20230816163741-2c7886877a34 h1:UMt+h1nKW9DDCYzejkGaYFjKzOHFgIP9zorRMADbKhM=
github.com/pomerium/zero-sdk v0.0.0-20230816163741-2c7886877a34/go.mod h1:cAyfEGM8blUzchYhOWrufuj/6lOF277meB4c/TjMS28=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=

24
internal/zero/bootstrap/bootstrap.go
View file

@ -25,12 +25,12 @@ import (
)
const (
// DefaultCheckForUpdateInterval is the default interval to check for updates
// DefaultCheckForUpdateIntervalWhenDisconnected is the default interval to check for updates
// if there is no connection to the update service
DefaultCheckForUpdateInterval = 5 * time.Minute
DefaultCheckForUpdateIntervalWhenDisconnected = 5 * time.Minute
// DefaultCheckForUpdateIntervalWhenConnected is the default interval to check for updates
// if there is a connection to the update service
DefaultCheckForUpdateIntervalWhenConnected = 2 * time.Hour
DefaultCheckForUpdateIntervalWhenConnected = time.Hour
)
// Run initializes the bootstrap config source
@ -57,7 +57,7 @@ func (svc *Source) watchUpdates(ctx context.Context) error {
svc.triggerUpdate(DefaultCheckForUpdateIntervalWhenConnected)
}),
connect_mux.WithOnDisconnected(func(_ context.Context) {
svc.triggerUpdate(DefaultCheckForUpdateInterval)
svc.updateInterval.Store(DefaultCheckForUpdateIntervalWhenDisconnected)
}),
connect_mux.WithOnBootstrapConfigUpdated(func(_ context.Context) {
svc.triggerUpdate(DefaultCheckForUpdateIntervalWhenConnected)
@ -70,14 +70,6 @@ func (svc *Source) updateLoop(ctx context.Context) error {
defer ticker.Stop()
for {
err := retry.Retry(ctx,
"update bootstrap", svc.updateAndSave,
retry.WithWatch("bootstrap config updated", svc.checkForUpdate, nil),
)
if err != nil {
return fmt.Errorf("update bootstrap config: %w", err)
}
ticker.Reset(svc.updateInterval.Load())
select {
@ -86,6 +78,14 @@ func (svc *Source) updateLoop(ctx context.Context) error {
case <-svc.checkForUpdate:
case <-ticker.C:
}
err := retry.Retry(ctx,
"update bootstrap", svc.updateAndSave,
retry.WithWatch("bootstrap config updated", svc.checkForUpdate, nil),
)
if err != nil {
return fmt.Errorf("update bootstrap config: %w", err)
}
}
}

2
internal/zero/bootstrap/new.go
View file

@ -59,7 +59,7 @@ func New(secret []byte) (*Source, error) {
checkForUpdate: make(chan struct{}, 1),
}
svc.cfg.Store(cfg)
svc.updateInterval.Store(DefaultCheckForUpdateInterval)
svc.updateInterval.Store(DefaultCheckForUpdateIntervalWhenDisconnected)
return svc, nil
}